diff options
| author | Patrick Steinhardt <ps@pks.im> | 2018-08-09 12:48:26 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2018-10-26 14:58:51 +0200 |
| commit | fad596582152112b2fc935fdf4afe98c2890f713 (patch) | |
| tree | 1fda834772699e4236c761a54f2fd5075fcb8565 | |
| parent | f4a7652a6fecd2758cb589ff6567254e17aefa41 (diff) | |
| download | libgit2-fad596582152112b2fc935fdf4afe98c2890f713.tar.gz | |
diff: fix OOM on AIX when finding similar deltas in empty diff
The function `git_diff_find_similar` keeps a function of cache
similarity metrics signatures, whose size depends on the number of
deltas passed in via the `diff` parameter. In case where the diff is
empty and thus doesn't have any deltas at all, we may end up allocating
this cache via a call to `git__calloc(0, sizeof(void *))`. At least on
AIX, allocating 0 bytes will result in a `NULL` pointer being returned,
which causes us to erroneously return an OOM error.
Fix this situation by simply returning early in case where we are being
passed an empty diff, as we cannot find any similarities in that case
anyway.
(cherry picked from commit c65568d8c8c1bf4920393190e862819cd263f439)
| -rw-r--r-- | src/diff_tform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c index bc664dd05..a9706e002 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -822,7 +822,7 @@ int git_diff_find_similar( num_deltas = diff->deltas.length; /* TODO: maybe abort if deltas.length > rename_limit ??? */ - if (!git__is_uint32(num_deltas)) + if (!num_deltas || !git__is_uint32(num_deltas)) goto cleanup; /* No flags set; nothing to do */ |