Author: fabien
Date: 2009-01-27 05:38:23 -0800 (Tue, 27 Jan 2009)
New Revision: 6646
Log:
STR#2133 fix: erroneously releasing flavorType would cause a crash when pasting
twice in an Fl_Input object.
Modified:
branches/branch-1.3/src/Fl_mac.cxx
Modified: branches/branch-1.3/src/Fl_mac.cxx
===================================================================
--- branches/branch-1.3/src/Fl_mac.cxx 2009-01-23 10:49:40 UTC (rev 6645)
+++ branches/branch-1.3/src/Fl_mac.cxx 2009-01-27 13:38:23 UTC (rev 6646)
@@ -2597,7 +2597,7 @@
if (err!=noErr) continue;
err = PasteboardCopyItemFlavors(myPasteboard, itemID,
&flavorTypeArray);
if (err!=noErr) {
- if (flavorTypeArray) {CFRelease (flavorTypeArray);
flavorTypeArray = NULL;}
+ if (flavorTypeArray) {CFRelease(flavorTypeArray);
flavorTypeArray = NULL;}
continue;
}
CFIndex flavorCount = CFArrayGetCount(flavorTypeArray);
@@ -2609,20 +2609,18 @@
if(err != noErr) continue;
encoding = encodings[j];
found = true;
- if (flavorType) CFRelease(flavorType);
break;
}
- if (flavorType) {CFRelease(flavorType); flavorType =
NULL;}
}
if(found) break;
}
- if (flavorTypeArray) {CFRelease (flavorTypeArray);
flavorTypeArray = NULL;}
+ if (flavorTypeArray) {CFRelease(flavorTypeArray);
flavorTypeArray = NULL;}
if (found) break;
}
if(found) {
CFIndex len = CFDataGetLength(flavorData);
CFStringRef mycfs = CFStringCreateWithBytes(NULL,
CFDataGetBytePtr(flavorData), len, encoding, false);
- CFRelease (flavorData);
+ CFRelease(flavorData);
len =
CFStringGetMaximumSizeForEncoding(CFStringGetLength(mycfs),
kCFStringEncodingUTF8) + 1;
if ( len >= fl_selection_buffer_length[1] ) {
fl_selection_buffer_length[1] = len;
@@ -2630,7 +2628,7 @@
fl_selection_buffer[1] = new char[len];
}
CFStringGetCString(mycfs, fl_selection_buffer[1], len,
kCFStringEncodingUTF8);
- CFRelease (mycfs);
+ CFRelease(mycfs);
len = strlen(fl_selection_buffer[1]);
fl_selection_length[1] = len;
convert_crlf(fl_selection_buffer[1],len); // turn all \r
characters into \n:
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
