ESP32: remove use of luaM_free in file module #2631
Merged
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
jpeletier
force-pushed
the
esp32-fix-file-mem
branch
from
d2106b7
to
c1cf4dd
Compare
devsaurus
reviewed
Feb 1, 2019
| @@ -383,32 +383,27 @@ static int file_stat( lua_State* L ) | |||
| // g_read() | |||
| static int file_g_read( lua_State* L, int n, int16_t end_char, int fd ) | |||
| { | |||
| static char *heap_mem = NULL; | |||
| // free leftover memory | |||
| if (heap_mem) { | |||
There was a problem hiding this comment.
This code was added to free memory which was left allocated by a previous call. Standard execution flow doesn't need that, but heap_mem isn't freed in case lua_pushlstring() throws a memory exception as noted in #1541 (comment).
If we keep considering this corner case then bufsize would also need to be declared static.
There was a problem hiding this comment.
@devsaurus I added a new function to make a protected call to lua_pushlstring() and avoid this issue. The new luaX_pushlstring() returns nonzero instead of throwing an exception, allowing you to free memory. This function could be useful elsewhere.
Please check it out and let me know :-)
jpeletier
force-pushed
the
esp32-fix-file-mem
branch
from
c1cf4dd
to
3d3452d
Compare
devsaurus
approved these changes
Feb 18, 2019
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.
Works toward fixing #2377 for ESP32
devbranch rather than formaster.docs/en/*.modifications in
file_g_read()to avoid use ofluaM_free()