From a7223422862e8391f2bc60e923dd056721cb4bba Mon Sep 17 00:00:00 2001
From: Patrick Georgi <pgeorgi@chromium.org>
Date: Mon, 2 Jan 2017 19:15:44 +0100
Subject: [PATCH] UPSTREAM: util/romcc: avoid dereferencing NULL pointer

argv is only filled for macro->argc > 0.

BUG=None
BRANCH=None
TEST=None

Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Found-by: Coverity Scan #1287089
Reviewed-on: https://review.coreboot.org/18016
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>

Change-Id: I5ff21098384afc823efa14be3d5565507fb2b3b2
Reviewed-on: https://chromium-review.googlesource.com/425285
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 util/romcc/romcc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
index 2fa400af2b..62fe758ef6 100644
--- a/util/romcc/romcc.c
+++ b/util/romcc/romcc.c
@@ -4580,6 +4580,9 @@ static void expand_macro(struct compile_state *state,
 		flen = fmacro.pos - fstart;
 		switch(tk->tok) {
 		case TOK_IDENT:
+			if (macro->argc < 0) {
+				break;
+			}
 			for(i = 0; i < macro->argc; i++) {
 				if (argv[i].ident == tk->ident) {
 					break;