upstream

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e7cd83305ee..52fe8baa92e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * editfns.c (Fset_time_zone_rule): Replace free with xfree to
+        avoid crash when xmalloc overrun checking is enabled.
+
 2011-10-13  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize
diff --git a/src/editfns.c b/src/editfns.c
index 3dd58377ada..5f89391ce22 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2079,7 +2079,7 @@ only the former.  */)
     }
 
   set_time_zone_rule (tzstring);
-  free (environbuf);
+  xfree (environbuf);
   environbuf = environ;
 
   return Qnil;