commit c5e31f5f0050ebeece73661bbabf6fc13f41d9fa
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 24 20:54:14 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 24 20:54:14 2013 -0700
tree fdf6e9a87d05ab9a0b4ed9bc540bde8d7de5fde4
parent 3050e23507325e409e555a1b1ca83062f02e1b94
parent 3fb792007889a61ad96905792126e869deb5ca5f

Merge "FSM9900: Use addresses embedded in boot.img"

dev/gcdb/display/gcdb_display.c

diff --git a/dev/gcdb/display/gcdb_display.c b/dev/gcdb/display/gcdb_display.c
index 011a7c4..d4d1cb0 100755
--- a/dev/gcdb/display/gcdb_display.c
+++ b/dev/gcdb/display/gcdb_display.c
@@ -152,9 +152,15 @@
 {
 	char *dsi_id = panelstruct.paneldata->panel_controller;
 	char *panel_node = panelstruct.paneldata->panel_node_id;
+	uint16_t dsi_id_len = 0;
 	bool ret = true;
 
-	if (buf_size < (strlen(panel_node) + MAX_DSI_STREAM_LEN +
+	if (dsi_id == NULL || panel_node == NULL)
+		return false;
+
+	dsi_id_len = strlen(dsi_id);
+
+	if (buf_size < (strlen(panel_node) + dsi_id_len +
 			MAX_PANEL_FORMAT_STRING + 1) ||
 		!strlen(panel_node) ||
 		!strlen(dsi_id))
@@ -169,8 +175,8 @@
 		buf_size -= MAX_PANEL_FORMAT_STRING;
 
 		strlcpy(pbuf, dsi_id, buf_size);
-		pbuf += MAX_DSI_STREAM_LEN;
-		buf_size -= MAX_DSI_STREAM_LEN;
+		pbuf += dsi_id_len;
+		buf_size -= dsi_id_len;
 
 		strlcpy(pbuf, panel_node, buf_size);
 	}

dev/gcdb/display/gcdb_display.h

diff --git a/dev/gcdb/display/gcdb_display.h b/dev/gcdb/display/gcdb_display.h
index d7249e5..16dd2c0 100755
--- a/dev/gcdb/display/gcdb_display.h
+++ b/dev/gcdb/display/gcdb_display.h
@@ -43,8 +43,6 @@
 #define BIST_SIZE 6
 #define LANE_SIZE 45
 
-#define MAX_DSI_STREAM_LEN 6
-
 #define MAX_PANEL_FORMAT_STRING 2
 
 /*---------------------------------------------------------------------------*/