summaryrefslogtreecommitdiff
path: root/src/XrrProperty.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-04 21:47:50 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-04 22:26:50 -0700
commitc90f74497dbcb96854346435349c6e2207b530c5 (patch)
tree44e4af7e0d37aef81a950671cc5f5292525cb048 /src/XrrProperty.c
parent4254bf0ee4c7a8f9d03841cf0d8e16cbb201dfbd (diff)
Make XRRGet*Property() always initialize returned values
Avoids memory corruption and other errors when callers access them without checking to see if the calls returned an error value. Callers are still required to check for errors, this just reduces the damage when they don't. (Same as reported against libX11 XGetWindowProperty by Ilja Van Sprundel) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src/XrrProperty.c')
-rw-r--r--src/XrrProperty.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/XrrProperty.c b/src/XrrProperty.c
index 707a28d..2096c56 100644
--- a/src/XrrProperty.c
+++ b/src/XrrProperty.c
@@ -259,6 +259,13 @@ XRRGetOutputProperty (Display *dpy, RROutput output,
xRRGetOutputPropertyReq *req;
unsigned long nbytes, rbytes;
+ /* Always initialize return values, in case callers fail to initialize
+ them and fail to check the return code for an error. */
+ *actual_type = None;
+ *actual_format = 0;
+ *nitems = *bytes_after = 0L;
+ *prop = (unsigned char *) NULL;
+
RRCheckExtension (dpy, info, 1);
LockDisplay (dpy);
@@ -280,7 +287,6 @@ XRRGetOutputProperty (Display *dpy, RROutput output,
return ((xError *)&rep)->errorCode;
}
- *prop = (unsigned char *) NULL;
if (rep.propertyType != None) {
int format = rep.format;