summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-12-04 11:56:52 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-12-04 11:56:52 +0000
commitda53adad31dab7a30f66d69580964d42cd8e1cd0 (patch)
treee826d642db92386cb32360ec92103d2c3341fd6e
parent204f465bee9c1aca8a7c689bd1b071ff3a820165 (diff)
downloadast2050-flashrom-da53adad31dab7a30f66d69580964d42cd8e1cd0.zip
ast2050-flashrom-da53adad31dab7a30f66d69580964d42cd8e1cd0.tar.gz
Stop reading layout info when the max layout count has been reached
Corresponding to flashrom svn r1243. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
-rw-r--r--layout.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/layout.c b/layout.c
index 9ad2f5c..92fe852 100644
--- a/layout.c
+++ b/layout.c
@@ -152,6 +152,14 @@ int read_romlayout(char *name)
while (!feof(romlayout)) {
char *tstr1, *tstr2;
+
+ if (romimages >= MAX_ROMLAYOUT) {
+ msg_gerr("Maximum number of ROM images (%i) in layout "
+ "file reached before end of layout file.\n",
+ MAX_ROMLAYOUT);
+ msg_gerr("Ignoring the rest of the layout file.\n");
+ break;
+ }
if (2 != fscanf(romlayout, "%s %s\n", tempstr, rom_entries[romimages].name))
continue;
#if 0
OpenPOWER on IntegriCloud