diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-21 13:16:42 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-21 13:16:42 -0500 |
| commit | e0482934e6187b2e76c0e44960bcbd3ce3795d0c (patch) | |
| tree | d33b02b3a63fe399e24257653ef225588bf96b6f /src/buffer.c | |
| parent | 6f4461763eb0518112d22c3a096417e7eedf7385 (diff) | |
| parent | 24cce2398f893b77f183425fffd957daa3300c5a (diff) | |
| download | libgit2-e0482934e6187b2e76c0e44960bcbd3ce3795d0c.tar.gz | |
Merge pull request #2725 from libgit2/vmg/attr-null
Do not assume blob contents are NULL terminated
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c index e9c420e16..7744d8f49 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -176,10 +176,13 @@ int git_buf_putcn(git_buf *buf, char c, size_t len) int git_buf_put(git_buf *buf, const char *data, size_t len) { - ENSURE_SIZE(buf, buf->size + len + 1); - memmove(buf->ptr + buf->size, data, len); - buf->size += len; - buf->ptr[buf->size] = '\0'; + if (len) { + assert(data); + ENSURE_SIZE(buf, buf->size + len + 1); + memmove(buf->ptr + buf->size, data, len); + buf->size += len; + buf->ptr[buf->size] = '\0'; + } return 0; } |