[Emacs-diffs] emacs-24 r117147: Fix bug#17510 with a pointer freed more than once (Cygwin-w32-build).

[Ken Brown]

------------------------------------------------------------
revno: 117147
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-05-24 13:59:22 -0400
message:
  Fix bug#17510 with a pointer freed more than once (Cygwin-w32-build).
  
  * src/w32term.c (x_delete_display) [CYGWIN]: Don't free
  dpyinfo->w32_id_name, to make sure it doesn't get freed more than
  once. 
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-24 15:50:05 +0000
+++ b/src/ChangeLog     2014-05-24 17:59:22 +0000
@@ -1,3 +1,9 @@
+2014-05-24  Ken Brown  <address@hidden>
+
+       * w32term.c (x_delete_display) [CYGWIN]: Don't free
+       dpyinfo->w32_id_name, to make sure it doesn't get freed more than
+       once.  (Bug#17510)
+
 2014-05-24  Stefan Monnier  <address@hidden>
 
        * xdisp.c: Bind inhibit-quit during pre-redisplay-function.

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2014-04-16 14:00:39 +0000
+++ b/src/w32term.c     2014-05-24 17:59:22 +0000
@@ -6426,7 +6426,11 @@
     if (dpyinfo->palette)
       DeleteObject (dpyinfo->palette);
   }
+  /* Avoid freeing dpyinfo->w32_id_name more than once if emacs is
+     running as a daemon; see bug#17510. */
+#ifndef CYGWIN
   xfree (dpyinfo->w32_id_name);
+#endif
 
   w32_reset_fringes ();
 }