From 6530fe75d8642f18d87d22456462a9530129cbda Mon Sep 17 00:00:00 2001
From: Vo Trung Chi <chi.votrung@vn.bosch.com>
Date: Thu, 14 Nov 2019 11:56:41 +0700
Subject: Avoided Seg fault in dlt_message_payload (#179) (#181)

* Avoided Seg fault in dlt_message_payload (#179)

 Avoided Seg fault by adding boundary check before buffer access.

Signed-off-by: Ravi Sankar P <ponnurangamravi.sankar@in.bosch.com>
Signed-off-by: Vo Trung Chi <chi.votrung@vn.bosch.com>
---
 tests/gtest_dlt_common.cpp | 71 +++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 42 deletions(-)

(limited to 'tests')

diff --git a/tests/gtest_dlt_common.cpp b/tests/gtest_dlt_common.cpp
index f5df4f5..364afbe 100644
--- a/tests/gtest_dlt_common.cpp
+++ b/tests/gtest_dlt_common.cpp
@@ -3124,56 +3124,43 @@ TEST(t_dlt_message_payload, normal)
 }
 TEST(t_dlt_message_payload, abnormal)
 {
-/*    DltFile file; */
-/*    static char text[DLT_DAEMON_TEXTSIZE]; */
+    DltFile file;
+    static char text[DLT_DAEMON_TEXTSIZE];
 
     /* Get PWD so file and filter can be used*/
-/*    char pwd[100]; */
-/*    getcwd(pwd, 100); */
-/*    char  openfile[114]; */
-/*    sprintf(openfile, "%s/testfile.dlt", pwd); */
+    char pwd[100];
+    getcwd(pwd, 100);
+    char  openfile[114];
+    sprintf(openfile, "%s/testfile.dlt", pwd);
     /*---------------------------------------*/
 
     /* Uninizialised, expected -1 */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 0)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 0)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 1)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 1)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1)); */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1)); */
+    memset(&file, 0x00, sizeof(DltFile));
+
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 0));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1));
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1));
 
     /* USE own DLT_HEADER_SHOW , expected -1 */
-/*    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 99, 0)); */
+    EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 99, 0));
 
-/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
-/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
-/*    while (dlt_file_read(&file,0)>=0){} */
-/*    for(int i=0;i<file.counter;i++) */
-/*    { */
-/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
-/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 99, 0)); */
-/*        printf("%s \n",text); */
-/*    } */
-/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
-
-    /* set verbose to 12345678 */
-/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); */
-/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); */
-/*    while (dlt_file_read(&file,0)>=0){} */
-/*    for(int i=0;i<file.counter;i++) */
-/*    { */
-/*        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0)); */
-/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 12345678)); */
-/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 12345678)); */
-/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 12345678)); */
-/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 12345678)); */
-/*        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 12345678)); */
-/*    } */
-/*    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); */
+    EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0));
+    EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0));
+    while (dlt_file_read(&file,0)>=0){}
+    for(int i=0;i<file.counter;i++)
+    {
+        EXPECT_LE(DLT_RETURN_OK, dlt_file_message(&file, i, 0));
+        EXPECT_GE(DLT_RETURN_ERROR, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 99, 0));
+        printf("%s \n",text);
+    }
+    EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0));
 }
 TEST(t_dlt_message_payload, nullpointer)
 {
-- 
cgit v1.2.1