diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-05-28 14:03:16 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-05-28 14:03:16 +0300 |
| commit | 6d916bfb37d88a63663ad5777c8c3b83fbcfdbd0 (patch) | |
| tree | ad25d1b4e092b0644df860752c1ed89a73867261 /src/character.c | |
| parent | 3fe2f482bd2c636934cfd8e8aa0a07631164831d (diff) | |
| download | emacs-6d916bfb37d88a63663ad5777c8c3b83fbcfdbd0.tar.gz emacs-6d916bfb37d88a63663ad5777c8c3b83fbcfdbd0.tar.bz2 emacs-6d916bfb37d88a63663ad5777c8c3b83fbcfdbd0.zip | |
Another stability fix in 'lisp_string_width'
* src/character.c (lisp_string_width): Compute C pointer to data
of STRING immediately before using it, since STRING could be
relocated by GC triggered by processing compositions. (Bug#48711)
Diffstat (limited to 'src/character.c')
| -rw-r--r-- | src/character.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/character.c b/src/character.c index e44ab8d43b1..e874cf5e53c 100644 --- a/src/character.c +++ b/src/character.c @@ -339,7 +339,6 @@ lisp_string_width (Lisp_Object string, ptrdiff_t from, ptrdiff_t to, contains only ascii and eight-bit-graphic, but that's intentional. */ bool multibyte = SCHARS (string) < SBYTES (string); - unsigned char *str = SDATA (string); ptrdiff_t i = from, i_byte = from ? string_char_to_byte (string, from) : 0; ptrdiff_t from_byte = i_byte; ptrdiff_t width = 0; @@ -414,6 +413,7 @@ lisp_string_width (Lisp_Object string, ptrdiff_t from, ptrdiff_t to, else { int c; + unsigned char *str = SDATA (string); if (multibyte) { |