Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-02 07:26:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed memory leak in MSWindows drag-n-drop : dragged data was malloc'ed twice (once at

Browse Source 
DragEnter once at Drop) and never free'ed. Now it's malloc'ed once and free'ed after use.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8025 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2010-12-13 18:04:35 +00:00
parent 8132eba4f5
commit fbe0128869
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fl_dnd_win32.cxx
+14 -12
View File
@@ -173,13 +173,14 @@ public:
if (fillCurrentDragData(data)) { if (fillCurrentDragData(data)) {
int old_event = Fl::e_number; int old_event = Fl::e_number;
char *a, *b; char *a, *b;
a = b = Fl::e_text; a = b = currDragData;
while (*a) { // strip the CRLF pairs while (*a) { // strip the CRLF pairs
if (*a == '\r' && a[1] == '\n') a++; if (*a == '\r' && a[1] == '\n') a++;
else *b++ = *a++; else *b++ = *a++;
} }
*b = 0; *b = 0;
Fl::e_length = b - Fl::e_text; Fl::e_text = currDragData;
Fl::e_length = b - currDragData;
Fl::belowmouse()->handle(Fl::e_number = FL_PASTE); // e_text will be invalid after this call Fl::belowmouse()->handle(Fl::e_number = FL_PASTE); // e_text will be invalid after this call
Fl::e_number = old_event; Fl::e_number = old_event;
SetForegroundWindow( hwnd ); SetForegroundWindow( hwnd );
@@ -214,6 +215,7 @@ private:
// clear currDrag* for a new drag event // clear currDrag* for a new drag event
clearCurrentDragData(); clearCurrentDragData();
currDragRef = data;
// fill currDrag* with ASCII data, if available // fill currDrag* with ASCII data, if available
FORMATETC fmt = { 0 }; FORMATETC fmt = { 0 };
STGMEDIUM medium = { 0 }; STGMEDIUM medium = { 0 };
@@ -230,9 +232,9 @@ private:
while(*wstuff++) srclen++; while(*wstuff++) srclen++;
wstuff = (const wchar_t *)stuff; wstuff = (const wchar_t *)stuff;
unsigned utf8len = fl_utf8fromwc(NULL, 0, wstuff, srclen); unsigned utf8len = fl_utf8fromwc(NULL, 0, wstuff, srclen);
Fl::e_length = utf8len; currDragSize = utf8len;
Fl::e_text = (char*)malloc(utf8len + 1); currDragData = (char*)malloc(utf8len + 1);
fl_utf8fromwc(Fl::e_text, Fl::e_length, wstuff, srclen); fl_utf8fromwc(currDragData, currDragSize, wstuff, srclen);
GlobalUnlock( medium.hGlobal ); GlobalUnlock( medium.hGlobal );
ReleaseStgMedium( &medium ); ReleaseStgMedium( &medium );
currDragResult = 1; currDragResult = 1;
@@ -246,10 +248,10 @@ private:
char *p, *q, *last; char *p, *q, *last;
unsigned u; unsigned u;
void *stuff = GlobalLock( medium.hGlobal ); void *stuff = GlobalLock( medium.hGlobal );
Fl::e_text = (char*)malloc(3 * strlen((char*)stuff) + 10); currDragData = (char*)malloc(3 * strlen((char*)stuff) + 10);
p = (char*)stuff; p = (char*)stuff;
last = p + strlen(p); last = p + strlen(p);
q = Fl::e_text; q = currDragData;
while (p < last) { while (p < last) {
u = fl_utf8decode(p, last, &len); u = fl_utf8decode(p, last, &len);
p += len; p += len;
@@ -257,8 +259,8 @@ private:
q += len; q += len;
} }
*q = 0; *q = 0;
Fl::e_length = q - Fl::e_text; currDragSize = q - Fl::e_text;
Fl::e_text = (char*)realloc(Fl::e_text, Fl::e_length + 1); currDragData = (char*)realloc(currDragData, currDragSize + 1);
GlobalUnlock( medium.hGlobal ); GlobalUnlock( medium.hGlobal );
ReleaseStgMedium( &medium ); ReleaseStgMedium( &medium );
currDragResult = 1; currDragResult = 1;
@@ -288,10 +290,10 @@ private:
} }
*dst=0; *dst=0;
Fl::e_text = (char*) malloc(nn * 5 + 1); currDragData = (char*) malloc(nn * 5 + 1);
// Fl::e_length = fl_unicode2utf(bu, nn, Fl::e_text); // Fl::e_length = fl_unicode2utf(bu, nn, Fl::e_text);
Fl::e_length = fl_utf8fromwc(Fl::e_text, (nn*5+1), bu, nn); currDragSize = fl_utf8fromwc(currDragData, (nn*5+1), bu, nn);
Fl::e_text[Fl::e_length] = 0; currDragData[currDragSize] = 0;
free(bu); free(bu);
// Fl::belowmouse()->handle(FL_DROP); // Fl::belowmouse()->handle(FL_DROP);