aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2020-07-20 22:03:51 -0500
committerRob Landley <rob@landley.net>2020-07-20 22:03:51 -0500
commitde303e914bc3836e74a798deb211bf9b1ee8c325 (patch)
treef71e17b9236c30532512673b28099a60912c95ac
parent3eead7d3ae4ca93c4eda0167e679bd8d5aa1b59b (diff)
downloadtoybox-de303e914bc3836e74a798deb211bf9b1ee8c325.tar.gz
patch fuzz: Always output original file's ' ' context lines, not from hunk.
-rwxr-xr-xtests/patch.test31
-rw-r--r--toys/posix/patch.c43
2 files changed, 46 insertions, 28 deletions
diff --git a/tests/patch.test b/tests/patch.test
index 42eed937..5cc60014 100755
--- a/tests/patch.test
+++ b/tests/patch.test
@@ -86,3 +86,34 @@ testing "quoted name" "patch > /dev/null && cat 'fruit bat'" \
+hello
'
# todo bork bork2
+
+# We hit a bug, test the bugfix.
+testing "fuzz" "patch > /dev/null && cat input" \
+"blah blah
+ */
+package org.yaml.snakeyaml.representer;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+" "blah blah
+ */
+package org.yaml.snakeyaml.representer;
+
+import java.beans.IntrospectionException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+" "--- a/x/input
++++ b/x/input
+@@ -15,7 +15,6 @@
+ */
+ package org.yaml.snakeyaml.representer;
+
+-import java.beans.IntrospectionException;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Iterator;
+"
diff --git a/toys/posix/patch.c b/toys/posix/patch.c
index f0caf8ae..e0f13dd7 100644
--- a/toys/posix/patch.c
+++ b/toys/posix/patch.c
@@ -125,12 +125,12 @@ static int loosecmp(char *aa, char *bb)
static int apply_one_hunk(void)
{
struct double_list *plist, *buf = 0, *check;
- int matcheof, trail = 0, reverse = FLAG(R), backwarn = 0, allfuzz = 0, fuzz,i;
+ int matcheof, trail = 0, reverse = FLAG(R), backwarn = 0, allfuzz, fuzz, i;
int (*lcmp)(char *aa, char *bb) = FLAG(l) ? (void *)loosecmp : (void *)strcmp;
// Match EOF if there aren't as many ending context lines as beginning
dlist_terminate(TT.current_hunk);
- for (plist = TT.current_hunk; plist; plist = plist->next) {
+ for (fuzz = 0, plist = TT.current_hunk; plist; plist = plist->next) {
char c = *plist->data, *s;
if (c==' ') trail++;
@@ -142,22 +142,19 @@ static int apply_one_hunk(void)
if (c==' ' || c=="-+"[reverse]) {
s = plist->data+1;
while (isspace(*s)) s++;
- if (*s && s[1] && !isspace(s[1])) allfuzz++;
+ if (*s && s[1] && !isspace(s[1])) fuzz++;
}
if (FLAG(x)) fprintf(stderr, "HUNK:%s\n", plist->data);
}
matcheof = !trail || trail < TT.context;
- if (allfuzz<2) allfuzz = 0;
- else allfuzz = FLAG(F) ? TT.F : TT.context ? TT.context-1 : 0;
- if (allfuzz>=sizeof(toybuf)/sizeof(long))
- allfuzz = (sizeof(toybuf)/sizeof(long))-1;
+ if (fuzz<2) allfuzz = 0;
+ else allfuzz = FLAG(F) ? TT.F : (TT.context ? TT.context-1 : 0);
if (FLAG(x)) fprintf(stderr,"MATCHEOF=%c\n", matcheof ? 'Y' : 'N');
// Loop through input data searching for this hunk. Match all context
- // lines and all lines to be removed until we've found the end of a
- // complete hunk.
+ // lines and lines to be removed until we've found end of complete hunk.
plist = TT.current_hunk;
fuzz = 0;
for (;;) {
@@ -190,27 +187,22 @@ static int apply_one_hunk(void)
if (FLAG(x)) fprintf(stderr, "IN: %s\n", data);
}
check = dlist_add(&buf, data);
- // Compare this line with next expected line of hunk.
- // A match can fail because the next line doesn't match, or because
- // we hit the end of a hunk that needed EOF and this isn't EOF.
-
- // If match failed, flush first line of buffered data and
- // recheck buffered data for a new match until we find one or run
- // out of buffer.
+ // Compare this line with next expected line of hunk. Match can fail
+ // because next line doesn't match, or because we hit end of a hunk that
+ // needed EOF and this isn't EOF.
for (i = 0;; i++) {
if (!plist || lcmp(check->data, plist->data+1)) {
+
+ // Match failed: can we fuzz it?
if (plist && *plist->data == ' ' && fuzz<allfuzz) {
if (FLAG(x))
fprintf(stderr, "FUZZED: %ld %s\n", TT.linenum, plist->data);
- ((long *)toybuf)[fuzz++] = TT.outnum+i;
+ fuzz++;
goto fuzzed;
}
- // Match failed. Write out first line of buffered data and
- // recheck remaining buffered data for a new match.
-
if (FLAG(x)) {
int bug = 0;
@@ -228,14 +220,13 @@ static int apply_one_hunk(void)
goto done;
}
+ // Write out first line of buffer and recheck rest for new match.
TT.state = 3;
do_line(check = dlist_pop(&buf));
plist = TT.current_hunk;
- memset(toybuf, 0, (fuzz+7)/8);
fuzz = 0;
- // If we've reached the end of the buffer without confirming a
- // match, read more lines.
+ // If end of the buffer without finishing a match, read more lines.
if (!buf) break;
check = buf;
} else {
@@ -252,13 +243,9 @@ fuzzed:
out:
// We have a match. Emit changed data.
TT.state = "-+"[reverse];
- allfuzz = 0;
while ((plist = dlist_pop(&TT.current_hunk))) {
if (TT.state == *plist->data || *plist->data == ' ') {
- if (((long *)toybuf)[allfuzz] == ++TT.outnum) {
- dprintf(TT.fileout, "%s\n", buf->data);
- allfuzz++;
- } else if (*plist->data == ' ') dprintf(TT.fileout, "%s\n",plist->data+1);
+ if (*plist->data == ' ') dprintf(TT.fileout, "%s\n", buf->data);
llist_free_double(dlist_pop(&buf));
} else dprintf(TT.fileout, "%s\n", plist->data+1);
llist_free_double(plist);