summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2004-08-22 07:15:52 +0000
committerSeemant Kulleen <seemant@gentoo.org>2004-08-22 07:15:52 +0000
commit20267aa8d00b74d3547da8882d250704e39ffc36 (patch)
tree560bd75e5037b4182e08493bbc1d0cc645eb2645 /x11-misc/xcompmgr/files
parentfix up docs. (diff)
downloadhistorical-20267aa8d00b74d3547da8882d250704e39ffc36.tar.gz
historical-20267aa8d00b74d3547da8882d250704e39ffc36.tar.bz2
historical-20267aa8d00b74d3547da8882d250704e39ffc36.zip
Add a patch from langthang to fix crashing when xcompmgr is used. langthang sent the patch upstream as well.
Diffstat (limited to 'x11-misc/xcompmgr/files')
-rw-r--r--x11-misc/xcompmgr/files/digest-xcompmgr-0.1_pre20040821-r11
-rw-r--r--x11-misc/xcompmgr/files/xcompmgr-fix.diff23
2 files changed, 24 insertions, 0 deletions
diff --git a/x11-misc/xcompmgr/files/digest-xcompmgr-0.1_pre20040821-r1 b/x11-misc/xcompmgr/files/digest-xcompmgr-0.1_pre20040821-r1
new file mode 100644
index 000000000000..bc4a58c0c854
--- /dev/null
+++ b/x11-misc/xcompmgr/files/digest-xcompmgr-0.1_pre20040821-r1
@@ -0,0 +1 @@
+MD5 01776a8cee1a777a9320459834856424 xcompmgr-0.1_pre20040821.tar.bz2 13558
diff --git a/x11-misc/xcompmgr/files/xcompmgr-fix.diff b/x11-misc/xcompmgr/files/xcompmgr-fix.diff
new file mode 100644
index 000000000000..9bc78703b9c5
--- /dev/null
+++ b/x11-misc/xcompmgr/files/xcompmgr-fix.diff
@@ -0,0 +1,23 @@
+Index: xcompmgr.c
+===================================================================
+RCS file: /cvs/xapps/xcompmgr/xcompmgr.c,v
+retrieving revision 1.26
+diff -u -3 -p -r1.26 xcompmgr.c
+--- xcompmgr.c 14 Aug 2004 21:39:51 -0000 1.26
++++ xcompmgr.c 22 Aug 2004 00:58:24 -0000
+@@ -1124,11 +1124,11 @@ get_opacity_prop(Display *dpy, win *w, u
+ int format;
+ unsigned long n, left;
+
+- char *data;
+- XGetWindowProperty(dpy, w->id, opacityAtom, 0L, 1L, False,
++ char *data = NULL;
++ if (XGetWindowProperty(dpy, w->id, opacityAtom, 0L, 1L, False,
+ XA_CARDINAL, &actual, &format,
+- &n, &left, (unsigned char **) &data);
+- if (data != None)
++ &n, &left, (unsigned char **) &data) == Success
++ && data != NULL)
+ {
+ unsigned int i;
+ memcpy (&i, data, sizeof (unsigned int));