summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2011-10-13 07:55:46 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-10-13 07:55:46 -0700
commit81d40c920807279ccc0dae0aca46c8291755c66d (patch)
tree8770bfd02923e8b930aec16401eeb16f3fb6fbe4 /src
parente7e2364b7ba0293fb4b6f8ae3e38127e84dafe8b (diff)
Use xfree, not free, to avoid crash with --enable-checking=xmallocoverrun.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/editfns.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e7cd83305e..52fe8baa92 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 3dd58377ad..5f89391ce2 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;