diff options
| author | Jim Meyering | 2008-06-12 22:53:07 +0000 |
|---|---|---|
| committer | Jim Meyering | 2008-06-12 22:53:07 +0000 |
| commit | 9c5e177ecf929a3c4aaf76133dbe3eacac124b2b (patch) | |
| tree | 68d8b48d6af6090bee6a39a19ad92cfdf933d179 /src | |
| parent | 455af463a1e359c89892b40e5cf69f2545d48908 (diff) | |
| download | emacs-9c5e177ecf929a3c4aaf76133dbe3eacac124b2b.tar.gz emacs-9c5e177ecf929a3c4aaf76133dbe3eacac124b2b.zip | |
make unexec_free handle NULL the same way free does
* unexmacosx.c (unexec_free): Ignore a NULL argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/unexmacosx.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6361f522fe7..a936794edc7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-06-12 Jim Meyering <meyering@redhat.com> | ||
| 2 | |||
| 3 | make unexec_free handle NULL the same way free does | ||
| 4 | * unexmacosx.c (unexec_free): Ignore a NULL argument. | ||
| 5 | |||
| 1 | 2008-06-12 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2008-06-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * character.h (CHAR_TO_BYTE_SAFE): New macro. | 8 | * character.h (CHAR_TO_BYTE_SAFE): New macro. |
diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 46622601281..57f70f8557f 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c | |||
| @@ -1318,6 +1318,8 @@ unexec_realloc (void *old_ptr, size_t new_size) | |||
| 1318 | void | 1318 | void |
| 1319 | unexec_free (void *ptr) | 1319 | unexec_free (void *ptr) |
| 1320 | { | 1320 | { |
| 1321 | if (ptr == NULL) | ||
| 1322 | return; | ||
| 1321 | if (in_dumped_exec) | 1323 | if (in_dumped_exec) |
| 1322 | { | 1324 | { |
| 1323 | if (!ptr_in_unexec_regions (ptr)) | 1325 | if (!ptr_in_unexec_regions (ptr)) |