diff options
| author | Paul Eggert | 2019-04-19 17:35:39 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-04-19 17:37:06 -0700 |
| commit | b793a881792271b939473cddfa95e7e7569107c7 (patch) | |
| tree | 2f3da1787409ad8115c883e499abeb80b97d04b0 /src/alloc.c | |
| parent | e0d2ff25b08839159e8c8c72e181b325a6cc583c (diff) | |
| download | emacs-b793a881792271b939473cddfa95e7e7569107c7.tar.gz emacs-b793a881792271b939473cddfa95e7e7569107c7.zip | |
Fix GC_CHECK_STRING_BYTES false alarm with pdumper
* src/alloc.c (string_bytes): Don’t abort on strings
taken from the dumped file.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 1851 | ptrdiff_t nbytes = | 1851 | ptrdiff_t nbytes = |
| 1852 | (s->u.s.size_byte < 0 ? s->u.s.size & ~ARRAY_MARK_FLAG : s->u.s.size_byte); | 1852 | (s->u.s.size_byte < 0 ? s->u.s.size & ~ARRAY_MARK_FLAG : s->u.s.size_byte); |
| 1853 | 1853 | ||
| 1854 | if (!PURE_P (s) && s->u.s.data | 1854 | if (!PURE_P (s) && !pdumper_object_p (s) && s->u.s.data |
| 1855 | && nbytes != SDATA_NBYTES (SDATA_OF_STRING (s))) | 1855 | && nbytes != SDATA_NBYTES (SDATA_OF_STRING (s))) |
| 1856 | emacs_abort (); | 1856 | emacs_abort (); |
| 1857 | return nbytes; | 1857 | return nbytes; |