X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fbase%2Fnew_pair.c;h=70866c6368123dcc042fca77390d8679e1449f81;hb=461e72d1826483cb2c2cb243412f2dc5b00b2b1a;hp=92131232e8695edf52b51f8902fac008176ef61c;hpb=f79af94ad91dfe693eb9779caf71ea892fb1eff6;p=ncurses.git diff --git a/ncurses/base/new_pair.c b/ncurses/base/new_pair.c index 92131232..70866c63 100644 --- a/ncurses/base/new_pair.c +++ b/ncurses/base/new_pair.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2021 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -61,7 +61,7 @@ #endif -MODULE_ID("$Id: new_pair.c,v 1.20 2020/04/11 16:06:56 tom Exp $") +MODULE_ID("$Id: new_pair.c,v 1.23 2021/08/16 22:11:26 tom Exp $") #if NCURSES_EXT_COLORS @@ -106,7 +106,7 @@ dumpit(SCREEN *sp, int pair, const char *tag) size_t have = sizeof(bigbuf); _nc_STRCPY(p, tag, have); - for (n = 0; n < sp->_pair_limit; ++n) { + for (n = 0; n < sp->_pair_alloc; ++n) { if (list[n].mode != cpFREE) { p += strlen(p); if ((size_t) (p - bigbuf) + 50 > have) @@ -145,11 +145,11 @@ _nc_find_color_pair(SCREEN *sp, int fg, int bg) { colorpair_t find; int result = -1; - void *pp; find.fg = fg; find.bg = bg; if (sp != 0) { + void *pp; if ((pp = tfind(&find, &sp->_ordered_pairs, compare_data)) != 0) { colorpair_t *temp = *(colorpair_t **) pp; result = (int) (temp - sp->_color_pairs); @@ -297,7 +297,7 @@ NCURSES_SP_NAME(alloc_pair) (NCURSES_SP_DCLx int fg, int bg) found = TRUE; } } - if (!found) { + if (!found && SP_PARM->_color_pairs != NULL) { for (pair = 1; pair <= hint; pair++) { if (SP_PARM->_color_pairs[pair].mode == cpFREE) { T(("found gap %d", pair));