From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 20 Apr 2019 00:35:39 +0000 (-0700)
Subject: Fix GC_CHECK_STRING_BYTES false alarm with pdumper
X-Git-Tag: emacs-27.0.90~3183
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b793a881792271b939473cddfa95e7e7569107c7;p=emacs.git

Fix GC_CHECK_STRING_BYTES false alarm with pdumper

* src/alloc.c (string_bytes): Don’t abort on strings
taken from the dumped file.
---

diff --git a/src/alloc.c b/src/alloc.c
index c5e4b6a6423..b5b6dc2f05f 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;