You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/04/06 15:08:19 UTC
svn commit: r931140 -
/subversion/branches/svn-patch-improvements/subversion/libsvn_diff/parse-diff.c
Author: stsp
Date: Tue Apr 6 13:08:19 2010
New Revision: 931140
URL: http://svn.apache.org/viewvc?rev=931140&view=rev
Log:
On the svn-patch-improvements branch:
* subversion/libsvn_diff/parse-diff.c
(parse_next_hunk): Make sure we never overflow modified_lines.
Modified:
subversion/branches/svn-patch-improvements/subversion/libsvn_diff/parse-diff.c
Modified: subversion/branches/svn-patch-improvements/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-patch-improvements/subversion/libsvn_diff/parse-diff.c?rev=931140&r1=931139&r2=931140&view=diff
==============================================================================
--- subversion/branches/svn-patch-improvements/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/svn-patch-improvements/subversion/libsvn_diff/parse-diff.c Tue Apr 6 13:08:19 2010
@@ -355,7 +355,8 @@ parse_next_hunk(svn_hunk_t **hunk,
c = line->data[0];
/* Tolerate chopped leading spaces on empty lines. */
- if (original_lines > 0 && (c == ' ' || (! eof && line->len == 0)))
+ if (original_lines > 0 && modified_lines > 0 &&
+ (c == ' ' || (! eof && line->len == 0)))
{
hunk_seen = TRUE;
original_lines--;