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 912609636e24cf4c6ddb6f8b4f50f243cefc9514..5df9e043a89b9738d3db6f92fb4b926cd6c2fd66 100644 (file)
--- 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;
 }