summaryrefslogtreecommitdiff
authorEgbert Eich <eich@freedesktop.org>2008-08-03 11:24:49 (GMT)
committer Egbert Eich <eich@freedesktop.org>2008-08-03 11:24:49 (GMT)
commit3046799a06ecb79211ef0f4a2db9de4eec7233fb (patch) (side-by-side diff)
tree63bdfd7a1f7266cd0a434616c375ffb1a6f89758
parent4dcc8ae1a6903434def1a2706f7c68ff9e2a17c4 (diff)
downloadxrandr-3046799a06ecb79211ef0f4a2db9de4eec7233fb.zip
xrandr-3046799a06ecb79211ef0f4a2db9de4eec7233fb.tar.gz
Fix for 64bit: feed a pointer to the right size variable to scanf().
XID is unsigned long, however %x in scanf takes a pointer to an unsigned int. Thus with XID xid, a sscanf(..., "0x%x", &xid) will most likely produce the wrong results.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--xrandr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xrandr.c b/xrandr.c
index 41e15dd..b1e133e 100644
--- a/xrandr.c
+++ b/xrandr.c
@@ -428,7 +428,8 @@ set_name_all (name_t *name, name_t *old)
static void
set_name (name_t *name, char *string, name_kind_t valid)
{
- XID xid;
+ unsigned int xid; /* don't make it XID (which is unsigned long):
+ scanf() takes unsigned int */
int index;
if ((valid & name_xid) && sscanf (string, "0x%x", &xid) == 1)