aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Tamm2002-11-24 22:56:59 +0000
committerSteven Tamm2002-11-24 22:56:59 +0000
commit821222545845596e565db14530444fdb1d6f9238 (patch)
tree80fac89059eadd7717e8bd13232be8d0821c729c /src
parent877db12e021888f8b605119516083ee2e169d6cf (diff)
downloademacs-821222545845596e565db14530444fdb1d6f9238.tar.gz
emacs-821222545845596e565db14530444fdb1d6f9238.zip
Use malloc_default_zone to determine the size of pointers alloced in unexec
space instead of using possibly invalid emacs_zone pointers. This fixes the binary incompatibility problems caused by updates to libSystem.B
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/unexmacosx.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e202320f0d6..245b6fd8a95 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12002-11-24 Steven Tamm <steventamm@mac.com>
2
3 * unexmacosx.c (unexec_realloc): Use malloc_default_zone to
4 determine the size of pointers alloced in unexed space instead
5 of using possibly invalid emacs_zone pointers. This fixes the
6 binary incompatibility problems caused by updates to libSystem.B.
7
12002-11-24 Richard M. Stallman <rms@gnu.org> 82002-11-24 Richard M. Stallman <rms@gnu.org>
2 9
3 * search.c (Fstring_match): Doc fix. 10 * search.c (Fstring_match): Doc fix.
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index da4b82b6ca9..d9c91e5abb0 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -888,7 +888,7 @@ unexec_realloc (void *old_ptr, size_t new_size)
888 /* 2002-04-15 T. Ikegami <ikegami@adam.uprr.pr>. The original 888 /* 2002-04-15 T. Ikegami <ikegami@adam.uprr.pr>. The original
889 code to get size failed to reallocate read_buffer 889 code to get size failed to reallocate read_buffer
890 (lread.c). */ 890 (lread.c). */
891 int old_size = emacs_zone->size (emacs_zone, old_ptr); 891 int old_size = malloc_default_zone()->size (emacs_zone, old_ptr);
892 int size = new_size > old_size ? old_size : new_size; 892 int size = new_size > old_size ? old_size : new_size;
893 893
894 if (size) 894 if (size)