proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-12 10:01:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix corner cases and an undefined behavior

Browse Source
This commit is contained in:
Patrick Reynolds 2014-01-20 11:41:21 -06:00
parent b97e55f2f1
commit 7cbc6241cf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/buffer.c
View File

@ -66,8 +66,10 @@ int git_buf_try_grow(
new_ptr = git__realloc(new_ptr, new_size); new_ptr = git__realloc(new_ptr, new_size);
if (!new_ptr) { if (!new_ptr) {
if (mark_oom) if (mark_oom) {
if (buf->ptr) git__free(buf->ptr);
buf->ptr = git_buf__oom; buf->ptr = git_buf__oom;
}
return -1; return -1;
} }
@ -432,7 +434,7 @@ int git_buf_join(
ssize_t offset_a = -1; ssize_t offset_a = -1;
/* not safe to have str_b point internally to the buffer */ /* not safe to have str_b point internally to the buffer */
assert(str_b < buf->ptr || str_b > buf->ptr + buf->size); assert(str_b < buf->ptr || str_b >= buf->ptr + buf->size);
/* figure out if we need to insert a separator */ /* figure out if we need to insert a separator */
if (separator && strlen_a) { if (separator && strlen_a) {
@ -447,13 +449,14 @@ int git_buf_join(
if (git_buf_grow(buf, strlen_a + strlen_b + need_sep + 1) < 0) if (git_buf_grow(buf, strlen_a + strlen_b + need_sep + 1) < 0)
return -1; return -1;
assert(buf->ptr);
/* fix up internal pointers */ /* fix up internal pointers */
if (offset_a >= 0) if (offset_a >= 0)
str_a = buf->ptr + offset_a; str_a = buf->ptr + offset_a;
/* do the actual copying */ /* do the actual copying */
if (offset_a != 0) if (offset_a != 0 && str_a)
memmove(buf->ptr, str_a, strlen_a); memmove(buf->ptr, str_a, strlen_a);
if (need_sep) if (need_sep)
buf->ptr[strlen_a] = separator; buf->ptr[strlen_a] = separator;