Commit 437f7d69 by Vicent Marti

pool: Correct overflow checks

Ok, scrap the previous commit. This is the right overflow check that
takes care of 64 bit overflow **and** 32-bit overflow, which needs to be
considered because the pool malloc can only allocate 32-bit elements in
one go.
parent ce33645f
......@@ -194,6 +194,9 @@ char *git_pool_strndup(git_pool *pool, const char *str, size_t n)
assert(pool && str && pool->item_size == sizeof(char));
if ((uint32_t)(n + 1) < n)
return NULL;
if ((ptr = git_pool_malloc(pool, (uint32_t)(n + 1))) != NULL) {
memcpy(ptr, str, n);
ptr[n] = '\0';
......
......@@ -139,7 +139,11 @@ void test_core_pool__strndup_limit(void)
git_pool p;
cl_git_pass(git_pool_init(&p, 1, 100));
cl_assert(git_pool_strndup(&p, "foo", -1) == NULL);
/* ensure 64 bit doesn't overflow */
cl_assert(git_pool_strndup(&p, "foo", (size_t)-1) == NULL);
/* ensure 32 bit doesn't overflow */
cl_assert(git_pool_strndup(&p, "bar", 0xfffffffful + 32) == NULL);
git_pool_clear(&p);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment