Use lib_free for memory deallocation after strdup or asprintf #10110
Conversation
This file contains hidden or 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
This reverts commit 7884c18.
The memory allocated with strdup and asprintf is done via lib_malloc so we need to use lib_free to deallocate memory otherwise the assertion "Free memory from the wrong heap" is hit with flat mode and user separated heap enabled mode. Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
pkarashchenko
force-pushed
the
_fix_free_after_strdup
branch
2 times, most recently
from
424ab43 to
f4934ca
Compare
Contributor
|
I'll let our internal CI running and tomorrow morning I'll review the PR ;) |
pkarashchenko
force-pushed
the
_fix_free_after_strdup
branch
from
f4934ca to
2fff68f
Compare
xiaoxiang781216
approved these changes
Aug 8, 2023
|
conflicting target on RISC, the rest that is just cascading. -> _off_t Error: chip/esp_libc_stubs.c:97:5: error: conflicting types for '_lseek_r'
[469](https://github.com/apache/nuttx/actions/runs/5791110743/job/15695470612?pr=10110#step:7:470)
97 | int _lseek_r(struct _reent *r, int fd, int offset, int whence)
[470](https://github.com/apache/nuttx/actions/runs/5791110743/job/15695470612?pr=10110#step:7:471)
| ^~~~~~~~
[471](https://github.com/apache/nuttx/actions/runs/5791110743/job/15695470612?pr=10110#step:7:472)
In file included from /github/workspace/sources/nuttx/arch/risc-v/src/chip/esp-hal-3rdparty/components/esp_rom/include/esp32c3/rom/libc_stubs.h:14,
[472](https://github.com/apache/nuttx/actions/runs/5791110743/job/15695470612?pr=10110#step:7:473)
from chip/esp_libc_stubs.c:41:
[473](https://github.com/apache/nuttx/actions/runs/5791110743/job/15695470612?pr=10110#step:7:474)
/tools/riscv64-unknown-elf-gcc/riscv64-unknown-elf/include/reent.h:148:15: note: previous declaration of '_lseek_r' was here
[474](https://github.com/apache/nuttx/actions/runs/5791110743/job/15695470612?pr=10110#step:7:475)
148 | extern _off_t _lseek_r (struct _reent *, int, _off_t, int); |
Contributor
|
As far as I tested on ESP32, the build passed and the crash former seen has been fixed. |
pkarashchenko
force-pushed
the
_fix_free_after_strdup
branch
from
2fff68f to
17ce5b9
Compare
gustavonihei
reviewed
Aug 8, 2023
pkarashchenko
force-pushed
the
_fix_free_after_strdup
branch
3 times, most recently
from
ba56f0e to
9a6ebcb
Compare
xiaoxiang781216
approved these changes
Aug 8, 2023
jerpelea
approved these changes
Aug 8, 2023
Contributor
|
Re-running our internal CI... |
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
pkarashchenko
force-pushed
the
_fix_free_after_strdup
branch
from
9a6ebcb to
263f1b3
Compare
xiaoxiang781216
approved these changes
Aug 8, 2023
tmedicci
approved these changes
Aug 8, 2023
Contributor
tmedicci
left a comment
tmedicci
left a comment
There was a problem hiding this comment.
Our internal CI passed succesfully ;)
jerpelea
approved these changes
Aug 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Summary
This PR contains next set of the changes:
lib_freefor memory de-allocation afterstrduporasprintfFARqualifier_SCHED_GETPIDingetpgrp()implementationImpact
Should fix assert "Free memory from the wrong heap" with flat mode and user separated heap enabled mode
Testing
Pass CI