Fixed memory width mismatch and null pointer issues in keyCodeForChar#2
Open
PekingSpades wants to merge 1 commit intogbevin:masterfrom
Open
Fixed memory width mismatch and null pointer issues in keyCodeForChar#2PekingSpades wants to merge 1 commit intogbevin:masterfrom
PekingSpades wants to merge 1 commit intogbevin:masterfrom
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
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.
Summary
This PR fixes two memory safety issues in
keyCodeForChar()function inNativeSystemEventsMac.mm:Memory width mismatch:
CFDictionaryGetValueIfPresentwrites a pointer-sized value (8 bytes on 64-bit), but the original code passed&codewherecodeisCGKeyCode(uint16_t, only 2 bytes). This causes stack corruption on 64-bit systems.Null pointer dereference:
charStrcould beNULLifCFStringCreateWithCharactersfails, butCFRelease(charStr)was called unconditionally.Technical Details
The 64-bit Memory Corruption Bug
According to Apple's CF source code, the function signature is:
The
valueparameter is "a pointer to memory which should be filled with the pointer-sized value".The original code:
On 64-bit systems, this writes 8 bytes into a 2-byte variable, corrupting adjacent stack memory.
As documented in A Collection of Examples of 64-bit Errors in Real Programs:
This explains why such bugs can remain undetected for long periods.
The Fix
References