[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b793a88 2/2: Fix GC_CHECK_STRING_BYTES false alarm
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] master b793a88 2/2: Fix GC_CHECK_STRING_BYTES false alarm with pdumper |
|
Date: |
Fri, 19 Apr 2019 20:37:12 -0400 (EDT) |
branch: master
commit b793a881792271b939473cddfa95e7e7569107c7
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Fix GC_CHECK_STRING_BYTES false alarm with pdumper
* src/alloc.c (string_bytes): Don’t abort on strings
taken from the dumped file.
---
src/alloc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/alloc.c b/src/alloc.c
index c5e4b6a..b5b6dc2 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1851,7 +1851,7 @@ string_bytes (struct Lisp_String *s)
ptrdiff_t nbytes =
(s->u.s.size_byte < 0 ? s->u.s.size & ~ARRAY_MARK_FLAG : s->u.s.size_byte);
- if (!PURE_P (s) && s->u.s.data
+ if (!PURE_P (s) && !pdumper_object_p (s) && s->u.s.data
&& nbytes != SDATA_NBYTES (SDATA_OF_STRING (s)))
emacs_abort ();
return nbytes;