Skip to content

If the buffer pointer is a null pointer then don't apply an offset to it #217

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
thiagomacieira merged 1 commit into from
Apr 4, 2022
Merged

If the buffer pointer is a null pointer then don't apply an offset to it #217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/cborparser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,7 @@ static CborError iterate_string_chunks(const CborValue *value, char *buffer, siz
return CborErrorDataTooLarge;

if (*result && *buflen >= newTotal)
*result = !!func(buffer + total, (const uint8_t *)ptr, chunkLen);
*result = !!func(buffer == NULL ? buffer : buffer + total, (const uint8_t *)ptr, chunkLen);
else
*result = false;

Expand All @@ -1221,7 +1221,7 @@ static CborError iterate_string_chunks(const CborValue *value, char *buffer, siz
/* is there enough room for the ending NUL byte? */
if (*result && *buflen > total) {
uint8_t nul[] = { 0 };
*result = !!func(buffer + total, nul, 1);
*result = !!func(buffer == NULL ? buffer : buffer + total, nul, 1);
}
*buflen = total;
return _cbor_value_finish_string_iteration(next);
Expand Down