1 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fc64f7e33f8..f02db31f0b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2008-08-30  Eli Zaretskii  <eliz@gnu.org>
 
+        * w16select.c (Fw16_set_clipboard_data): Don't encode text if
+        clipboard is unavailable.  Set dst to NULL if it doesn't point to
+        malloc'ed data.
+        (Fw16_get_clipboard_data): Initialize htext to NULL, to avoid
+        passing random values to xfree.
+
         * dispnew.c (init_display): Set `tty's association in frame's
         parameters alist to the name of the terminal device, if that is
         known.