From: Julian Seward <jseward@acm.org>
Date: Thu, 27 Oct 2011 10:51:08 +0000 (+0000)
Subject: Merge from trunk, r12232 (Fix an out-of-bounds array access)
X-Git-Tag: svn/VALGRIND_3_7_0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19db8571ffacc90930bf62f4476fdc578760a8b0;p=thirdparty%2Fvalgrind.git

Merge from trunk, r12232 (Fix an out-of-bounds array access)


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_7_BRANCH@12240
---

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index 912609636e..5df9e043a8 100644
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -587,7 +587,9 @@ static UInt VG_(get_machine_model)(void)
    }
 
    VG_(free)( file_buf );
-   VG_(debugLog)(1, "machine", "model = %s\n", model_map[model].name);
+   VG_(debugLog)(1, "machine", "model = %s\n",
+                 model == VEX_S390X_MODEL_INVALID ? "UNKNOWN"
+                                                  : model_map[model].name);
 
    return model;
 }