(Fx_window_property): Handle case that property gets

deleted between the two calls to XGetWindowProperty.

diff --git a/src/ChangeLog b/src/ChangeLog
index 72b7d55aca070120099b9645fa36a0ab3ea8a7ed..c385f14159617d52082ec217faeec4758219c772 100644 (file)
--- 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 e180b9561efae9a0ca2f5f1b78c9fd5256d783ac..e2690e7a30ecd445ef78208b3306cb54c197474c 100644 (file)
--- 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);