Repository navigation
Pass ExpandEnvironmentStrings its buffer size in characters ##crash - #27302
Merged
Merged
Conversation
2 of 3 tasks
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
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.
Description
r_sys_create_child_proc_w32expands the command line into a buffer of 32768TCHARs (max_lengthis in bytes), but passedmax_length - 1asnSize, whichExpandEnvironmentStringsreads as a number of characters. InUNICODEbuilds that allows 65535 characters into a 32768-character buffer, so a command line that expands to 32768 characters or more is written past the end of the heap buffer beforeCreateProcessrejects it. This affects the make-based mingw, msys and cygwin builds (mk/platform.mkadds-DUNICODE); meson/MSVC builds are ANSI, where the old size was right. It is reachable throughr_sys_cmd_str.The size is now passed in characters, and the command is not run when the expansion fails or does not fit.
Testing
I couldn't build radare2 for Windows here, and the Windows CI jobs don't run the unit tests, so I tested the function itself in a mingw-w64 harness (
-DUNICODE), with a canary after each allocation. For a 40000-character command:A short command runs the same in both.
sys/lint.py --allis clean.