o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devdraw: fix some memory leaks in x11

Browse source
This commit is contained in:
Xiao-Yong Jin 2018-03-20 22:16:17 -05:00 • committed by David du Colombier
parent 7ca1c90109
commit b2f6769830
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/devdraw/x11-init.c
View file

@ -176,6 +176,7 @@ _xattach(char *label, char *winsize)
} }
} }
} }
XFree(pfmt);
if(_x.chan == 0){ if(_x.chan == 0){
werrstr("could not determine screen pixel format"); werrstr("could not determine screen pixel format");
goto err0; goto err0;
@ -232,6 +233,7 @@ _xattach(char *label, char *winsize)
geom = smprint("%s.geometry", label); geom = smprint("%s.geometry", label);
if(geom && XrmGetResource(database, geom, nil, &geomrestype, &geomres)) if(geom && XrmGetResource(database, geom, nil, &geomrestype, &geomres))
mask = XParseGeometry(geomres.addr, &x, &y, (uint*)&width, (uint*)&height); mask = XParseGeometry(geomres.addr, &x, &y, (uint*)&width, (uint*)&height);
XrmDestroyDatabase(database);
free(geom); free(geom);
if((mask & WidthValue) && (mask & HeightValue)){ if((mask & WidthValue) && (mask & HeightValue)){

4
src/cmd/devdraw/x11-itrans.c
View file

@ -431,8 +431,10 @@ _xgetsnarffrom(XWindow w, Atom clipboard, Atom target, int timeout0, int timeout
usleep(10*1000); usleep(10*1000);
XGetWindowProperty(_x.display, _x.drawable, prop, 0, 0, 0, AnyPropertyType, XGetWindowProperty(_x.display, _x.drawable, prop, 0, 0, 0, AnyPropertyType,
&type, &fmt, &dummy, &len, &xdata); &type, &fmt, &dummy, &len, &xdata);
if(lastlen == len && len > 0) if(lastlen == len && len > 0){
XFree(xdata);
break; break;
}
lastlen = len; lastlen = len;
XFree(xdata); XFree(xdata);
} }