From fc827715333ae64985f846cd86b6616d43b51930 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Wed, 8 Jun 2016 15:02:55 -0700 Subject: [PATCH] x11/x11base.c (x_get_window_property): Actually return values. --- src/x11/x11base.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/x11/x11base.c b/src/x11/x11base.c index b3c22c756..78f968752 100644 --- a/src/x11/x11base.c +++ b/src/x11/x11base.c @@ -1755,21 +1755,19 @@ x_get_window_property (struct xdisplay * xd, Window window, Atom property, { Display * display = (XD_DISPLAY (xd)); - Atom actual_type; int actual_format; - unsigned long nitems; - unsigned long bytes_after; - unsigned char * data; if ((XGetWindowProperty (display, window, property, long_offset, long_length, delete, req_type, - (&actual_type), (&actual_format), - (&nitems), (&bytes_after), (&data))) + actual_type_return, (&actual_format), + nitems_return, bytes_after_return, prop_return)) != Success) return (1); + *actual_format_return = actual_format; if (actual_format == 0) { - XFree (data); + XFree (*prop_return); + *prop_return = NULL; return (2); } if (! ((actual_format == 8) -- 2.25.1