nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix a memleak reported by valgrind

Browse source
This commit is contained in:
Dana Jansens 2002-07-05 19:48:03 +00:00
parent 6954842d84
commit b3c3157354
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/XAtom.cc
View file

@ -353,7 +353,7 @@ bool XAtom::getValue(Window win, Atom atom, Atom type,
assert(win != None); assert(atom != None); assert(type != None); assert(win != None); assert(atom != None); assert(type != None);
assert(size == 8 || size == 16 || size == 32); assert(size == 8 || size == 16 || size == 32);
assert(nelements > 0); assert(nelements > 0);
unsigned char *c_val; // value alloc'd with c malloc unsigned char *c_val = 0; // value alloc'd with c malloc
Atom ret_type; Atom ret_type;
int ret_size; int ret_size;
unsigned long ret_bytes; unsigned long ret_bytes;
@ -363,12 +363,11 @@ bool XAtom::getValue(Window win, Atom atom, Atom type,
result = XGetWindowProperty(_display, win, atom, 0l, 1l, False, result = XGetWindowProperty(_display, win, atom, 0l, 1l, False,
AnyPropertyType, &ret_type, &ret_size, AnyPropertyType, &ret_type, &ret_size,
&nelements, &ret_bytes, &c_val); &nelements, &ret_bytes, &c_val);
if (result != Success || ret_type == None || nelements < 1) if (result != Success || ret_type != type || ret_size != size ||
// an error occured, the property does not exist on the window, or is empty nelements < 1) {
return false; // an error occured, the property does not exist on the window, or is empty,
if (ret_type != type || ret_size != size) { // or the wrong data is in property for the request
// wrong data in property if (c_val) XFree(c_val);
XFree(c_val);
return false; return false;
} }
// the data is correct, now, is there more elements left? // the data is correct, now, is there more elements left?