Attachment 312626 Details for Bug 456636 – Fix the detection of bad fuzz argument

[patch] Fix the detection of bad fuzz argument

rpm-4.4.2.3-fuzz.patch (text/plain), 1.06 KB, created by Tomas Mraz on 2008-07-25 07:29:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Mraz

Created: 2008-07-25 07:29:43 UTC

Size: 1.06 KB

patch

obsolete

>diff -up rpm-4.4.2.3/build/parsePrep.c.fuzz rpm-4.4.2.3/build/parsePrep.c
>--- rpm-4.4.2.3/build/parsePrep.c.fuzz	2008-04-01 09:28:21.000000000 +0200
>+++ rpm-4.4.2.3/build/parsePrep.c	2008-07-25 09:22:18.000000000 +0200
>@@ -98,7 +98,7 @@ static char *doPatch(Spec spec, int c, i
> #endif
> 	t = stpcpy( stpcpy(t, "--suffix "), db);
>     }
>-    if (fuzz) {
>+    if (fuzz >= 0) {
> 	t = stpcpy(t, " -F");
> 	sprintf(t, "%d", fuzz);
> 	t += strlen(t);
>@@ -463,7 +463,8 @@ static int doPatchMacro(Spec spec, char 
>     int patch_index, x;
> 
>     memset(patch_nums, 0, sizeof(patch_nums));
>-    opt_P = opt_p = opt_R = opt_E = opt_F = 0;
>+    opt_P = opt_p = opt_R = opt_E = 0;
>+    opt_F = -1;
>     opt_b = NULL;
>     patch_index = 0;
> 
>@@ -514,8 +515,9 @@ static int doPatchMacro(Spec spec, char 
> 	    } else {
> 		fnum = strtok(NULL, " \t\n");
> 	    }
>+	    errno = 0;
> 	    opt_F = (fnum ? strtol(fnum, &end, 10) : 0);
>-	    if (! opt_F || *end) {
>+	    if (opt_F < 0 || errno || *end) {
> 		rpmError(RPMERR_BADSPEC,
> 			_("line %d: Bad arg to %%patch -F: %s\n"),
> 			spec->lineNum, spec->line);

Actions: View | Diff

Attachments on bug 456636: 312626 | 312831