layout: Check return values for strdup in register_include_arg

strdup return values should be checked for NULL to catch the
potential error case of out of memory.

This patch re-writes ternary conditionals so that strdup return
values could be checked for all branches fof execution.

Follow up on
commit 45d50a101e8073191e6d88143990ed91d3bfe815

Ticket: https://ticket.coreboot.org/issues/372

Change-Id: I6c22196be6847a8c9704f1de936604a51b4b8a28
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/70006
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

1 files changed, 17 insertions, 3 deletions

diff --git a/layout.c b/layout.c
index 2d18f83db..9cd3e016a 100644
--- a/layout.c
+++ b/layout.c
@@ -120,7 +120,7 @@ int register_include_arg(struct layout_include_args **args, const char *arg)
 	struct layout_include_args *tmp;
 	char *colon;
 	char *name;
-	char *file;
+	char *file = NULL; /* file is optional, so defaults to NULL */
 
 	if (arg == NULL) {
 		msg_gerr("<NULL> is a bad region name.\n");
@@ -133,8 +133,22 @@ int register_include_arg(struct layout_include_args **args, const char *arg)
 		msg_gerr("Missing filename parameter in %s\n", arg);
 		return 1;
 	}
-	name = colon ? strndup(arg, colon - arg) : strdup(arg);
-	file = colon ? strdup(colon + 1) : NULL;
+
+	if (colon) {
+		name = strndup(arg, colon - arg);
+		if (!name) {
+			msg_gerr("Out of memory");
+			goto error;
+		}
+
+		file = strdup(colon + 1);
+		if (!file) {
+			msg_gerr("Out of memory");
+			goto error;
+		}
+	} else {
+		name = strdup(arg);
+	}
 
 	for (tmp = *args; tmp; tmp = tmp->next) {
 		if (!strcmp(tmp->name, name)) {