HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
7b64124
)
Fix last fix.
author
Chong Yidong
<cyd@stupidchicken.com>
Wed, 3 Dec 2008 04:37:29 +0000
(
04:37
+0000)
committer
Chong Yidong
<cyd@stupidchicken.com>
Wed, 3 Dec 2008 04:37:29 +0000
(
04:37
+0000)
src/xselect.c
patch
|
blob
|
blame
|
history
diff --git
a/src/xselect.c
b/src/xselect.c
index
ce106f3
..
9297310
100644
(file)
--- a/
src/xselect.c
+++ b/
src/xselect.c
@@
-2369,7
+2369,7
@@
DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal,
{
Window window;
Atom buffer_atom;
- unsigned char *data;
+ unsigned char *data
= NULL
;
int bytes;
Atom type;
int format;
@@
-2393,12
+2393,10
@@
DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal,
x_get_window_property (display, window, buffer_atom, &data, &bytes,
&type, &format, &size, 0);
- if (!data)
- return Qnil;
-
- if (!format)
+ if (!data || !format)
{
- xfree (data);
+ if (data)
+ xfree (data);
return Qnil;
}