fix bigbuf allocators (tracing + malloc) overwriting each other #2728
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
Contributor
shuffle2
commented
Jan 24, 2025
shuffle2
commented
- BigBuf.c: use s_ prefix for statics
- BigBuf_Clear_ext already calls clear_trace, so remove extra calls
- add some sanity checking of allocator args
- dont compare PDC_RNCR to false
|
You are welcome to add an entry to the CHANGELOG.md as well |
shuffle2
commented
Jan 24, 2025
| @@ -138,8 +138,9 @@ void BigBuf_Clear_keep_EM(void) { | |||
| uint8_t *BigBuf_malloc(uint16_t chunksize) { | |||
| chunksize = (chunksize + BIGBUF_ALIGN_BYTES - 1) & BIGBUF_ALIGN_MASK; // round up to next multiple of 4 | |||
|
|
|||
| if (s_bigbuf_hi < chunksize) { | |||
| return NULL; // no memory left | |||
| if (s_bigbuf_hi - s_trace_len < chunksize || chunksize == 0) { | |||
There was a problem hiding this comment.
the actual fix should just be the addition of s_bigbuf_hi - s_trace_len < chunksize here.
iceman1001
reviewed
Jan 24, 2025
armsrc/iso14443b.c
Outdated
| @@ -1381,12 +1380,12 @@ static int Get14443bAnswerFromTag(uint8_t *response, uint16_t max_len, uint32_t | |||
| if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_ENDRX)) { | |||
|
|
|||
| // primary buffer was stopped | |||
| if (AT91C_BASE_PDC_SSC->PDC_RCR == false) { | |||
| if (!AT91C_BASE_PDC_SSC->PDC_RCR) { | |||
There was a problem hiding this comment.
Code style, we are moving away from !expression since its easy to miss its a negation.
if (expression)
and
if (expression == false)
is our current code style.
There was a problem hiding this comment.
is == 0 ok in this case (it's an integer field, not boolean)?
|
Nice finding this bug! And yes, I know our contributing.md file hasn't been updated with the |
* BigBuf.c: use s_ prefix for statics * BigBuf_Clear_ext already calls clear_trace, so remove extra calls * add some sanity checking of allocator args * dont compare PDC_RNCR to false
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.