diff options
| author | Dmitry Antipov | 2011-10-13 07:55:46 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-13 07:55:46 -0700 |
| commit | 81d40c920807279ccc0dae0aca46c8291755c66d (patch) | |
| tree | 8770bfd02923e8b930aec16401eeb16f3fb6fbe4 /src | |
| parent | e7e2364b7ba0293fb4b6f8ae3e38127e84dafe8b (diff) | |
| download | emacs-81d40c920807279ccc0dae0aca46c8291755c66d.tar.gz emacs-81d40c920807279ccc0dae0aca46c8291755c66d.zip | |
Use xfree, not free, to avoid crash with --enable-checking=xmallocoverrun.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/editfns.c | 2 |
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 @@ | |||
| 1 | 2011-10-13 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * editfns.c (Fset_time_zone_rule): Replace free with xfree to | ||
| 4 | avoid crash when xmalloc overrun checking is enabled. | ||
| 5 | |||
| 1 | 2011-10-13 Eli Zaretskii <eliz@gnu.org> | 6 | 2011-10-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize | 8 | * 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. */) | |||
| 2079 | } | 2079 | } |
| 2080 | 2080 | ||
| 2081 | set_time_zone_rule (tzstring); | 2081 | set_time_zone_rule (tzstring); |
| 2082 | free (environbuf); | 2082 | xfree (environbuf); |
| 2083 | environbuf = environ; | 2083 | environbuf = environ; |
| 2084 | 2084 | ||
| 2085 | return Qnil; | 2085 | return Qnil; |