From 29fbb761ec559b22b7aa9a4b6cb88409545b40c4 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 22 Dec 2008 16:42:59 +0000 Subject: If you pass a bogus layout file to the -l option flashrom will segfault. Fix that by throwing an error instead. Signed-off-by: Uwe Hermann Acked-by: Carl-Daniel Hailfinger Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3834 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/flashrom/layout.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/flashrom/layout.c b/util/flashrom/layout.c index ef0958286f..e2be12e9a9 100644 --- a/util/flashrom/layout.c +++ b/util/flashrom/layout.c @@ -156,6 +156,11 @@ int read_romlayout(char *name) #endif tstr1 = strtok(tempstr, ":"); tstr2 = strtok(NULL, ":"); + if (!tstr1 || !tstr2) { + fprintf(stderr, "Error parsing layout file.\n"); + fclose(romlayout); + return 1; + } rom_entries[romimages].start = strtol(tstr1, (char **)NULL, 16); rom_entries[romimages].end = strtol(tstr2, (char **)NULL, 16); rom_entries[romimages].included = 0; -- cgit v1.2.3