Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libterminfo/term.c,v rcsdiff: /ftp/cvs/cvsroot/src/lib/libterminfo/term.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.13 retrieving revision 1.19.2.2 diff -u -p -r1.13 -r1.19.2.2 --- src/lib/libterminfo/term.c 2011/10/03 19:18:55 1.13 +++ src/lib/libterminfo/term.c 2017/04/26 02:52:56 1.19.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: term.c,v 1.13 2011/10/03 19:18:55 roy Exp $ */ +/* $NetBSD: term.c,v 1.19.2.2 2017/04/26 02:52:56 pgoyette Exp $ */ /* * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc. @@ -28,16 +28,16 @@ */ #include -__RCSID("$NetBSD: term.c,v 1.13 2011/10/03 19:18:55 roy Exp $"); +__RCSID("$NetBSD: term.c,v 1.19.2.2 2017/04/26 02:52:56 pgoyette Exp $"); #include #include +#include #include #include #include #include -#include #include #include #include @@ -54,6 +54,23 @@ const char *_ti_database; #include "compiled_terms.c" static int +allocset(void *pp, int init, size_t nelem, size_t elemsize) +{ + void **p = pp; + if (*p) { + memset(*p, init, nelem * elemsize); + return 0; + } + + if ((*p = calloc(nelem, elemsize)) == NULL) + return -1; + + if (init != 0) + memset(*p, init, nelem * elemsize); + return 0; +} + +static int _ti_readterm(TERMINAL *term, const char *cap, size_t caplen, int flags) { uint8_t ver; @@ -61,27 +78,29 @@ _ti_readterm(TERMINAL *term, const char size_t len; TERMUSERDEF *ud; + if (caplen == 0) + goto out; ver = *cap++; - /* Only read version 1 and 2 structures */ - if (ver != 1 && ver != 2) { - errno = EINVAL; - return -1; - } + caplen--; + /* Only read version 1 structures */ + if (ver != 1) + goto out; - term->flags = calloc(TIFLAGMAX + 1, sizeof(char)); - if (term->flags == NULL) - return -1; - term->nums = malloc((TINUMMAX + 1) * sizeof(short)); - if (term->nums == NULL) + if (allocset(&term->flags, 0, TIFLAGMAX+1, sizeof(*term->flags)) == -1) return -1; - memset(term->nums, (short)-1, (TINUMMAX + 1) * sizeof(short)); - term->strs = calloc(TISTRMAX + 1, sizeof(char *)); - if (term->strs == NULL) + + if (allocset(&term->nums, -1, TINUMMAX+1, sizeof(*term->nums)) == -1) return -1; - term->_arealen = caplen; - term->_area = malloc(term->_arealen); - if (term->_area == NULL) + + if (allocset(&term->strs, 0, TISTRMAX+1, sizeof(*term->strs)) == -1) return -1; + + if (term->_arealen != caplen) { + term->_arealen = caplen; + term->_area = realloc(term->_area, term->_arealen); + if (term->_area == NULL) + return -1; + } memcpy(term->_area, cap, term->_arealen); cap = term->_area; @@ -89,17 +108,13 @@ _ti_readterm(TERMINAL *term, const char cap += sizeof(uint16_t); term->name = cap; cap += len; - if (ver == 1) + len = le16dec(cap); + cap += sizeof(uint16_t); + if (len == 0) term->_alias = NULL; else { - len = le16dec(cap); - cap += sizeof(uint16_t); - if (len == 0) - term->_alias = NULL; - else { - term->_alias = cap; - cap += len; - } + term->_alias = cap; + cap += len; } len = le16dec(cap); cap += sizeof(uint16_t); @@ -123,7 +138,7 @@ _ti_readterm(TERMINAL *term, const char term->flags[ind] = 0; } } - + num = le16dec(cap); cap += sizeof(uint16_t); if (num != 0) { @@ -138,7 +153,7 @@ _ti_readterm(TERMINAL *term, const char cap += sizeof(uint16_t); } } - + num = le16dec(cap); cap += sizeof(uint16_t); if (num != 0) { @@ -158,13 +173,20 @@ _ti_readterm(TERMINAL *term, const char cap += len; } } - + num = le16dec(cap); cap += sizeof(uint16_t); if (num != 0) { - term->_nuserdefs = le16dec(cap); - term->_userdefs = malloc(sizeof(*term->_userdefs) * num); + num = le16dec(cap); cap += sizeof(uint16_t); + if (num != term->_nuserdefs) { + free(term->_userdefs); + term->_userdefs = NULL; + term->_nuserdefs = num; + } + if (allocset(&term->_userdefs, 0, term->_nuserdefs, + sizeof(*term->_userdefs)) == -1) + return -1; for (num = 0; num < term->_nuserdefs; num++) { ud = &term->_userdefs[num]; len = le16dec(cap); @@ -204,52 +226,75 @@ _ti_readterm(TERMINAL *term, const char cap += len; break; default: - errno = EINVAL; - return -1; + goto out; } } + } else { + term->_nuserdefs = 0; + if (term->_userdefs) { + free(term->_userdefs); + term->_userdefs = NULL; + } } + return 1; +out: + errno = EINVAL; + return -1; } static int _ti_dbgetterm(TERMINAL *term, const char *path, const char *name, int flags) { - DBM *db; - datum dt; - char *p; + struct cdbr *db; + const void *data; + char *db_name; + const uint8_t *data8; + size_t len, klen; int r; - db = dbm_open(path, O_RDONLY, 0644); + if (asprintf(&db_name, "%s.cdb", path) < 0) + return -1; + + db = cdbr_open(db_name, CDBR_DEFAULT); + free(db_name); if (db == NULL) return -1; + + klen = strlen(name) + 1; + if (cdbr_find(db, name, klen, &data, &len) == -1) + goto fail; + data8 = data; + if (len == 0) + goto fail; + /* Check for alias first, fall through to processing normal entries. */ + if (data8[0] == 2) { + if (klen + 7 > len || le16dec(data8 + 5) != klen) + goto fail; + if (memcmp(data8 + 7, name, klen)) + goto fail; + if (cdbr_get(db, le32dec(data8 + 1), &data, &len)) + goto fail; + data8 = data; + if (data8[0] != 1) + goto fail; + } else if (data8[0] != 1) + goto fail; + else if (klen + 3 >= len || le16dec(data8 + 1) != klen) + goto fail; + else if (memcmp(data8 + 3, name, klen)) + goto fail; + strlcpy(database, path, sizeof(database)); _ti_database = database; - dt.dptr = (void *)__UNCONST(name); - dt.dsize = strlen(name); - dt = dbm_fetch(db, dt); - if (dt.dptr == NULL) { - dbm_close(db); - return 0; - } - for (;;) { - p = (char *)dt.dptr; - if (*p++ != 0) /* not alias */ - break; - dt.dsize = le16dec(p) - 1; - p += sizeof(uint16_t); - dt.dptr = p; - dt = dbm_fetch(db, dt); - if (dt.dptr == NULL) { - dbm_close(db); - return 0; - } - } - - r = _ti_readterm(term, (char *)dt.dptr, dt.dsize, flags); - dbm_close(db); + r = _ti_readterm(term, data, len, flags); + cdbr_close(db); return r; + +fail: + cdbr_close(db); + return 0; } static int @@ -297,7 +342,7 @@ ticcmp(const TIC *tic, const char *name) l = strlen(alias); else l = s - alias; - if (len == l && strncmp(alias, name, l) == 0) + if (len == l && memcmp(alias, name, l) == 0) return 0; if (s == NULL) break; @@ -322,9 +367,10 @@ _ti_findterm(TERMINAL *term, const char _ti_database = NULL; r = 0; - if ((e = getenv("TERMINFO")) != NULL && *e != '\0') + if ((e = getenv("TERMINFO")) != NULL && *e != '\0') { if (e[0] == '/') return _ti_dbgetterm(term, e, name, flags); + } c = NULL; if (e == NULL && (c = getenv("TERMCAP")) != NULL) { @@ -340,13 +386,13 @@ _ti_findterm(TERMINAL *term, const char if (e != NULL) { if (c == NULL) e = strdup(e); /* So we don't destroy env */ - if (e == NULL) + if (e == NULL) tic = NULL; - else + else { tic = _ti_compile(e, TIC_WARNING | TIC_ALIAS | TIC_DESCRIPTION | TIC_EXTRA); - if (c == NULL && e != NULL) free(e); + } if (tic != NULL && ticcmp(tic, name) == 0) { len = _ti_flatten(&f, tic); if (len != -1) { @@ -376,7 +422,6 @@ _ti_findterm(TERMINAL *term, const char r = _ti_dbgettermp(term, _PATH_TERMINFO, name, flags); return r; - } int