summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-04-24 10:58:26 +0800
committerChong Yidong <cyd@gnu.org>2012-04-24 10:58:26 +0800
commit9be2fd9b4f96bd00d222ae8ce13f8bb39802f930 (patch)
tree35bb2bbd67dd54affa2175670a53f98cb0895f6a
parentf0ee99a0d4aa7aa0f20e5ec673fb1936b5174eea (diff)
downloademacs-9be2fd9b4f96bd00d222ae8ce13f8bb39802f930.tar.gz
* src/xselect.c (x_convert_selection): Initialize a pointer.
Fixes: debbugs:11315
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xselect.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 906d17535c6..8c80a24b580 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-24 Chong Yidong <cyd@gnu.org>
+
+ * xselect.c (x_convert_selection): Initialize a pointer (Bug#11315).
+
2012-04-23 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (pos_visible_p): If the window start position is beyond
diff --git a/src/xselect.c b/src/xselect.c
index 173cf78bdaa..15ce8d487fa 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -931,6 +931,7 @@ x_convert_selection (struct input_event *event, Lisp_Object selection_symbol,
/* Otherwise, record the converted selection to binary. */
cs = xmalloc (sizeof (struct selection_data));
+ cs->data = NULL;
cs->nofree = 1;
cs->property = property;
cs->wait_object = NULL;