some vec tweaks

This commit is contained in:
cathugger 2017-10-10 03:14:45 +00:00
parent 586d977fa0
commit f862c7897e
2 changed files with 13 additions and 11 deletions

10
vec.c
View file

@ -25,8 +25,12 @@ void vec_add1(struct vec_basestruct *ctl,size_t sz)
void vec_addn(struct vec_basestruct *ctl,size_t sz,size_t n)
{
if (!ctl->alen)
ctl->alen = 8;
if (!ctl->alen) {
if (SIZE_MAX / 8 >= sz)
ctl->alen = 8;
else
ctl->alen = 1;
}
size_t nlen = ctl->alen;
ctl->len += n;
while (ctl->len > nlen)
@ -39,8 +43,6 @@ void vec_addn(struct vec_basestruct *ctl,size_t sz,size_t n)
if (!ctl->buf)
abort();
} else if (!ctl->buf) {
if (SIZE_MAX / ctl->alen < sz)
abort();
ctl->buf = malloc(ctl->alen * sz);
if (!ctl->buf)
abort();