mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freerdp: fix buffer overflow in MRDPView

Browse Source
This commit is contained in:
Richard Markiewicz 2022-03-16 12:23:46 -07:00 committed by akallabeth
parent 9bf2fde765
commit 32a1f2cc66
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/Mac/MRDPView.m
View File

@ -660,12 +660,13 @@ DWORD fixKeyCode(DWORD keyCode, unichar keyChar, enum APPLE_KEYBOARD_TYPE type)
- (void)onPasteboardTimerFired:(NSTimer *)timer
{
const BYTE *data;
const void *data;
UINT32 size;
UINT32 formatId;
BOOL formatMatch;
int changeCount;
NSData *formatData;
NSString *formatString;
const char *formatType;
NSPasteboardItem *item;
changeCount = (int)[pasteboard_rd changeCount];
@ -693,12 +694,22 @@ DWORD fixKeyCode(DWORD keyCode, unichar keyChar, enum APPLE_KEYBOARD_TYPE type)
if (strcmp(formatType, "public.utf8-plain-text") == 0)
{
formatData = [item dataForType:type];
if (formatData == nil)
{
break;
}
formatString = [[NSString alloc] initWithData:formatData encoding:NSUTF8StringEncoding];
size = strlen([formatString UTF8String]) + 1;
data = [formatString UTF8String];
formatId = ClipboardRegisterFormat(mfc->clipboard, "UTF8_STRING");
size = (UINT32)[formatData length];
data = [formatData bytes];
/* size is the string length without the terminating NULL terminator */
ClipboardSetData(mfc->clipboard, formatId, data, size + 1);
ClipboardSetData(mfc->clipboard, formatId, data, size);
[formatString release];
formatMatch = TRUE;
break;
}
}