From: Karel Zak <kzak@redhat.com>
Date: Fri, 10 Oct 2014 10:24:10 +0000 (+0200)
Subject: libfdisk: make script header parser more pedantic
X-Git-Tag: v2.26-rc1~325
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d2cb0251d021e9a7a9c9584d33d223e74096f1a;p=thirdparty%2Futil-linux.git

libfdisk: make script header parser more pedantic

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c
index 556c032c90..298d64a269 100644
--- a/libfdisk/src/script.c
+++ b/libfdisk/src/script.c
@@ -461,6 +461,17 @@ static int parse_header_line(struct fdisk_script *dp, char *s)
 	ltrim_whitespace((unsigned char *) value);
 	rtrim_whitespace((unsigned char *) value);
 
+	if (strcmp(name, "label") == 0) {
+		if (dp->cxt && !fdisk_get_label(dp->cxt, value))
+			goto done;			/* unknown label name */
+	} else if (strcmp(name, "unit") == 0) {
+		if (strcmp(value, "sectors") != 0)
+			goto done;			/* only "sectors" supported */
+	} else if (strcmp(name, "label-id") == 0) {
+		;					/* whatever is posssible */
+	} else
+		goto done;				/* unknown header */
+
 	if (*name && *value)
 		rc = fdisk_script_set_header(dp, name, value);
 done: