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

List:       subversion-commits
Subject:    svn commit: r1906502 - /subversion/trunk/subversion/libsvn_diff/parse-diff.c
From:       stsp () apache ! org
Date:       2023-01-09 14:04:44
Message-ID: 20230109140444.DA0F617B333 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: stsp
Date: Mon Jan  9 14:04:44 2023
New Revision: 1906502

URL: http://svn.apache.org/viewvc?rev=1906502&view=rev
Log:
Fix missing pointer dereference in the diff parser.

* subversion/libsvn_diff/parse-diff.c
  (parse_pretty_mergeinfo_line): number_of_forward_merges is a pointer.
    Read the number of forward merges as intended, instead of checking
    whether the address is greater zero.

Patch by: Johannes von Rotz (jr {AT} vrtz.ch)

Modified:
    subversion/trunk/subversion/libsvn_diff/parse-diff.c

Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1906502&r1=1906501&r2=1906502&view=diff
 ==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Mon Jan  9 14:04:44 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]