fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-07 10:58:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug #17616: Fix an XCB leak when the client has a non-fatal error handler.

Browse source
This commit is contained in:
Matthias Clasen 2008-09-17 10:43:52 -04:00 • committed by Adam Jackson
parent db0b85db29
commit 2335eafe4b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xcb_io.c
View file

@ -409,15 +409,18 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard)
{
case X_LookupColor:
case X_AllocNamedColor:
free(error);
return 0;
}
break;
case BadFont:
if(err->majorCode == X_QueryFont)
free(error);
return 0;
break;
case BadAlloc:
case BadAccess:
free(error);
return 0;
}
@ -426,10 +429,13 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard)
* want to suppress the error.
*/
for(ext = dpy->ext_procs; ext; ext = ext->next)
if(ext->error && ext->error(dpy, err, &ext->codes, &ret_code))
if(ext->error && ext->error(dpy, err, &ext->codes, &ret_code)) {
free(error);
return ret_code;
}
_XError(dpy, (xError *) error);
_XError(dpy, err);
free(error);
return 0;
}