Commit 755142eaf116858c71b8f3838057537739289e5a
2018-04-02T19:31:10
in diffreg.c, return value from preadline() must be freed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/lib/diffreg.c b/lib/diffreg.c
index 1762aa7..157aa95 100644
--- a/lib/diffreg.c
+++ b/lib/diffreg.c
@@ -983,7 +983,6 @@ restart:
if (args->diff_format != D_IFDEF && a > b && c > d)
return (0);
if (args->ignore_pats != NULL) {
- char *line;
/*
* All lines in the change, insert, or delete must
* match an ignore pattern for the change to be
@@ -991,24 +990,30 @@ restart:
*/
if (a <= b) { /* Changes and deletes. */
for (i = a; i <= b; i++) {
- line = preadline(fileno(f1),
+ char *line = preadline(fileno(f1),
ds->ixold[i] - ds->ixold[i - 1],
ds->ixold[i - 1]);
if (line == NULL)
return (-1);
- if (!ignoreline(line))
+ if (!ignoreline(line)) {
+ free(line);
goto proceed;
+ }
+ free(line);
}
}
if (a > b || c <= d) { /* Changes and inserts. */
for (i = c; i <= d; i++) {
- line = preadline(fileno(f2),
+ char *line = preadline(fileno(f2),
ds->ixnew[i] - ds->ixnew[i - 1],
ds->ixnew[i - 1]);
if (line == NULL)
return (-1);
- if (!ignoreline(line))
+ if (!ignoreline(line)) {
+ free(line);
goto proceed;
+ }
+ free(line);
}
}
return (0);