diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-02-11 09:39:38 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-02-12 22:54:47 -0500 |
| commit | 2884cc42de8b20a58cec8488d014a853d47c047e (patch) | |
| tree | 19dbb80072107fe65c7dd1de5dd849cc6914b154 /src/refs.c | |
| parent | 4aa664ae3953d99c2ae4cd769f02818bc122eebc (diff) | |
| download | libgit2-2884cc42de8b20a58cec8488d014a853d47c047e.tar.gz | |
overflow checking: don't make callers set oom
Have the ALLOC_OVERFLOW testing macros also simply set_oom in the
case where a computation would overflow, so that callers don't
need to.
Diffstat (limited to 'src/refs.c')
| -rw-r--r-- | src/refs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/refs.c b/src/refs.c index 33e931db5..af3190ef9 100644 --- a/src/refs.c +++ b/src/refs.c @@ -41,10 +41,8 @@ static git_reference *alloc_ref(const char *name) if (GIT_ALLOC_OVERFLOW_ADD(reflen, namelen) || GIT_ALLOC_OVERFLOW_ADD(reflen + namelen, 1) || - (ref = git__calloc(1, reflen + namelen + 1)) == NULL) { - giterr_set_oom(); + (ref = git__calloc(1, reflen + namelen + 1)) == NULL) return NULL; - } memcpy(ref->name, name, namelen + 1); |