[Emacs-diffs] /srv/bzr/emacs/trunk r107088: Fix bug #10696 with crash when an empty display string is at BOB.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107088
fixes bug(s): http://debbugs.gnu.org/10696
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-04 11:27:03 +0200
message:
  Fix bug #10696 with crash when an empty display string is at BOB.
  
   src/keyboard.c (adjust_point_for_property): Don't position point
   before BEGV.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-02-03 19:24:22 +0000
+++ b/src/ChangeLog     2012-02-04 09:27:03 +0000
@@ -1,3 +1,8 @@
+2012-02-04  Eli Zaretskii  <address@hidden>
+
+       * keyboard.c (adjust_point_for_property): Don't position point
+       before BEGV.  (Bug#10696)
+
 2012-02-03  Paul Eggert  <address@hidden>
 
        Handle overflow when computing char display width (Bug#9496).

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-01-26 16:09:35 +0000
+++ b/src/keyboard.c    2012-02-04 09:27:03 +0000
@@ -1749,7 +1749,9 @@
        {
          xassert (end > PT);
          SET_PT (PT < last_pt
-                 ? (STRINGP (val) && SCHARS (val) == 0 ? beg - 1 : beg)
+                 ? (STRINGP (val) && SCHARS (val) == 0
+                    ? max (beg - 1, BEGV)
+                    : beg)
                  : end);
          check_composition = check_invisible = 1;
        }