diff options
| author | Eli Zaretskii | 2011-06-09 14:34:28 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-06-09 14:34:28 +0300 |
| commit | d9334cb76854ba87934792b929d6ab68e70433ae (patch) | |
| tree | 134f51fe58aa4f8f4c8ac5ffbf4861e93b6ee03c /src | |
| parent | 87e67904f15fda542426c9159c95a19142aecbad (diff) | |
| download | emacs-d9334cb76854ba87934792b929d6ab68e70433ae.tar.gz emacs-d9334cb76854ba87934792b929d6ab68e70433ae.zip | |
Tested with buffer reordering, fixed one crash.
src/xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize
itb.string.s to NULL (avoids a crash in bidi_paragraph_init).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c303839b14d..96b8d7ae7be 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-06-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize | ||
| 4 | itb.string.s to NULL (avoids a crash in bidi_paragraph_init). | ||
| 5 | |||
| 1 | 2011-06-08 Eli Zaretskii <eliz@gnu.org> | 6 | 2011-06-08 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * bidi.c (bidi_paragraph_info): Delete unused struct. | 8 | * bidi.c (bidi_paragraph_info): Delete unused struct. |
diff --git a/src/xdisp.c b/src/xdisp.c index cd62989d994..72aea8d224f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -18169,6 +18169,7 @@ See also `bidi-paragraph-direction'. */) | |||
| 18169 | itb.charpos = pos; | 18169 | itb.charpos = pos; |
| 18170 | itb.bytepos = bytepos; | 18170 | itb.bytepos = bytepos; |
| 18171 | itb.nchars = -1; | 18171 | itb.nchars = -1; |
| 18172 | itb.string.s = NULL; | ||
| 18172 | itb.frame_window_p = FRAME_WINDOW_P (SELECTED_FRAME ()); /* guesswork */ | 18173 | itb.frame_window_p = FRAME_WINDOW_P (SELECTED_FRAME ()); /* guesswork */ |
| 18173 | itb.first_elt = 1; | 18174 | itb.first_elt = 1; |
| 18174 | itb.separator_limit = -1; | 18175 | itb.separator_limit = -1; |