git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 2/8] gitweb: esc_html_hl_regions(): Don't create empty <span> elements

From
Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Date
Apr 11, 2012, 21:18 UTC
Message-ID
<1334179124-14258-3-git-send-email-michal.kiedrowicz@gmail.com>
In-Reply-To
<1334179124-14258-1-git-send-email-michal.kiedrowicz@gmail.com>

If $end is equal to or less than $begin, esc_html_hl_regions() generates an empty <span> element. It normally shouldn't be visible in the web browser, but it doesn't look good when looking at page source. It also minimally increases generated page size for no special reason.

Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Acked-by: Jakub Narębski <jnareb@gmail.com>
---
 gitweb/gitweb.perl |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1c54301..588b87d 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1740,6 +1740,9 @@ sub esc_html_hl_regions {
 	for my $s (@sel) {
 		my ($begin, $end) = @$s;
 
+		# Don't create empty <span> elements.
+		next if $end <= $begin;
+
 		my $escaped = esc_html(substr($str, $begin, $end - $begin));
 
 		$out .= esc_html(substr($str, $pos, $begin - $pos))
-- 
1.7.8.4
Previous: Michał KiedrowiczNext: Michał Kiedrowicz
Message 3 of 10 in “Highlight interesting parts of diff”
  1. 0/8 Highlight interesting parts of diffMichał Kiedrowicz, Apr 11, 2012
  2. 1/8 gitweb: Use descriptive names in esc_html_hl_regions()Michał Kiedrowicz, Apr 11, 2012
  3. 2/8 gitweb: esc_html_hl_regions(): Don't create empty <span> elementsMichał Kiedrowicz, Apr 11, 2012
  4. 3/8 gitweb: Pass esc_html_hl_regions() options to esc_html()Michał Kiedrowicz, Apr 11, 2012
  5. 4/8 gitweb: Extract print_sidebyside_diff_lines()Michał Kiedrowicz, Apr 11, 2012
  6. 5/8 gitweb: Use print_diff_chunk() for both side-by-side and inline diffsMichał Kiedrowicz, Apr 11, 2012
  7. 6/8 gitweb: Push formatting diff lines to print_diff_chunk()Michał Kiedrowicz, Apr 11, 2012
  8. 7/8 gitweb: Highlight interesting parts of diffMichał Kiedrowicz, Apr 11, 2012
  9. 8/8 gitweb: Refinement highlightning in combined diffsMichał Kiedrowicz, Apr 11, 2012
  10. Junio C HamanoApr 11, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.