Fix potential buffer overflow in parseStringValue #152
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| CHECK_EQUAL_C_INT(SHADOW_JSON_ERROR, rc); | ||
|
|
||
| /* Ensure there was no attempt to write to a buffer that's too small. */ | ||
| for(i = 0; i < STRING_BUFFER_LENGTH; i++) |
There was a problem hiding this comment.
NP: You could do a mem compare
There was a problem hiding this comment.
Wouldn't that require keeping an additional block of all-zero memory around?
|
|
||
| CHECK_EQUAL_C_INT(3, r); | ||
| CHECK_EQUAL_C_INT(SUCCESS, rc); | ||
| CHECK_EQUAL_C_STRING("this is a longer string for test 2", parsedString); | ||
| } | ||
|
|
||
| /* Test that parsing a string doesn't overflow the given buffer. */ | ||
| TEST_C(JsonUtils, ParseStringWithBufferTooSmall) { |
There was a problem hiding this comment.
You should test the happy path too :)
There was a problem hiding this comment.
Like when the buffer is big enough? I think that's adequately tested by the integration tests (jobs integration test).
| @@ -354,28 +354,28 @@ bool isJsonValidAndParse(const char *pJsonDocument, void *pJsonHandler, int32_t | |||
| } | |||
|
|
|||
| static IoT_Error_t UpdateValueIfNoObject(const char *pJsonString, jsonStruct_t *pDataStruct, jsmntok_t token) { | |||
There was a problem hiding this comment.
A look up table could look better. Though it is a risky change.
| @@ -170,12 +170,9 @@ IoT_Error_t parseBooleanValue(bool *b, const char *jsonString, jsmntok_t *token) | |||
| IOT_WARN("Token was not a primitive."); | |||
| return JSON_PARSE_ERROR; | |||
| } | |||
| if(jsonString[token->start] == 't' && jsonString[token->start + 1] == 'r' && jsonString[token->start + 2] == 'u' | |||
| && jsonString[token->start + 3] == 'e') { | |||
| if(strncmp(jsonString + token->start, "true", 4) == 0) { | |||
huguesBouvier
approved these changes
Apr 6, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requires the inclusion of a buffer size in jsonStruct_t.
In response to #151.