Attachment 854745 Details for Bug 1192449

[patch] PR#427 backport to 3.13.0

strict-config.patch (text/plain), 1.32 KB, created by David Anes on 2021-12-21 21:35:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Anes

Created: 2021-12-21 21:35:57 UTC

Size: 1.32 KB

patch

obsolete

>Index: logrotate-3.13.0/config.c
>===================================================================
>--- logrotate-3.13.0.orig/config.c
>+++ logrotate-3.13.0/config.c
>@@ -1023,8 +1023,18 @@ static int readConfigFile(const char *co
> 			}
> 			
> 			if (isalpha((unsigned char)*start)) {
>-				if ((key = isolateWord(&start, &buf, length)) == NULL)
>-					continue;
>+				key = isolateWord(&start, &buf, length);
>+				if (key == NULL) {
>+					message(MESS_ERROR, "%s:%d failed to parse keyword\n",
>+                                configFile, lineNum);
>+                        RAISE_ERROR();
>+				}
>+				if (!isspace((unsigned char)*start) && *start != '=') {
>+                        message(MESS_ERROR, "%s:%d keyword '%s' not properly"
>+                                " separated, found %#x\n",
>+                                configFile, lineNum, key, *start);
>+                        RAISE_ERROR();
>+                    }
> 				if (!strcmp(key, "compress")) {
> 					newlog->flags |= LOG_FLAG_COMPRESS;
> 				} else if (!strcmp(key, "nocompress")) {
>@@ -1770,7 +1780,7 @@ static int readConfigFile(const char *co
> 				message(MESS_ERROR, "%s:%d lines must begin with a keyword "
> 					"or a filename (possibly in double quotes)\n",
> 					configFile, lineNum);
>-					state = STATE_SKIP_LINE;
>+				RAISE_ERROR();
> 			}
> 			break;
> 		case STATE_SKIP_LINE:

Actions: View | Diff

Attachments on bug 1192449: 854745 | 854746 | 860733