andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: pbproxy: Fix 3 paths that could leak memory.

Browse Source 
2 of the paths leaked, when INCR transfers were done.  Now we
are leak free according to the leaks program for all transfers
I have tried so far.
This commit is contained in:
George Peter Staplin 2008-09-23 13:59:25 -06:00
parent b245d84a72
commit aa98db576b
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/xquartz/pbproxy/x-selection.m
View File

@ -110,9 +110,10 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
if(None == property) if(None == property)
return True; return True;
do { do
unsigned long newbuflen; {
unsigned char *newbuf; unsigned long newbuflen = 0;
unsigned char *newbuf = NULL;
#ifdef TEST #ifdef TEST
printf("bytesleft %lu\n", bytesleft); printf("bytesleft %lu\n", bytesleft);
@ -122,8 +123,10 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
offset, length, delete, offset, length, delete,
AnyPropertyType, AnyPropertyType,
type, &format, &numitems, type, &format, &numitems,
&bytesleft, &chunk)) { &bytesleft, &chunk))
{
DB ("Error while getting window property.\n"); DB ("Error while getting window property.\n");
*pdata = null_propdata;
free (buf); free (buf);
return True; return True;
} }
@ -141,10 +144,11 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
#ifdef TEST #ifdef TEST
printf("chunkbytesize %zu\n", chunkbytesize); printf("chunkbytesize %zu\n", chunkbytesize);
#endif #endif
newbuflen = buflen + chunkbytesize; newbuflen = buflen + chunkbytesize;
newbuf = realloc (buf, newbuflen); newbuf = realloc (buf, newbuflen);
if (NULL == newbuf) {
if (NULL == newbuf)
{
XFree (chunk); XFree (chunk);
free (buf); free (buf);
return True; return True;
@ -837,7 +841,10 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
} }
else if (e->target == atoms->multiple) else if (e->target == atoms->multiple)
{ {
/* This isn't finished, and may never be, unless I can find a good app. */ /*
* This isn't finished, and may never be, unless I can find
* a good test app.
*/
[self send_multiple:e]; [self send_multiple:e];
} }
else if (e->target == atoms->utf8_string) else if (e->target == atoms->utf8_string)
@ -954,14 +961,16 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
{ {
/* We completed the transfer. */ /* We completed the transfer. */
[self handle_selection:pending.selection type:type propdata:&pending.propdata]; [self handle_selection:pending.selection type:type propdata:&pending.propdata];
free_propdata(&pdata);
pending.propdata = null_propdata; pending.propdata = null_propdata;
pending.requestor = None; pending.requestor = None;
pending.selection = None; pending.selection = None;
} }
else else
{ {
[self append_to_pending:&pdata requestor:e->window]; [self append_to_pending:&pdata requestor:e->window];
} free_propdata (&pdata);
}
} }
} }
@ -1084,7 +1093,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
[pb declareTypes:pbtypes owner:nil]; [pb declareTypes:pbtypes owner:nil];
if (YES != [pb setString:string forType:NSStringPboardType]) { if (YES != [pb setString:string forType:NSStringPboardType]) {
DB ("_pasteboard setString:forType: failed!\n"); DB ("pasteboard setString:forType: failed!\n");
} }
[string autorelease]; [string autorelease];
DB ("done handling utf8 string\n"); DB ("done handling utf8 string\n");
@ -1126,6 +1135,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
if (nil == pb) if (nil == pb)
{ {
[self copy_completed:selection]; [self copy_completed:selection];
free_propdata (pdata);
return; return;
} }