|
|
805be39 |
diff -up patch-2.7.1/src/common.h.lineno-overflow patch-2.7.1/src/common.h
|
|
|
805be39 |
--- patch-2.7.1/src/common.h.lineno-overflow 2012-09-28 15:00:04.000000000 +0100
|
|
|
805be39 |
+++ patch-2.7.1/src/common.h 2015-01-20 14:47:37.262280623 +0000
|
|
|
805be39 |
@@ -39,6 +39,7 @@
|
|
|
805be39 |
#elif HAVE_STDINT_H
|
|
|
805be39 |
# include <stdint.h>
|
|
|
805be39 |
#endif
|
|
|
805be39 |
+#include <intprops.h>
|
|
|
805be39 |
|
|
|
805be39 |
#include <ctype.h>
|
|
|
805be39 |
/* CTYPE_DOMAIN (C) is nonzero if the unsigned char C can safely be given
|
|
|
805be39 |
@@ -68,6 +69,9 @@
|
|
|
805be39 |
|
|
|
805be39 |
typedef off_t lin; /* must be signed */
|
|
|
805be39 |
|
|
|
805be39 |
+#define LINENUM_MIN TYPE_MINIMUM (lin)
|
|
|
805be39 |
+#define LINENUM_MAX TYPE_MAXIMUM (lin)
|
|
|
805be39 |
+
|
|
|
805be39 |
/* globals */
|
|
|
805be39 |
|
|
|
805be39 |
XTERN char *buf; /* general purpose buffer */
|
|
|
805be39 |
diff -up patch-2.7.1/src/pch.c.lineno-overflow patch-2.7.1/src/pch.c
|
|
|
805be39 |
--- patch-2.7.1/src/pch.c.lineno-overflow 2015-01-20 14:46:49.533109967 +0000
|
|
|
805be39 |
+++ patch-2.7.1/src/pch.c 2015-01-20 14:47:37.264280630 +0000
|
|
|
805be39 |
@@ -1294,6 +1294,8 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
s++;
|
|
|
805be39 |
scan_linenum (s, &p_ptrn_lines);
|
|
|
805be39 |
p_ptrn_lines += 1 - p_first;
|
|
|
805be39 |
+ if (p_ptrn_lines < 0)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
}
|
|
|
805be39 |
else if (p_first)
|
|
|
805be39 |
p_ptrn_lines = 1;
|
|
|
805be39 |
@@ -1301,6 +1303,9 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
p_ptrn_lines = 0;
|
|
|
805be39 |
p_first = 1;
|
|
|
805be39 |
}
|
|
|
805be39 |
+ if (p_first >= LINENUM_MAX - p_ptrn_lines ||
|
|
|
805be39 |
+ p_ptrn_lines >= LINENUM_MAX - 6)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
p_max = p_ptrn_lines + 6; /* we need this much at least */
|
|
|
805be39 |
while (p_max + 1 >= hunkmax)
|
|
|
805be39 |
if (! grow_hunkmax ())
|
|
|
805be39 |
@@ -1370,6 +1375,8 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
while (! ISDIGIT (*s));
|
|
|
805be39 |
scan_linenum (s, &p_repl_lines);
|
|
|
805be39 |
p_repl_lines += 1 - p_newfirst;
|
|
|
805be39 |
+ if (p_repl_lines < 0)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
}
|
|
|
805be39 |
else if (p_newfirst)
|
|
|
805be39 |
p_repl_lines = 1;
|
|
|
805be39 |
@@ -1378,6 +1385,9 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
p_repl_lines = 0;
|
|
|
805be39 |
p_newfirst = 1;
|
|
|
805be39 |
}
|
|
|
805be39 |
+ if (p_newfirst >= LINENUM_MAX - p_repl_lines ||
|
|
|
805be39 |
+ p_repl_lines >= LINENUM_MAX - p_end)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
p_max = p_repl_lines + p_end;
|
|
|
805be39 |
while (p_max + 1 >= hunkmax)
|
|
|
805be39 |
if (! grow_hunkmax ())
|
|
|
805be39 |
@@ -1617,6 +1627,8 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
s = scan_linenum (s + 1, &p_ptrn_lines);
|
|
|
805be39 |
else
|
|
|
805be39 |
p_ptrn_lines = 1;
|
|
|
805be39 |
+ if (p_first >= LINENUM_MAX - p_ptrn_lines)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
if (*s == ' ') s++;
|
|
|
805be39 |
if (*s != '+')
|
|
|
805be39 |
malformed ();
|
|
|
805be39 |
@@ -1625,6 +1637,8 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
s = scan_linenum (s + 1, &p_repl_lines);
|
|
|
805be39 |
else
|
|
|
805be39 |
p_repl_lines = 1;
|
|
|
805be39 |
+ if (p_newfirst >= LINENUM_MAX - p_repl_lines)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
if (*s == ' ') s++;
|
|
|
805be39 |
if (*s++ != '@')
|
|
|
805be39 |
malformed ();
|
|
|
805be39 |
@@ -1640,6 +1654,8 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
p_first++; /* do append rather than insert */
|
|
|
805be39 |
if (!p_repl_lines)
|
|
|
805be39 |
p_newfirst++;
|
|
|
805be39 |
+ if (p_ptrn_lines >= LINENUM_MAX - (p_repl_lines + 1))
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
p_max = p_ptrn_lines + p_repl_lines + 1;
|
|
|
805be39 |
while (p_max + 1 >= hunkmax)
|
|
|
805be39 |
if (! grow_hunkmax ())
|
|
|
805be39 |
@@ -1776,6 +1792,8 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
}
|
|
|
805be39 |
else
|
|
|
805be39 |
p_ptrn_lines = (*s != 'a');
|
|
|
805be39 |
+ if (p_first >= LINENUM_MAX - p_ptrn_lines)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
hunk_type = *s;
|
|
|
805be39 |
if (hunk_type == 'a')
|
|
|
805be39 |
p_first++; /* do append rather than insert */
|
|
|
805be39 |
@@ -1784,17 +1802,23 @@ another_hunk (enum diff difftype, bool r
|
|
|
805be39 |
scan_linenum (s + 1, &max;;
|
|
|
805be39 |
else
|
|
|
805be39 |
max = min;
|
|
|
805be39 |
+ if (min > max || max - min == LINENUM_MAX)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
if (hunk_type == 'd')
|
|
|
805be39 |
min++;
|
|
|
805be39 |
- p_end = p_ptrn_lines + 1 + max - min + 1;
|
|
|
805be39 |
+ p_newfirst = min;
|
|
|
805be39 |
+ p_repl_lines = max - min + 1;
|
|
|
805be39 |
+ if (p_newfirst >= LINENUM_MAX - p_repl_lines)
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
+ if (p_ptrn_lines >= LINENUM_MAX - (p_repl_lines + 1))
|
|
|
805be39 |
+ malformed ();
|
|
|
805be39 |
+ p_end = p_ptrn_lines + p_repl_lines + 1;
|
|
|
805be39 |
while (p_end + 1 >= hunkmax)
|
|
|
805be39 |
if (! grow_hunkmax ())
|
|
|
805be39 |
{
|
|
|
805be39 |
p_end = -1;
|
|
|
805be39 |
return -1;
|
|
|
805be39 |
}
|
|
|
805be39 |
- p_newfirst = min;
|
|
|
805be39 |
- p_repl_lines = max - min + 1;
|
|
|
805be39 |
sprintf (buf, "*** %s,%s\n",
|
|
|
805be39 |
format_linenum (numbuf0, p_first),
|
|
|
805be39 |
format_linenum (numbuf1, p_first + p_ptrn_lines - 1));
|