Skip to content

Fixed empty list parsing. #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Feb 28, 2022
Merged

Fixed empty list parsing. #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
810df18
Fixed empty list parsing.
Sep 9, 2019
d97d452
Fixed empty list parsing.
burgerkingorama Sep 9, 2019
cbad243
Same fix for binary_t.
burgerkingorama Sep 10, 2019
908b9b7
Set elements to NULL if nothing was read
burgerkingorama Sep 10, 2019
53a3539
Set elements to NULL if nothing was read
burgerkingorama Sep 10, 2019
e99d9d0
Merge branch 'develop' into EmptyListFix
Hadatko Feb 4, 2022
31c2f37
Improving kErpcStatus_MemoryError flag usage
Hadatko Feb 4, 2022
e7154ea
Improve zero list length usage
Hadatko Feb 4, 2022
b7572bd
Revert spaces in coders.template
Hadatko Feb 4, 2022
5c05b56
Minor
Hadatko Feb 4, 2022
c0fcdd6
Minor code style changes
Hadatko Feb 4, 2022
3045a37
Fixed clang compiler and pytest
Hadatko Feb 4, 2022
864f72d
Added test for empty list size.
Hadatko Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions erpc_c/infra/erpc_basic_codec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,7 @@ void BasicCodec::writeData(const void *value, uint32_t length)
{
if (isStatusOk())
{
if (value != NULL)
{
m_status = m_cursor.write(value, length);
}
else
{
m_status = kErpcStatus_MemoryError;
}
m_status = m_cursor.write(value, length);
}
}

Expand Down Expand Up @@ -202,14 +195,7 @@ void BasicCodec::readData(void *value, uint32_t length)
{
if (isStatusOk())
{
if (value != NULL)
{
m_status = m_cursor.read(value, length);
}
else
{
m_status = kErpcStatus_MemoryError;
}
m_status = m_cursor.read(value, length);
}
}

Expand Down
12 changes: 10 additions & 2 deletions erpc_c/infra/erpc_message_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ erpc_status_t MessageBuffer::Cursor::read(void *data, uint32_t length)

erpc_status_t err;

if (m_remaining < length)
if ((length > 0U) && (data == NULL))
{
err = kErpcStatus_MemoryError;
}
else if (length > m_remaining)
{
err = kErpcStatus_BufferOverrun;
}
Expand All @@ -124,7 +128,11 @@ erpc_status_t MessageBuffer::Cursor::write(const void *data, uint32_t length)

erpc_status_t err;

if (length > m_remaining)
if ((length > 0U) && (data == NULL))
{
err = kErpcStatus_MemoryError;
}
else if (length > m_remaining)
{
err = kErpcStatus_BufferOverrun;
}
Expand Down
7 changes: 6 additions & 1 deletion erpcgen/src/templates/c_client_source.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,12 @@ extern ClientManager *g_client;
{% for param in fn.parametersToClient if (param.serializedDirection == "" || param.serializedDirection == InDirection || param.referencedName != "") %}

