tdevdraw: fix some memory leaks in x11 - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit b2f67698309b0c573cd52e357be126171be0a93a
DIR parent 7ca1c90109e17dced4b38fbaadea9d2cf39871b7
HTML Author: Xiao-Yong Jin <xjin@anl.gov>
Date: Tue, 20 Mar 2018 22:16:17 -0500
devdraw: fix some memory leaks in x11
Diffstat:
M src/cmd/devdraw/x11-init.c | 2 ++
M src/cmd/devdraw/x11-itrans.c | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
---
DIR diff --git a/src/cmd/devdraw/x11-init.c b/src/cmd/devdraw/x11-init.c
t@@ -176,6 +176,7 @@ _xattach(char *label, char *winsize)
}
}
}
+ XFree(pfmt);
if(_x.chan == 0){
werrstr("could not determine screen pixel format");
goto err0;
t@@ -232,6 +233,7 @@ _xattach(char *label, char *winsize)
geom = smprint("%s.geometry", label);
if(geom && XrmGetResource(database, geom, nil, &geomrestype, &geomres))
mask = XParseGeometry(geomres.addr, &x, &y, (uint*)&width, (uint*)&height);
+ XrmDestroyDatabase(database);
free(geom);
if((mask & WidthValue) && (mask & HeightValue)){
DIR diff --git a/src/cmd/devdraw/x11-itrans.c b/src/cmd/devdraw/x11-itrans.c
t@@ -431,8 +431,10 @@ _xgetsnarffrom(XWindow w, Atom clipboard, Atom target, int timeout0, int timeout
usleep(10*1000);
XGetWindowProperty(_x.display, _x.drawable, prop, 0, 0, 0, AnyPropertyType,
&type, &fmt, &dummy, &len, &xdata);
- if(lastlen == len && len > 0)
+ if(lastlen == len && len > 0){
+ XFree(xdata);
break;
+ }
lastlen = len;
XFree(xdata);
}