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

STR#2121: fixed a potential memory leak on flavorType, made local stack variables declaration zero initialized when necessary, those not zero initialized are now declared when used.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6636 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Fabien Costantini 2009-01-17 09:18:46 +00:00
parent b7e9f1eb77
commit 0836f376e5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Fl_mac.cxx
View File

@ -2580,9 +2580,9 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
fl_selection_length[1] = 0;
#ifdef USE_PASTEBOARD
OSStatus err = noErr;
Boolean found=false;
CFDataRef flavorData;
CFStringEncoding encoding=0;
Boolean found = false;
CFDataRef flavorData = NULL;
CFStringEncoding encoding = 0;
allocatePasteboard();
PasteboardSynchronize(myPasteboard);
@ -2590,9 +2590,8 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
err = PasteboardGetItemCount(myPasteboard, &nFlavor);
if (err==noErr) {
for (i=1; i<=nFlavor; i++) {
PasteboardItemID itemID;
CFArrayRef flavorTypeArray;
CFIndex flavorCount;
PasteboardItemID itemID = 0;
CFArrayRef flavorTypeArray = NULL;
found = false;
err = PasteboardGetItemIdentifier(myPasteboard, i, &itemID);
if (err!=noErr) continue;
@ -2601,18 +2600,19 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
if (flavorTypeArray) {CFRelease (flavorTypeArray); flavorTypeArray = NULL;}
continue;
}
flavorCount = CFArrayGetCount(flavorTypeArray);
CFIndex flavorCount = CFArrayGetCount(flavorTypeArray);
for (j = 0; j < handledFlavorsCount; j++) {
for (CFIndex flavorIndex=0; flavorIndex<flavorCount; flavorIndex++) {
CFStringRef flavorType;
flavorType = (CFStringRef)CFArrayGetValueAtIndex(flavorTypeArray, flavorIndex);
CFStringRef flavorType = (CFStringRef)CFArrayGetValueAtIndex(flavorTypeArray, flavorIndex);
if (UTTypeConformsTo(flavorType, flavorNames[j])) {
err = PasteboardCopyItemFlavorData( myPasteboard, itemID, flavorNames[j], &flavorData );
if(err != noErr) continue;
encoding = encodings[j];
found = true;
if (flavorType) CFRelease(flavorType);
break;
}
if (flavorType) {CFRelease(flavorType); flavorType = NULL;}
}
if(found) break;
}
@ -2620,10 +2620,8 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
if (found) break;
}
if(found) {
CFIndex len;
CFStringRef mycfs;
len = CFDataGetLength(flavorData);
mycfs = CFStringCreateWithBytes(NULL, CFDataGetBytePtr(flavorData), len, encoding, false);
CFIndex len = CFDataGetLength(flavorData);
CFStringRef mycfs = CFStringCreateWithBytes(NULL, CFDataGetBytePtr(flavorData), len, encoding, false);
CFRelease (flavorData);
len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(mycfs), kCFStringEncodingUTF8) + 1;
if ( len >= fl_selection_buffer_length[1] ) {