GENDLT-15, Safe re-allocations for databuffer.

Signed-off-by: Christian Muck <christian.muck@bmw.de>

2 files changed, 14 insertions, 7 deletions

diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c
index 39b5b07..b3962a7 100755
--- a/src/lib/dlt_client.c
+++ b/src/lib/dlt_client.c
@@ -327,11 +327,15 @@ int dlt_client_send_inject_msg(DltClient *client, char *apid, char *ctid, uint32
 
 	/* prepare payload of data */
 	msg.datasize = sizeof(uint32_t) + sizeof(uint32_t) + size;
-	if (msg.databuffer)
+	if (msg.databuffer && (msg.databuffersize < msg.datasize))
 	{
 		free(msg.databuffer);
+		msg.databuffer=0;
+	}
+	if (msg.databuffer == 0){
+		msg.databuffer = (uint8_t *) malloc(msg.datasize);
+		msg.databuffersize = msg.datasize;
 	}
-	msg.databuffer = (uint8_t *) malloc(msg.datasize);
 
 	memcpy(msg.databuffer  , &serviceID,sizeof(serviceID));
 	offset+=sizeof(uint32_t);
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 3e8bf0e..b9ceb14 100755
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -469,11 +469,14 @@ int dlt_register_app(const char *appid, const char * description)
 
     if (description!=0)
     {
-        dlt_user.application_description= malloc(strlen(description)+1);
-        strncpy(dlt_user.application_description, description, strlen(description));
+        size_t desc_len = strlen(description);
+        dlt_user.application_description= malloc(desc_len+1);
+        if (dlt_user.application_description){
+            strncpy(dlt_user.application_description, description, desc_len);
 
-        /* Terminate transmitted string with 0 */
-        dlt_user.application_description[strlen(description)]='\0';
+            /* Terminate transmitted string with 0 */
+            dlt_user.application_description[desc_len]='\0';
+        }
     }
 
     DLT_SEM_FREE();
@@ -667,7 +670,7 @@ int dlt_register_context_ll_ts(DltContext *handle, const char *contextid, const
 
         if (description!=0)
         {
-        	int desc_len = strlen(description);
+        	size_t desc_len = strlen(description);
             dlt_user.dlt_ll_ts[dlt_user.dlt_ll_ts_num_entries].context_description = malloc(desc_len+1);
             strncpy(dlt_user.dlt_ll_ts[dlt_user.dlt_ll_ts_num_entries].context_description, description, desc_len);