{% if param.isNullable %}
{$clientIndent} if ({$param.nullableName} != NULL{% if ((source == "client") && (param.direction != ReturnDirection) && (empty(param.lengthName) == false)) %} && {$param.lengthName} != NULL{% endif %})
{% if ((source == "client") && (param.direction != ReturnDirection) && (empty(param.lengthName) == false)) %}
{% set lengthNameCon = ") && (" & param.lengthName & " != NULL)" >%}
{% else %}
{% set lengthNameCon = "" >%}
{% endif %}
{$clientIndent} if ({% if lengthNameCon != "" %}({% endif %}{$param.nullableName} != NULL{$lengthNameCon})
{$clientIndent} {
{$addIndent(clientIndent & " ", param.coderCall.decode(param.coderCall))}
}
Expand Down
6 changes: 3 additions & 3 deletions erpcgen/src/templates/c_coders.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if ({$info.sizeTemp} <= {$info.maxSize})
{% if source == "server" || info.useMallocOnClientSide == true %}
{$indent}{$info.name} = (uint8_t *) erpc_malloc({$info.maxSize} * sizeof(uint8_t));
{% if generateAllocErrorChecks == true %}
{$indent}if ({$info.name} == NULL)
{$indent}if (({$info.name} == NULL) && ({$info.sizeTemp} > 0))
{$indent}{
{$indent} codec->updateStatus(kErpcStatus_MemoryError);
{$indent}}
Expand Down Expand Up @@ -100,7 +100,7 @@ if ({$info.sizeTemp} <= {$info.maxSize})
{% if source == "server" || info.useMallocOnClientSide == true %}
{$indent}{$info.name} = ({$info.mallocType}) erpc_malloc({$info.maxSize} * sizeof({$info.mallocSizeType}));
{% if generateAllocErrorChecks == true %}
{$indent}if ({$info.name} == NULL)
{$indent}if (({$info.name} == NULL) && ({$info.sizeTemp} > 0))
{$indent}{
{$indent} codec->updateStatus(kErpcStatus_MemoryError);
{$indent}}
Expand Down Expand Up @@ -312,7 +312,7 @@ codec->writeCallback((arrayOfFunPtr)({$info.callbacks}), {$info.callbacksCount},

{% def encodeSharedType(info) %}
{% if sharedMemBeginAddr != "" %}
if ({$info.name} >= ERPC_SHARED_MEMORY_BEGIN && {$info.name} <= ERPC_SHARED_MEMORY_END)
if (({$info.name} >= ERPC_SHARED_MEMORY_BEGIN) && ({$info.name} <= ERPC_SHARED_MEMORY_END))
{
codec->writePtr(reinterpret_cast<uintptr_t>({%if source == "client" && info.InoutOutDirection %}*{% endif %}{$info.name}));
}
Expand Down
7 changes: 6 additions & 1 deletion erpcgen/src/templates/c_common_functions.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,12 @@ struct
{% enddef ------------------------------- unionMembersDeclaration %}

{% def f_paramIsNullableEncode(param) %}
if ({$param.nullableName} == NULL{% if ((source == "client") && (param.direction != ReturnDirection) && (empty(param.lengthName) == false)) %} || {$param.lengthName} == NULL{% endif %})
{% if ((source == "client") && (param.direction != ReturnDirection) && (empty(param.lengthName) == false)) %}
{% set lengthNameCon = ") || (" & param.lengthName & " == NULL)" >%}
{% else %}
{% set lengthNameCon = "" >%}
{% endif %}
if ({% if lengthNameCon != "" %}({% endif %}{$param.nullableName} == NULL{$lengthNameCon})
{
codec->writeNullFlag(true);
}
Expand Down
2 changes: 1 addition & 1 deletion erpcgen/src/templates/c_server_source.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ ERPC_MANUALLY_CONSTRUCTED_STATIC({$iface.serviceClassName}, s_{$iface.serviceCla
#endif
{% if serverIDName == "serviceID" %}
{% for callbackFunction in callbackType.functions %}
{$serverIndent} {% if loop.first == false %}else {% endif %}if ({$serverIDName} == {$callbackFunction.serviceId} && {$functionIDName} == {$callbackFunction.id})
{$serverIndent} {% if loop.first == false %}else {% endif %}if (({$serverIDName} == {$callbackFunction.serviceId}) && ({$functionIDName} == {$callbackFunction.id}))
{$serverIndent} {
{$serverIndent} {$callbackFunction.serverPrototype}
{$serverIndent} }
Expand Down
6 changes: 3 additions & 3 deletions erpcgen/test/test_nullable_c.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ test_client.cpp:
- void bar(const bool * l, uint32_t c)
- if: dir == 'inout' and ann == '@nullable'
then:
- if (l == NULL || c == NULL)
- if ((l == NULL) || (c == NULL))
else:
- if (l == NULL)
- codec->writeNullFlag
Expand Down Expand Up @@ -398,7 +398,7 @@ test_client.cpp:
- void bar(bool * l, uint32_t * c)
- if: ann == '@nullable'
then:
- if (l == NULL || c == NULL)
- if ((l == NULL) || (c == NULL))
else:
- if (l == NULL)
- codec->writeNullFlag
Expand All @@ -412,7 +412,7 @@ test_client.cpp:
- codec->write
- if: ann == '@nullable'
then:
- if (l != NULL && c != NULL)
- if ((l != NULL) && (c != NULL))
else:
- if (l != NULL)
- codec->startReadList
Expand Down
14 changes: 14 additions & 0 deletions test/test_lists/test_lists_client_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,20 @@ TEST(test_list, SendReceivedInt32)
erpc_free(received_list);
}

TEST(test_list, sendReceiveZeroSize)
{
list_int32_1_t *received_list, send_list;
send_list.elementsCount = 0;
send_list.elements = NULL;

received_list = sendReceivedInt32(&send_list);

EXPECT_TRUE(received_list->elementsCount == 0);

erpc_free(received_list->elements);
erpc_free(received_list);
}

TEST(test_list, SendReceived2Int32)
{
list_int32_2_t *received_list, send_list;
Expand Down