Attachment 294546 Details for Bug 431836 – Proposed patch

[patch] Proposed patch

logrotate-3.7.4-segfault.patch (text/plain), 1.41 KB, created by Tomas Smetana on 2008-02-11 10:25:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Smetana

Created: 2008-02-11 10:25:06 UTC

Size: 1.41 KB

patch

obsolete

>diff -up logrotate-3.7.4/logrotate.c.segfault logrotate-3.7.4/logrotate.c
>--- logrotate-3.7.4/logrotate.c.segfault	2008-02-11 11:20:18.000000000 +0100
>+++ logrotate-3.7.4/logrotate.c	2008-02-11 11:21:54.000000000 +0100
>@@ -1188,7 +1188,7 @@ static int readState(char *stateFilename
> {
>     FILE *f;
>     char buf[1024];
>-    const char **argv;
>+    const char **argv = NULL;
>     int argc;
>     int year, month, day;
>     int i;
>@@ -1272,7 +1272,8 @@ static int readState(char *stateFilename
> 	    message(MESS_ERROR,
> 		    "bad year %d for file %s in state file %s\n", year,
> 		    argv[0], stateFilename);
>-	    free(argv);
>+	    if (argv)
>+			free(argv);
> 	    fclose(f);
> 	    return 1;
> 	}
>@@ -1281,7 +1282,8 @@ static int readState(char *stateFilename
> 	    message(MESS_ERROR,
> 		    "bad month %d for file %s in state file %s\n", month,
> 		    argv[0], stateFilename);
>-	    free(argv);
>+	    if (argv)
>+			free(argv);
> 	    fclose(f);
> 	    return 1;
> 	}
>@@ -1291,7 +1293,8 @@ static int readState(char *stateFilename
> 	    message(MESS_ERROR,
> 		    "bad day %d for file %s in state file %s\n", day,
> 		    argv[0], stateFilename);
>-	    free(argv);
>+	    if(argv)
>+			free(argv);
> 	    fclose(f);
> 	    return 1;
> 	}
>@@ -1308,7 +1311,8 @@ static int readState(char *stateFilename
> 	lr_time = mktime(&st->lastRotated);
> 	st->lastRotated = *localtime(&lr_time);
> 
>-	free(argv);
>+	if (argv)
>+		free(argv);
>     }
> 
>     fclose(f);

Actions: View | Diff

Attachments on bug 431836: 294546 | 303486