diff options
| -rw-r--r-- | src/lib/dlt_user.c | 2 | ||||
| -rw-r--r-- | tests/gtest_dlt_user.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index dbe8595..ef0f36f 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -1416,7 +1416,7 @@ DltReturnValue dlt_user_log_write_raw_formatted(DltContextData *log, void *data, uint32_t type_info = 0; // check nullpointer - if (log == NULL || data == NULL) + if (log == NULL || (data == NULL && length!=0)) return DLT_RETURN_WRONG_PARAMETER; // Have to cast type to signed type because some compilers assume that DltFormatType is unsigned and issue a warning diff --git a/tests/gtest_dlt_user.cpp b/tests/gtest_dlt_user.cpp index 697834e..d4a44bc 100644 --- a/tests/gtest_dlt_user.cpp +++ b/tests/gtest_dlt_user.cpp @@ -1651,7 +1651,7 @@ TEST(t_dlt_user_log_write_raw, nullpointer) EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT)); EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw(NULL, text1, 6)); EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw(NULL, NULL, 0)); - EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw(&contextData, NULL, 0)); + EXPECT_GE(DLT_RETURN_OK,dlt_user_log_write_raw(&contextData, NULL, 0)); EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw(&contextData, NULL, 1)); EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData)); @@ -1740,7 +1740,7 @@ TEST(t_dlt_user_log_write_raw_formatted, nullpointer) EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT)); EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(NULL, text1, 6, DLT_FORMAT_DEFAULT)); EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(NULL, NULL, 0, DLT_FORMAT_DEFAULT)); - EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, NULL, 0, DLT_FORMAT_DEFAULT)); + EXPECT_GE(DLT_RETURN_OK,dlt_user_log_write_raw_formatted(&contextData, NULL, 0, DLT_FORMAT_DEFAULT)); EXPECT_GE(DLT_RETURN_ERROR,dlt_user_log_write_raw_formatted(&contextData, NULL, 1, DLT_FORMAT_DEFAULT)); EXPECT_LE(DLT_RETURN_OK,dlt_user_log_write_finish(&contextData)); |