diff options
| -rw-r--r-- | include/dlt/dlt_common.h | 21 | ||||
| -rw-r--r-- | src/shared/dlt_common.c | 114 | ||||
| -rw-r--r-- | src/tests/dlt-test-client.c | 20 | ||||
| -rw-r--r-- | tests/gtest_dlt_common.cpp | 71 |
4 files changed, 113 insertions, 113 deletions
diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index a418e7d..f4248ea 100644 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -313,14 +313,21 @@ enum { { memcpy(dst, src, DLT_ID_SIZE); src += DLT_ID_SIZE; length -= DLT_ID_SIZE; } \ } -# define DLT_MSG_READ_STRING(dst, src, maxlength, length) \ +#define DLT_MSG_READ_STRING(dst, src, maxlength, dstlength, length) \ +{ \ + if ((maxlength < 0) || (length <= 0) || (dstlength < length) || (maxlength < length)) \ { \ - if (((maxlength) < 0) || ((length) < 0) || ((maxlength) < (length))) \ - { maxlength = -1; } \ - else \ - { memcpy(dst, src, length); dlt_clean_string(dst, length); dst[length] = 0; \ - src += length; maxlength -= length; } \ - } + maxlength = -1; \ + } \ + else \ + { \ + memcpy(dst, src, length); \ + dlt_clean_string(dst, length); \ + dst[length] = 0; \ + src += length; \ + maxlength -= length; \ + } \ +} # define DLT_MSG_READ_NULL(src, maxlength, length) \ { \ diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index b699ad3..42ba516 100644 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -763,10 +763,12 @@ DltReturnValue dlt_message_payload(DltMessage *msg, char *text, int textlength, int num; uint32_t type_info = 0, type_info_tmp = 0; + int text_offset = 0; PRINT_FUNCTION_VERBOSE(verbose); - if ((msg == NULL) || (text == NULL)) + if ((msg == NULL) || (msg->databuffer == NULL) || (text == NULL) || + (type < DLT_OUTPUT_HEX) || (type > DLT_OUTPUT_ASCII_LIMITED)) return DLT_RETURN_WRONG_PARAMETER; if (textlength <= 0) { @@ -867,15 +869,19 @@ DltReturnValue dlt_message_payload(DltMessage *msg, char *text, int textlength, type_info_tmp = 0; for (num = 0; num < (int)(msg->extendedheader->noar); num++) { - if (num != 0) - snprintf(text + strlen(text), textlength - strlen(text), " "); + if (num != 0) { + text_offset = (int)strlen(text); + snprintf(text + text_offset, textlength - text_offset, " "); + } /* first read the type info of the argument */ DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t); type_info = DLT_ENDIAN_GET_32(msg->standardheader->htyp, type_info_tmp); /* print out argument */ - if (dlt_message_argument_print(msg, type_info, pptr, pdatalength, text, textlength, -1, 0) == DLT_RETURN_ERROR) + text_offset = (int)strlen(text); + if (dlt_message_argument_print(msg, type_info, pptr, pdatalength, + (text + text_offset), (textlength - text_offset), -1, 0) == DLT_RETURN_ERROR) return DLT_RETURN_ERROR; } @@ -3138,8 +3144,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((msg == NULL) || (ptr == NULL) || (datalength == NULL) || (text == NULL)) return DLT_RETURN_WRONG_PARAMETER; - int16_t length = 0, length_tmp = 0; /* the macro can set this variable to -1 */ - uint16_t length2 = 0, length2_tmp = 0, length3 = 0, length3_tmp = 0; + uint16_t length = 0, length2 = 0, length3 = 0; uint8_t value8u = 0; uint16_t value16u = 0, value16u_tmp = 0; @@ -3167,24 +3172,24 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, (((type_info & DLT_TYPE_INFO_SCOD) == DLT_SCOD_ASCII) || ((type_info & DLT_TYPE_INFO_SCOD) == DLT_SCOD_UTF8))) { /* string type or utf8-encoded string type */ if (byteLength < 0) { - DLT_MSG_READ_VALUE(length_tmp, *ptr, *datalength, uint16_t); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length_tmp); + length = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); } else { - length = (int16_t)byteLength; + length = (uint16_t)byteLength; } if (type_info & DLT_TYPE_INFO_VARI) { - DLT_MSG_READ_VALUE(length2_tmp, *ptr, *datalength, uint16_t); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length2_tmp); + length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if ((*datalength) < length2) return DLT_RETURN_ERROR; @@ -3193,7 +3198,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, *datalength -= length2; } - DLT_MSG_READ_STRING((text + strlen(text)), *ptr, *datalength, length); + DLT_MSG_READ_STRING(text, *ptr, *datalength, textlength, length); if ((*datalength) < 0) return DLT_RETURN_ERROR; @@ -3202,12 +3207,12 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, { /* Boolean type */ if (type_info & DLT_TYPE_INFO_VARI) { - DLT_MSG_READ_VALUE(length2_tmp, *ptr, *datalength, uint16_t); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length2_tmp); + length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if ((*datalength) < length2) return DLT_RETURN_ERROR; @@ -3222,7 +3227,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - snprintf(text + strlen(text), textlength - strlen(text), "%d", value8u); + snprintf(text, textlength, "%d", value8u); } else if ((type_info & DLT_TYPE_INFO_UINT) && (DLT_SCOD_BIN == (type_info & DLT_TYPE_INFO_SCOD))) { @@ -3242,7 +3247,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, strcat(binary, (i == (value8u & i)) ? "1" : "0"); } - snprintf(text + strlen(text), textlength - strlen(text), "0b%s", binary); + snprintf(text, textlength, "0b%s", binary); } if (DLT_TYLE_16BIT == (type_info & DLT_TYPE_INFO_TYLE)) { @@ -3261,7 +3266,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, strcat(binary, (i == (value16u & i)) ? "1" : "0"); } - snprintf(text + strlen(text), textlength - strlen(text), "0b%s", binary); + snprintf(text, textlength, "0b%s", binary); } } else if ((type_info & DLT_TYPE_INFO_UINT) && (DLT_SCOD_HEX == (type_info & DLT_TYPE_INFO_SCOD))) @@ -3272,7 +3277,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - snprintf(text + strlen(text), textlength - strlen(text), "0x%02x", value8u); + snprintf(text, textlength, "0x%02x", value8u); } if (DLT_TYLE_16BIT == (type_info & DLT_TYPE_INFO_TYLE)) { @@ -3281,7 +3286,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - snprintf(text + strlen(text), textlength - strlen(text), "0x%04x", value16u); + snprintf(text, textlength, "0x%04x", value16u); } if (DLT_TYLE_32BIT == (type_info & DLT_TYPE_INFO_TYLE)) { @@ -3290,7 +3295,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - snprintf(text + strlen(text), textlength - strlen(text), "0x%08x", value32u); + snprintf(text, textlength, "0x%08x", value32u); } if (DLT_TYLE_64BIT == (type_info & DLT_TYPE_INFO_TYLE)) { @@ -3300,7 +3305,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - snprintf(text + strlen(text), textlength - strlen(text), "0x%08x", value32u); + snprintf(text, textlength, "0x%08x", value32u); *ptr -= 8; DLT_MSG_READ_VALUE(value32u, *ptr, *datalength, uint32_t); @@ -3315,18 +3320,18 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, { /* signed or unsigned argument received */ if (type_info & DLT_TYPE_INFO_VARI) { - DLT_MSG_READ_VALUE(length2_tmp, *ptr, *datalength, uint16_t); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length2_tmp); - DLT_MSG_READ_VALUE(length3_tmp, *ptr, *datalength, uint16_t); + length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length3 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length3_tmp); + length3 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if ((*datalength) < length2) return DLT_RETURN_ERROR; @@ -3394,7 +3399,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - snprintf(text + strlen(text), textlength - strlen(text), "%d", value8i); + snprintf(text, textlength, "%d", value8i); } else { value8u = 0; @@ -3403,7 +3408,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - snprintf(text + strlen(text), textlength - strlen(text), "%d", value8u); + snprintf(text, textlength, "%d", value8u); } break; @@ -3419,7 +3424,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, return DLT_RETURN_ERROR; value16i = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16i_tmp); - snprintf(text + strlen(text), textlength - strlen(text), "%hd", value16i); + snprintf(text, textlength, "%hd", value16i); } else { value16u = 0; @@ -3430,7 +3435,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, return DLT_RETURN_ERROR; value16u = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); - snprintf(text + strlen(text), textlength - strlen(text), "%hu", value16u); + snprintf(text, textlength, "%hu", value16u); } break; @@ -3446,7 +3451,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, return DLT_RETURN_ERROR; value32i = DLT_ENDIAN_GET_32(msg->standardheader->htyp, (uint32_t)value32i_tmp); - snprintf(text + strlen(text), textlength - strlen(text), "%d", value32i); + snprintf(text, textlength, "%d", value32i); } else { value32u = 0; @@ -3457,7 +3462,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, return DLT_RETURN_ERROR; value32u = DLT_ENDIAN_GET_32(msg->standardheader->htyp, value32u_tmp); - snprintf(text + strlen(text), textlength - strlen(text), "%u", value32u); + snprintf(text, textlength, "%u", value32u); } break; @@ -3474,9 +3479,9 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, value64i = DLT_ENDIAN_GET_64(msg->standardheader->htyp, (uint64_t)value64i_tmp); #if defined (__WIN32__) && !defined(_MSC_VER) - snprintf(text + strlen(text), textlength - strlen(text), "%I64d", value64i); + snprintf(text, textlength, "%I64d", value64i); #else - snprintf(text + strlen(text), textlength - strlen(text), "%" PRId64, value64i); + snprintf(text, textlength, "%" PRId64, value64i); #endif } else { @@ -3489,9 +3494,9 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, value64u = DLT_ENDIAN_GET_64(msg->standardheader->htyp, value64u_tmp); #if defined (__WIN32__) && !defined(_MSC_VER) - snprintf(text + strlen(text), textlength - strlen(text), "%I64u", value64u); + snprintf(text, textlength, "%I64u", value64u); #else - snprintf(text + strlen(text), textlength - strlen(text), "%" PRId64, value64u); + snprintf(text, textlength, "%" PRId64, value64u); #endif } @@ -3500,7 +3505,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, case DLT_TYLE_128BIT: { if (*datalength >= 16) - dlt_print_hex_string(text + strlen(text), textlength, *ptr, 16); + dlt_print_hex_string(text, textlength, *ptr, 16); if ((*datalength) < 16) return DLT_RETURN_ERROR; @@ -3519,18 +3524,18 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, { /* float data argument */ if (type_info & DLT_TYPE_INFO_VARI) { - DLT_MSG_READ_VALUE(length2_tmp, *ptr, *datalength, uint16_t); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length2_tmp); - DLT_MSG_READ_VALUE(length3_tmp, *ptr, *datalength, uint16_t); + length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length3 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length3_tmp); + length3 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if ((*datalength) < length2) return DLT_RETURN_ERROR; @@ -3549,7 +3554,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, case DLT_TYLE_8BIT: { if (*datalength >= 1) - dlt_print_hex_string(text + strlen(text), textlength, *ptr, 1); + dlt_print_hex_string(text, textlength, *ptr, 1); if ((*datalength) < 1) return DLT_RETURN_ERROR; @@ -3561,7 +3566,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, case DLT_TYLE_16BIT: { if (*datalength >= 2) - dlt_print_hex_string(text + strlen(text), textlength, *ptr, 2); + dlt_print_hex_string(text, textlength, *ptr, 2); if ((*datalength) < 2) return DLT_RETURN_ERROR; @@ -3586,7 +3591,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, value32f_tmp_int32i_swaped = DLT_ENDIAN_GET_32(msg->standardheader->htyp, (uint32_t)value32f_tmp_int32i); memcpy(&value32f, &value32f_tmp_int32i_swaped, sizeof(float32_t)); - snprintf(text + strlen(text), textlength - strlen(text), "%g", value32f); + snprintf(text, textlength, "%g", value32f); } else { dlt_log(LOG_ERR, "Invalid size of float32_t\n"); @@ -3612,9 +3617,9 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, DLT_ENDIAN_GET_64(msg->standardheader->htyp, (uint64_t)value64f_tmp_int64i); memcpy(&value64f, &value64f_tmp_int64i_swaped, sizeof(float64_t)); #ifdef __arm__ - snprintf(text + strlen(text), textlength - strlen(text), "ILLEGAL"); + snprintf(text, textlength, "ILLEGAL"); #else - snprintf(text + strlen(text), textlength - strlen(text), "%g", value64f); + snprintf(text, textlength, "%g", value64f); #endif } else { @@ -3627,7 +3632,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, case DLT_TYLE_128BIT: { if (*datalength >= 16) - dlt_print_hex_string(text + strlen(text), textlength, *ptr, 16); + dlt_print_hex_string(text, textlength, *ptr, 16); if ((*datalength) < 16) return DLT_RETURN_ERROR; @@ -3645,20 +3650,20 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, else if (type_info & DLT_TYPE_INFO_RAWD) { /* raw data argument */ - DLT_MSG_READ_VALUE(length_tmp, *ptr, *datalength, uint16_t); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length_tmp); + length = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if (type_info & DLT_TYPE_INFO_VARI) { - DLT_MSG_READ_VALUE(length2_tmp, *ptr, *datalength, uint16_t); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length2_tmp); + length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if ((*datalength) < length2) return DLT_RETURN_ERROR; @@ -3670,20 +3675,21 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < length) return DLT_RETURN_ERROR; - dlt_print_hex_string(text + strlen(text), textlength, *ptr, length); + dlt_print_hex_string(text, textlength, *ptr, length); *ptr += length; *datalength -= length; } else if (type_info & DLT_TYPE_INFO_TRAI) { /* trace info argument */ - DLT_MSG_READ_VALUE(length_tmp, *ptr, *datalength, uint16_t); + DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length = DLT_ENDIAN_GET_16(msg->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING((text + strlen(text)), *ptr, *datalength, length); + length = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + + DLT_MSG_READ_STRING(text, *ptr, *datalength, textlength, length); if ((*datalength) < 0) return DLT_RETURN_ERROR; diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c index 4edccff..5f5a884 100644 --- a/src/tests/dlt-test-client.c +++ b/src/tests/dlt-test-client.c @@ -1171,7 +1171,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char chdr[10]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(chdr, ptr, datalength, length); + DLT_MSG_READ_STRING(chdr, ptr, datalength, (int)sizeof(chdr), length); if (strcmp((char *)chdr, DLT_TRACE_NW_TRUNCATED) == 0) dltdata->test_counter_macro[7]++; @@ -1183,7 +1183,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char hdr[2048]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(hdr, ptr, datalength, length); + DLT_MSG_READ_STRING(hdr, ptr, datalength, (int)sizeof(hdr), length); if ((length == 16) && (hdr[15] == 15)) dltdata->test_counter_macro[7]++; @@ -1276,7 +1276,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char chdr[10]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(chdr, ptr, datalength, length); + DLT_MSG_READ_STRING(chdr, ptr, datalength, (int)sizeof(chdr), length); if (strcmp((char *)chdr, DLT_TRACE_NW_START) == 0) dltdata->test_counter_macro[8]++; @@ -1373,7 +1373,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char chdr[10]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(chdr, ptr, datalength, length); + DLT_MSG_READ_STRING(chdr, ptr, datalength, (int)sizeof(chdr), length); if (strcmp((char *)chdr, DLT_TRACE_NW_SEGMENT) == 0) dltdata->test_counter_macro[8]++; @@ -1435,7 +1435,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char chdr[10]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(chdr, ptr, datalength, length); + DLT_MSG_READ_STRING(chdr, ptr, datalength, (int)sizeof(chdr), length); if (strcmp((char *)chdr, DLT_TRACE_NW_END) == 0) dltdata->test_counter_macro[8]++; @@ -2195,7 +2195,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char chdr[10]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(chdr, ptr, datalength, length); + DLT_MSG_READ_STRING(chdr, ptr, datalength, (int)sizeof(chdr), length); if (strcmp((char *)chdr, DLT_TRACE_NW_TRUNCATED) == 0) dltdata->test_counter_function[7]++; @@ -2207,7 +2207,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char hdr[2048]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(hdr, ptr, datalength, length); + DLT_MSG_READ_STRING(hdr, ptr, datalength, (int)sizeof(hdr), length); if ((length == 16) && (hdr[15] == 15)) dltdata->test_counter_function[7]++; @@ -2300,7 +2300,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char chdr[10]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(chdr, ptr, datalength, length); + DLT_MSG_READ_STRING(chdr, ptr, datalength, (int)sizeof(chdr), length); if (strcmp((char *)chdr, DLT_TRACE_NW_START) == 0) dltdata->test_counter_function[8]++; @@ -2397,7 +2397,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char chdr[10]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(chdr, ptr, datalength, length); + DLT_MSG_READ_STRING(chdr, ptr, datalength, (int)sizeof(chdr), length); if (strcmp((char *)chdr, DLT_TRACE_NW_SEGMENT) == 0) dltdata->test_counter_function[8]++; @@ -2459,7 +2459,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) char chdr[10]; DLT_MSG_READ_VALUE(length_tmp, ptr, datalength, uint16_t); length = DLT_ENDIAN_GET_16(message->standardheader->htyp, length_tmp); - DLT_MSG_READ_STRING(chdr, ptr, datalength, length); + DLT_MSG_READ_STRING(chdr, ptr, datalength, (int)sizeof(chdr), length); if (strcmp((char *)chdr, DLT_TRACE_NW_END) == 0) dltdata->test_counter_function[8]++; 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) { |