=================================================================== RCS file: /cvs/mandoc/compat_stringlist.c,v retrieving revision 1.2 retrieving revision 1.4 diff -u -p -r1.2 -r1.4 --- mandoc/compat_stringlist.c 2015/05/20 22:22:59 1.2 +++ mandoc/compat_stringlist.c 2015/05/20 23:43:03 1.4 @@ -1,4 +1,4 @@ -/* $Id: compat_stringlist.c,v 1.2 2015/05/20 22:22:59 schwarze Exp $ */ +/* $Id: compat_stringlist.c,v 1.4 2015/05/20 23:43:03 schwarze Exp $ */ /* * Copyright (c) 1994 Christos Zoulas * All rights reserved. @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -48,7 +46,7 @@ sl_init(void) sl->sl_cur = 0; sl->sl_max = _SL_CHUNKSIZE; - sl->sl_str = malloc(sl->sl_max * sizeof(char *)); + sl->sl_str = reallocarray(NULL, sl->sl_max, sizeof(char *)); if (sl->sl_str == NULL) err(1, "stringlist"); return sl; @@ -63,7 +61,8 @@ sl_add(StringList *sl, char *name) { if (sl->sl_cur == sl->sl_max - 1) { sl->sl_max += _SL_CHUNKSIZE; - sl->sl_str = reallocf(sl->sl_str, sl->sl_max * sizeof(char *)); + sl->sl_str = reallocarray(sl->sl_str, + sl->sl_max, sizeof(char *)); if (sl->sl_str == NULL) return (-1); }