From a7b4a67c75f2a7d7480ebcbd4156f2a405c3d71b Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <mads@kiilerich.com>
Date: Tue, 28 Feb 2012 21:31:08 +0100
Subject: [PATCH] core: make rdp.c DATA_PDU_TYPE_STRINGS debug strings
 conditional and avoid out of range indexing

---
 libfreerdp-core/rdp.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/libfreerdp-core/rdp.c b/libfreerdp-core/rdp.c
index d84fe4e..1fa2c63 100644
--- a/libfreerdp-core/rdp.c
+++ b/libfreerdp-core/rdp.c
@@ -24,19 +24,20 @@
 
 #include <freerdp/crypto/per.h>
 
+#ifdef WITH_DEBUG_RDP
 static const char* const DATA_PDU_TYPE_STRINGS[] =
 {
-		"", "", /* 0x00 - 0x01 */
+		"?", "?", /* 0x00 - 0x01 */
 		"Update", /* 0x02 */
-		"", "", "", "", "", "", "", "", /* 0x03 - 0x0A */
-		"", "", "", "", "", "", "", "", "", /* 0x0B - 0x13 */
+		"?", "?", "?", "?", "?", "?", "?", "?", /* 0x03 - 0x0A */
+		"?", "?", "?", "?", "?", "?", "?", "?", "?", /* 0x0B - 0x13 */
 		"Control", /* 0x14 */
-		"", "", "", "", "", "", /* 0x15 - 0x1A */
+		"?", "?", "?", "?", "?", "?", /* 0x15 - 0x1A */
 		"Pointer", /* 0x1B */
 		"Input", /* 0x1C */
-		"", "", /* 0x1D - 0x1E */
+		"?", "?", /* 0x1D - 0x1E */
 		"Synchronize", /* 0x1F */
-		"", /* 0x20 */
+		"?", /* 0x20 */
 		"Refresh Rect", /* 0x21 */
 		"Play Sound", /* 0x22 */
 		"Suppress Output", /* 0x23 */
@@ -46,7 +47,7 @@ static const char* const DATA_PDU_TYPE_STRINGS[] =
 		"Font List", /* 0x27 */
 		"Font Map", /* 0x28 */
 		"Set Keyboard Indicators", /* 0x29 */
-		"", /* 0x2A */
+		"?", /* 0x2A */
 		"Bitmap Cache Persistent List", /* 0x2B */
 		"Bitmap Cache Error", /* 0x2C */
 		"Set Keyboard IME Status", /* 0x2D */
@@ -55,12 +56,13 @@ static const char* const DATA_PDU_TYPE_STRINGS[] =
 		"Draw Nine Grid Error", /* 0x30 */
 		"Draw GDI+ Error", /* 0x31 */
 		"ARC Status", /* 0x32 */
-		"", "", "", /* 0x33 - 0x35 */
+		"?", "?", "?", /* 0x33 - 0x35 */
 		"Status Info", /* 0x36 */
 		"Monitor Layout" /* 0x37 */
-		"", "", "", /* 0x38 - 0x40 */
-		"", "", "", "", "", "" /* 0x41 - 0x46 */
+		"?", "?", "?", /* 0x38 - 0x40 */
+		"?", "?", "?", "?", "?", "?" /* 0x41 - 0x46 */
 };
+#endif
 
 /**
  * Read RDP Security Header.\n
@@ -484,7 +486,8 @@ boolean rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s)
 
 #ifdef WITH_DEBUG_RDP
 	if (type != DATA_PDU_TYPE_UPDATE)
-		printf("recv %s Data PDU (0x%02X), length:%d\n", DATA_PDU_TYPE_STRINGS[type], type, length);
+		printf("recv %s Data PDU (0x%02X), length:%d\n",
+				type < ARRAY_SIZE(DATA_PDU_TYPE_STRINGS) ? DATA_PDU_TYPE_STRINGS[type] : "???", type, length);
 #endif
 
 	switch (type)
-- 
2.7.4