diff options
| -rw-r--r-- | src/charset.c | 4 | ||||
| -rw-r--r-- | src/charset.h | 2 | ||||
| -rw-r--r-- | src/pdumper.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/charset.c b/src/charset.c index 56ab8d70181..c0700f972ee 100644 --- a/src/charset.c +++ b/src/charset.c @@ -62,8 +62,8 @@ Lisp_Object Vcharset_hash_table; /* Table of struct charset. */ struct charset *charset_table; -static int charset_table_size; -int charset_table_used; +int charset_table_size; +static int charset_table_used; /* Special charsets corresponding to symbols. */ int charset_ascii; diff --git a/src/charset.h b/src/charset.h index ee697b8d3ef..7042a71a469 100644 --- a/src/charset.h +++ b/src/charset.h @@ -248,7 +248,7 @@ extern Lisp_Object Vcharset_hash_table; /* Table of struct charset. */ extern struct charset *charset_table; -extern int charset_table_used; +extern int charset_table_size; #define CHARSET_FROM_ID(id) (charset_table + (id)) diff --git a/src/pdumper.c b/src/pdumper.c index 56ac531363d..92e19497e59 100644 --- a/src/pdumper.c +++ b/src/pdumper.c @@ -3212,7 +3212,11 @@ dump_charset_table (struct dump_context *ctx) ctx->flags.pack_objects = true; dump_align_output (ctx, DUMP_ALIGNMENT); dump_off offset = ctx->offset; - for (int i = 0; i < charset_table_used; ++i) + /* We are dumping the entire table, not just the used slots, because + otherwise when we restore from the pdump file, the actual size of + the table will be smaller than charset_table_size, and we will + crash if/when a new charset is defined. */ + for (int i = 0; i < charset_table_size; ++i) dump_charset (ctx, i); dump_emacs_reloc_to_dump_ptr_raw (ctx, &charset_table, offset); ctx->flags = old_flags; |