[src/trunk]: src/lib/libedit - don't leave cursor dangling on memory failure ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef814c36eb6e
branches:  trunk
changeset: 767680:ef814c36eb6e
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jul 27 02:23:29 2011 +0000

description:
- don't leave cursor dangling on memory failure or after clearing the list
- compute the string length to be strvis'ed after the string is encoded

diffstat:

 lib/libedit/history.c |  38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diffs (100 lines):

diff -r c50254e28e40 -r ef814c36eb6e lib/libedit/history.c
--- a/lib/libedit/history.c     Wed Jul 27 02:18:30 2011 +0000
+++ b/lib/libedit/history.c     Wed Jul 27 02:23:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: history.c,v 1.38 2011/01/16 03:05:51 christos Exp $    */
+/*     $NetBSD: history.c,v 1.39 2011/07/27 02:23:29 christos Exp $    */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)history.c  8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: history.c,v 1.38 2011/01/16 03:05:51 christos Exp $");
+__RCSID("$NetBSD: history.c,v 1.39 2011/07/27 02:23:29 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -465,23 +465,25 @@
 private int
 history_def_insert(history_t *h, TYPE(HistEvent) *ev, const Char *str)
 {
+       hentry_t *c;
 
-       h->cursor = (hentry_t *) h_malloc(sizeof(hentry_t));
-       if (h->cursor == NULL)
+       c = h_malloc(sizeof(*c));
+       if (c == NULL)
                goto oomem;
-       if ((h->cursor->ev.str = h_strdup(str)) == NULL) {
-               h_free((ptr_t)h->cursor);
+       if ((c->ev.str = h_strdup(str)) == NULL) {
+               h_free((ptr_t)c);
                goto oomem;
        }
-       h->cursor->data = NULL;
-       h->cursor->ev.num = ++h->eventid;
-       h->cursor->next = h->list.next;
-       h->cursor->prev = &h->list;
-       h->list.next->prev = h->cursor;
-       h->list.next = h->cursor;
+       c->data = NULL;
+       c->ev.num = ++h->eventid;
+       c->next = h->list.next;
+       c->prev = &h->list;
+       h->list.next->prev = c;
+       h->list.next = c;
        h->cur++;
+       h->cursor = c;
 
-       *ev = h->cursor->ev;
+       *ev = c->ev;
        return (0);
 oomem:
        he_seterrev(ev, _HE_MALLOC_FAILED);
@@ -499,7 +501,7 @@
 
        if ((h->flags & H_UNIQUE) != 0 && h->list.next != &h->list &&
            Strcmp(h->list.next->ev.str, str) == 0)
-           return (0); 
+           return (0);
 
        if (history_def_insert(h, ev, str) == -1)
                return (-1);    /* error, keep error message */
@@ -551,6 +553,7 @@
 
        while (h->list.prev != &h->list)
                history_def_delete(h, ev, h->list.prev);
+       h->cursor = &h->list;
        h->eventid = 0;
        h->cur = 0;
 }
@@ -794,7 +797,7 @@
        TYPE(HistEvent) ev;
        int i = -1, retval;
        size_t len, max_size;
-       char *ptr;
+       char *ptr, *str;
 #ifdef WIDECHAR
        static ct_buffer_t conv;
 #endif
@@ -812,7 +815,8 @@
        for (i = 0, retval = HLAST(h, &ev);
            retval != -1;
            retval = HPREV(h, &ev), i++) {
-               len = Strlen(ev.str) * 4;
+               str = ct_encode_string(ev.str, &conv);
+               len = strlen(str) * 4;
                if (len >= max_size) {
                        char *nptr;
                        max_size = (len + 1024) & ~1023;
@@ -823,7 +827,7 @@
                        }
                        ptr = nptr;
                }
-               (void) strvis(ptr, ct_encode_string(ev.str, &conv), VIS_WHITE);
+               (void) strvis(ptr, str, VIS_WHITE);
                (void) fprintf(fp, "%s\n", ptr);
        }
 oomem: