From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 13 Sep 2001 12:56:36 +0000 (+0000)
Subject: (Fx_window_property): Handle case that property gets
X-Git-Tag: emacs-pretest-21.0.106~123
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4c8c7926fde857a7883ca8b3bf1565e1faff0245;p=emacs.git

(Fx_window_property): Handle case that property gets
deleted between the two calls to XGetWindowProperty.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 72b7d55aca0..c385f141596 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-13  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfns.c (Fx_window_property): Handle case that property gets
+	deleted between the two calls to XGetWindowProperty.
+
 2001-09-11  Gerd Moellmann  <gerd@gnu.org>
 
 	* minibuf.c (read_minibuf_unwind): Bind inhibit-modification-hooks.
diff --git a/src/xfns.c b/src/xfns.c
index e180b9561ef..e2690e7a30e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10279,7 +10279,7 @@ value.")
 			       &actual_type, &actual_format, 
 			       &actual_size, &bytes_remaining, 
 			       (unsigned char **) &tmp_data);
-      if (rc == Success)
+      if (rc == Success && tmp_data)
 	prop_value = make_string (tmp_data, size);
 
       XFree (tmp_data);