Changeset b2c1bd4

Timestamp:

Jan 17, 2008, 2:03:11 AM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

81312e4

Parents:

84027015

Message:

editwin.c - fix a wrapping bug I introduced in the last revision.
It could leave us with a buffer that was not valid UTF-8

File:

• editwin.c (modified) (4 diffs)

editwin.c

@@ -368 +368 @@
     if (owl_util_can_break_after(c)) {
       if (c != ' ') {
-        _owl_editwin_set_xy_by_index(e, ptr1 - e->buff);
-        owl_editwin_key_right(e);
+        i = ptr1 - e->buff;
+        _owl_editwin_set_xy_by_index(e, i);
+        _owl_editwin_insert_bytes(e, 1);
         /* _owl_editwin_insert_bytes may move e->buff. */
-        i = ptr1 - e->buff;
-        _owl_editwin_insert_bytes(e,1);
         ptr1 = e->buff + i;
       }
@@ -1045 +1044 @@
     /* if we've travelled too far, linewrap */
     if ((e->buffx) >= e->fillcol) {
+      int len = e->bufflen;
       _owl_editwin_linewrap_word(e);
+      /* we may have added a character. */
+      if (i < save) save += e->bufflen - len;
     }
 
@@ -1057 +1059 @@
       e->buff[i]=' ';
     }
-    
+
     /* fix spacing */
     i = _owl_editwin_get_index_from_xy(e);
@@ -1073 +1075 @@
       owl_editwin_key_right(e);
     }
-
   }