Skip to content

Fix memory safety issues in KeyCodeConverter #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PekingSpades wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix memory safety issues in KeyCodeConverter #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions CodingKeys/KeyCodeConverter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ + (NSDictionary *)fixKeys {
static CGKeyCode keyCodeForChar(const char c) {
static CFMutableDictionaryRef charToCodeDict = NULL;
CGKeyCode code;
const void *codeValue = NULL;
UniChar character = c;
CFStringRef charStr = NULL;

Expand All @@ -95,27 +96,40 @@ static CGKeyCode keyCodeForChar(const char c) {
}

charStr = CFStringCreateWithCharacters(kCFAllocatorDefault, &character, 1);

if (!CFDictionaryGetValueIfPresent(charToCodeDict, charStr, (const void **)&code)) {
if (charStr == NULL) {
return UINT16_MAX;
}

if (CFDictionaryGetValueIfPresent(charToCodeDict, charStr, &codeValue)) {
code = (CGKeyCode)(uintptr_t)codeValue;
} else {
code = UINT16_MAX;
}

CFRelease(charStr);

return code;
}

static CFStringRef createStringForKey(CGKeyCode keyCode) {
TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
if (currentKeyboard == NULL) {
return NULL;
}

CFDataRef layoutData = TISGetInputSourceProperty(currentKeyboard,
kTISPropertyUnicodeKeyLayoutData);

if (layoutData == NULL) {
CFRelease(currentKeyboard);
return NULL;
}

const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout *)CFDataGetBytePtr(layoutData);

UInt32 keysDown = 0;
UniChar chars[4];
UniCharCount realLength;

UCKeyTranslate(keyboardLayout,
keyCode,
kUCKeyActionDisplay,
Expand All @@ -127,7 +141,7 @@ static CFStringRef createStringForKey(CGKeyCode keyCode) {
&realLength,
chars);
CFRelease(currentKeyboard);

return CFStringCreateWithCharacters(kCFAllocatorDefault, chars, 1);
}

Expand Down