From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 9 Jun 2011 11:34:28 +0000 (+0300)
Subject: Tested with buffer reordering, fixed one crash.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9334cb76854ba87934792b929d6ab68e70433ae;p=emacs.git

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).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c303839b14d..96b8d7ae7be 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize
+	itb.string.s to NULL (avoids a crash in bidi_paragraph_init).
+
 2011-06-08  Eli Zaretskii  <eliz@gnu.org>
 
 	* 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'.  */)
       itb.charpos = pos;
       itb.bytepos = bytepos;
       itb.nchars = -1;
+      itb.string.s = NULL;
       itb.frame_window_p = FRAME_WINDOW_P (SELECTED_FRAME ()); /* guesswork */
       itb.first_elt = 1;
       itb.separator_limit = -1;