Skip to content

Limit the number of returned access technology settings #209

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
kstribrnAmzn merged 4 commits into from
Jul 2, 2026
Merged

Limit the number of returned access technology settings #209

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcc9598
Limit the number of returned access technology settings
kstribrnAmzn Apr 20, 2026
46a5fad
Fixing memory statistics
kstribrnAmzn Jun 26, 2026
53a96f3
Add assertion for parseEidrxLine function
kstribrnAmzn Jul 2, 2026
bf0e2f2
Formatting
kstribrnAmzn Jul 2, 2026
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
4 changes: 2 additions & 2 deletions docs/doxygen/include/size_table.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</tr>
<tr>
<td>cellular_3gpp_api.c</td>
<td><center>6.4K</center></td>
<td><center>6.5K</center></td>
<td><center>5.9K</center></td>
</tr>
<tr>
Expand Down Expand Up @@ -44,7 +44,7 @@
</tr>
<tr>
<td><b>Total estimates</b></td>
<td><b><center>15.3K</center></b></td>
<td><b><center>15.4K</center></b></td>
<td><b><center>13.9K</center></b></td>
</tr>
</table>
7 changes: 6 additions & 1 deletion source/cellular_3gpp_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,7 @@ static CellularPktStatus_t _Cellular_RecvFuncGetEidrxSettings( CellularContext_t
{
LogDebug( ( "GetEidrx: empty EDRXS setting %s", pInputLine ) );
}
else
else if( count < CELLULAR_EDRX_LIST_MAX_SIZE )
{
atCoreStatus = parseEidrxLine( pInputLine, count, pEidrxSettingsList );
pktStatus = _Cellular_TranslateAtCoreStatus( atCoreStatus );
Expand All @@ -1400,6 +1400,11 @@ static CellularPktStatus_t _Cellular_RecvFuncGetEidrxSettings( CellularContext_t
count++;
}
}
else
{
LogError( ( "GetEidrx: eidrxList is full, CELLULAR_EDRX_LIST_MAX_SIZE=%u", CELLULAR_EDRX_LIST_MAX_SIZE ) );
pktStatus = CELLULAR_PKT_STATUS_SIZE_MISMATCH;
}

pCommnadItem = pCommnadItem->pNext;
pEidrxSettingsList->count = count;
Expand Down
46 changes: 46 additions & 0 deletions test/unit-test/cellular_3gpp_api_utest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,22 @@ CellularPktStatus_t Mock_AtcmdRequestWithCallback__Cellular_Cellular_RecvFuncGet
_saveData( pLine2, &atResp, sizeof( pLine2 ) );
pktStatus = atReq.respCallback( pContext, &atResp, &cellularEidrxSettingsList, sizeof( CELLULAR_EDRX_LIST_MAX_SIZE ) );
}
else if( cbCondition == 5 )
{
/* Create CELLULAR_EDRX_LIST_MAX_SIZE + 1 parseable lines to exercise the
* bounds check. The callback must cap count at CELLULAR_EDRX_LIST_MAX_SIZE
* and not write past the end of the eidrxList array. */
char pLines[ CELLULAR_EDRX_LIST_MAX_SIZE + 1 ][ sizeof( CELLULAR_SAMPLE_PREFIX_STRING_INPUT ) ];
uint8_t i;

for( i = 0; i < CELLULAR_EDRX_LIST_MAX_SIZE + 1; i++ )
{
memcpy( pLines[ i ], CELLULAR_SAMPLE_PREFIX_STRING_INPUT, sizeof( CELLULAR_SAMPLE_PREFIX_STRING_INPUT ) );
_saveData( pLines[ i ], &atResp, sizeof( pLines[ i ] ) );
}

pktStatus = atReq.respCallback( pContext, &atResp, &cellularEidrxSettingsList, CELLULAR_EDRX_LIST_MAX_SIZE );
}

return pktStatus;
}
Expand Down Expand Up @@ -1844,6 +1860,36 @@ void test_Cellular_CommonGetEidrxSettings_Cb_Cellular_RecvFuncGetEidrxSettings_H
TEST_ASSERT_EQUAL( CELLULAR_SUCCESS, cellularStatus );
}

/**
* @brief Test that _Cellular_RecvFuncGetEidrxSettings returns an error and does
* not write past eidrxList when the modem returns more than
* CELLULAR_EDRX_LIST_MAX_SIZE +CEDRXS lines.
*/
void test_Cellular_CommonGetEidrxSettings_Cb_Cellular_RecvFuncGetEidrxSettings_Overflow_Capped( void )
{
CellularError_t cellularStatus = CELLULAR_SUCCESS;
CellularContext_t context;

memset( &context, 0, sizeof( CellularContext_t ) );
CellularHandle_t cellularHandle = &context;
CellularEidrxSettingsList_t eidrxSettingsList;

memset( &eidrxSettingsList, 0, sizeof( CellularEidrxSettingsList_t ) );

_Cellular_CheckLibraryStatus_IgnoreAndReturn( CELLULAR_SUCCESS );
_Cellular_IsValidPdn_IgnoreAndReturn( CELLULAR_SUCCESS );
cbCondition = 5;
_Cellular_AtcmdRequestWithCallback_StubWithCallback( Mock_AtcmdRequestWithCallback__Cellular_Cellular_RecvFuncGetEidrxSettings );
Cellular_ATRemovePrefix_IgnoreAndReturn( CELLULAR_AT_SUCCESS );
Cellular_ATRemoveAllDoubleQuote_IgnoreAndReturn( CELLULAR_AT_SUCCESS );
Cellular_ATGetNextTok_StubWithCallback( Mock_Cellular_ATGetNextTok_Calback );
Cellular_ATStrtoi_IgnoreAndReturn( CELLULAR_AT_SUCCESS );
_Cellular_TranslateAtCoreStatus_IgnoreAndReturn( CELLULAR_PKT_STATUS_OK );
_Cellular_TranslatePktStatus_ExpectAndReturn( CELLULAR_PKT_STATUS_SIZE_MISMATCH, CELLULAR_INTERNAL_FAILURE );
cellularStatus = Cellular_CommonGetEidrxSettings( cellularHandle, &eidrxSettingsList );
TEST_ASSERT_EQUAL( CELLULAR_INTERNAL_FAILURE, cellularStatus );
}

/**
* @brief Test that happy path case Cellular_CommonGetEidrxSettings to return CELLULAR_SUCCESS.
*/
Expand Down
Loading