[Emacs-diffs] trunk r116134: * xdisp.c (reseat_1, Fcurrent_bidi_paragraph_direction): Avoid

[Dmitry Antipov]

------------------------------------------------------------
revno: 116134
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2014-01-24 07:53:16 +0400
message:
  * xdisp.c (reseat_1, Fcurrent_bidi_paragraph_direction): Avoid
  undefined behavior by initializing display property bit of a
  string processed by the bidirectional iterator.  For details, see
  <http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01920.html>.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-01-23 17:27:37 +0000
+++ b/src/ChangeLog     2014-01-24 03:53:16 +0000
@@ -1,3 +1,10 @@
+2014-01-24  Dmitry Antipov  <address@hidden>
+
+       * xdisp.c (reseat_1, Fcurrent_bidi_paragraph_direction): Avoid
+       undefined behavior by initializing display property bit of a
+       string processed by the bidirectional iterator.  For details, see
+       <http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01920.html>.
+
 2014-01-23  Paul Eggert  <address@hidden>
 
        Minor cleanup of previous change.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-01-13 11:30:30 +0000
+++ b/src/xdisp.c       2014-01-24 03:53:16 +0000
@@ -6409,6 +6409,7 @@
       it->bidi_it.string.s = NULL;
       it->bidi_it.string.lstring = Qnil;
       it->bidi_it.string.bufpos = 0;
+      it->bidi_it.string.from_disp_str = 0;
       it->bidi_it.string.unibyte = 0;
       it->bidi_it.w = it->w;
     }
@@ -20411,6 +20412,7 @@
       itb.string.s = NULL;
       itb.string.lstring = Qnil;
       itb.string.bufpos = 0;
+      itb.string.from_disp_str = 0;
       itb.string.unibyte = 0;
       /* We have no window to use here for ignoring window-specific
         overlays.  Using NULL for window pointer will cause