procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #11073 with bidi-related crashes displaying some byte sequences.

Browse source 
src/bidi.c (bidi_fetch_char): Use STRING_CHAR_AND_LENGTH instead of
 FETCH_MULTIBYTE_CHAR followed by CHAR_BYTES.  Prevents crashes
 when fetching a multibyte character consumes more bytes than
 CHAR_BYTES returns, due to unification of CJK characters in
 string_char.
This commit is contained in:
Eli Zaretskii 2012-03-23 14:32:23 +02:00
parent 5063c0e1a2
commit e99a9b8bdc
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2012-03-23 Eli Zaretskii <eliz@gnu.org>
* bidi.c (bidi_fetch_char): Use STRING_CHAR_AND_LENGTH instead of
FETCH_MULTIBYTE_CHAR followed by CHAR_BYTES. Prevents crashes
when fetching a multibyte character consumes more bytes than
CHAR_BYTES returns, due to unification of CJK characters in
string_char. (Bug#11073)
2012-03-23 Troels Nielsen <bn.troels@gmail.com> (tiny change)
* process.c (wait_reading_process_output): Handle pty disconnect

8
src/bidi.c
View file

@ -932,6 +932,7 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
EMACS_INT endpos
= (string->s || STRINGP (string->lstring)) ? string->schars : ZV;
struct text_pos pos;
int len;
/* If we got past the last known position of display string, compute
the position of the next one. That position could be at CHARPOS. */
@ -1003,7 +1004,6 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
normal_char:
if (string->s)
{
int len;
if (!string->unibyte)
{
@ -1018,8 +1018,6 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
}
else if (STRINGP (string->lstring))
{
int len;
if (!string->unibyte)
{
ch = STRING_CHAR_AND_LENGTH (SDATA (string->lstring) + bytepos,
@ -1034,8 +1032,8 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
}
else
{
ch = FETCH_MULTIBYTE_CHAR (bytepos);
*ch_len = CHAR_BYTES (ch);
ch = STRING_CHAR_AND_LENGTH (BYTE_POS_ADDR (bytepos), len);
*ch_len = len;
}
*nchars = 1;
}