projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e0d2ff2
)
Fix GC_CHECK_STRING_BYTES false alarm with pdumper
author
Paul Eggert
<eggert@cs.ucla.edu>
Sat, 20 Apr 2019 00:35:39 +0000
(17:35 -0700)
committer
Paul Eggert
<eggert@cs.ucla.edu>
Sat, 20 Apr 2019 00:37:06 +0000
(17:37 -0700)
* src/alloc.c (string_bytes): Don’t abort on strings
taken from the dumped file.
src/alloc.c
patch
|
blob
|
history
diff --git
a/src/alloc.c
b/src/alloc.c
index c5e4b6a6423e1eaabba46429a5d931875585f39e..b5b6dc2f05f3b110c48ceb97dd046e2fd553afd0 100644
(file)
--- 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;