Changes in editwin.c [6c171f1:2184001]

File:

• editwin.c (modified) (3 diffs)

editwin.c

@@ -326 +326 @@
 static void oe_release_excursion(owl_editwin *e, oe_excursion *x)
 {
-  oe_excursion **px;
+  oe_excursion *p;
 
   x->valid = 0;
-  for (px = &e->excursions; *px != NULL; px = &(*px)->next)
-    if (*px == x) {
-      *px = x->next;
-      return;
-    }
-  abort();
+  if (e->excursions == NULL)
+    /* XXX huh. */ ;
+  else if (e->excursions == x)
+    e->excursions = x->next;
+  else {
+    for (p = e->excursions; p->next != NULL; p = p->next)
+      if (p->next == x) {
+        p->next = p->next->next;
+        break;
+      }
+    /* and if we ran off the end? XXX */
+  }
 }
 
@@ -1252 +1258 @@
 
   if (!g_unichar_iscntrl(c) || c == '\n' || c== '\t' ) {
+    memset(tmp, 0, 7);
+
     if (c == '\n' && e->style == OWL_EDITWIN_STYLE_ONELINE) {
       return;
@@ -1294 +1302 @@
       return; /* our work here is done */
 
-    tmp[g_unichar_to_utf8(c, tmp)] = '\0';
+    g_unichar_to_utf8(c, tmp);
     owl_editwin_replace(e, 0, tmp);
   }