[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1911852 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_diff/parse-diff.c
From:       svn-role () apache ! org
Date:       2023-08-23 3:57:59
Message-ID: 20230823040003.A9B0F17D0F4 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: svn-role
Date: Wed Aug 23 04:00:03 2023
New Revision: 1911852

URL: http://svn.apache.org/viewvc?rev=1911852&view=rev
Log:
Merge r1906502 from trunk:

 * r1906502
   libsvn_diff: Fix missing pointer dereference in svn:mergeinfo diff parser
   Justification:
     Bug fix. Code to parse forward merges did not work as intended.
   Votes:
     +1: hartmannathan, stsp, dsahlberg

Modified:
    subversion/branches/1.14.x/   (props changed)
    subversion/branches/1.14.x/STATUS
    subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c

Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1906502

Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1911852&r1=1911851&r2=1911852&view=diff
 ==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Aug 23 04:00:03 2023
@@ -42,11 +42,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1906502
-   libsvn_diff: Fix missing pointer dereference in svn:mergeinfo diff parser
-   Justification:
-     Bug fix. Code to parse forward merges did not work as intended.
-   Votes:
-     +1: hartmannathan, stsp, dsahlberg
-

Modified: subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c?rev=1911852&r1=1911851&r2=1911852&view=diff
 ==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_diff/parse-diff.c Wed Aug 23 \
04:00:03 2023 @@ -1006,7 +1006,7 @@ parse_pretty_mergeinfo_line(svn_boolean_
                 }
               (*number_of_reverse_merges)--;
             }
-          else if (number_of_forward_merges > 0) /* forward merges */
+          else if (*number_of_forward_merges > 0) /* forward merges */
             {
               if (patch->reverse)
                 {


[prev in list] [next in list] [prev in thread] [next in thread]