Re: [PATCH] gitweb: protect blob and diff output lines from controls.

From: Jakub Narebski <jnareb@gmail.com>
Date: Nov 9, 2006, 10:41 UTC
Message-ID: <200611091141.42205.jnareb@gmail.com>
In-Reply-To: <7v8xiklxh1.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:

Show 14 quoted lines

> Jakub Narebski <jnareb@gmail.com> writes:
>> Junio C Hamano wrote:
>>> [...]  There is another
>>> thing I noticed while testing it with an artifitial test that I
>>> haven't fixed, but I think you already know about it (when the
>>> commitdiff is completely empty except mode changes, we end up
>>> with unbalanced div).  My test's tip can be found at
>>> 'gitweb-test-funny-char' branch temporarily in the git.git
>>> repository.
>>
>> Damn. I thought I corrected this on resend...
> 
> I think you need this, otherwise when the last filepair changes
> only metainfo you fail to close the extended header div.

True, I forgot about the situation where empty patch is _last_ in the patchset (which includes the situation when it is _only_ patch).

Show 9 quoted lines

> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 1a757cc..e54a29e 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -2338,6 +2338,8 @@ sub git_patchset_body {
>  
>  		print format_diff_line($patch_line);
>  	}
> +	print "</div>\n" if $in_header; # extended header

I would write '# class="diff extended_header"' here instead.

> +
>  	print "</div>\n" if $patch_found; # class="patch"
>  
>  	print "</div>\n"; # class="patchset"

Looks good. Ack.

-- 
Jakub Narebski