new_vec = ec_realloc(vec->vec, vec->elt_size * (vec->len + 1));
if (new_vec == NULL)
return -ENOMEM;
+ vec->size = vec->len + 1;
}
vec->vec = new_vec;
- if (vec->copy)
- vec->copy(get_obj(vec, vec->len), ptr);
- else
- memcpy(get_obj(vec, vec->len), ptr, vec->elt_size);
+ memcpy(get_obj(vec, vec->len), ptr, vec->elt_size);
vec->len++;
return 0;
size_t ec_vec_len(const struct ec_vec *vec)
{
+ if (vec == NULL)
+ return 0;
+
return vec->len;
}
int ec_vec_get(void *ptr, const struct ec_vec *vec, size_t idx)
{
- if (vec == NULL || idx >= vec->len)
- return -EINVAL;
+ if (vec == NULL || idx >= vec->len) {
+ errno = EINVAL;
+ return -1;
+ }
- if (vec->copy)
- vec->copy(ptr, get_obj(vec, idx));
- else
- memcpy(ptr, get_obj(vec, idx), vec->elt_size);
+ memcpy(ptr, get_obj(vec, idx), vec->elt_size);
return 0;
}
if (ec_vec_get(&vals, vec, 0) < 0)
GOTO_FAIL;
- if (strcmp(vals, "0"))
+ if (vals == NULL || strcmp(vals, "0"))
GOTO_FAIL;
if (ec_vec_get(&vals, vec, 1) < 0)
GOTO_FAIL;
- if (strcmp(vals, "1"))
+ if (vals == NULL || strcmp(vals, "1"))
GOTO_FAIL;
if (ec_vec_get(&vals, vec, 2) < 0)
GOTO_FAIL;
- if (strcmp(vals, "2"))
+ if (vals == NULL || strcmp(vals, "2"))
GOTO_FAIL;
ec_vec_free(vec);