|
From: <sv...@va...> - 2011-10-27 10:55:51
|
Author: sewardj
Date: 2011-10-27 11:51:08 +0100 (Thu, 27 Oct 2011)
New Revision: 12240
Log:
Merge from trunk, r12232 (Fix an out-of-bounds array access)
Modified:
branches/VALGRIND_3_7_BRANCH/coregrind/m_machine.c
Modified: branches/VALGRIND_3_7_BRANCH/coregrind/m_machine.c
===================================================================
--- branches/VALGRIND_3_7_BRANCH/coregrind/m_machine.c 2011-10-27 10:01:17 UTC (rev 12239)
+++ branches/VALGRIND_3_7_BRANCH/coregrind/m_machine.c 2011-10-27 10:51:08 UTC (rev 12240)
@@ -587,7 +587,9 @@
}
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;
}
|