summaryrefslogtreecommitdiff
path: root/compat/qsort.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-02-22 22:44:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-22 22:51:09 (GMT)
commit50a6c8efa2bbeddf46ca34c7765024108202e04b (patch)
tree0c189695ed6ad8349527cb03d326ef3fb39707cf /compat/qsort.c
parent96ffc06f72f693d80f05059a1f0e5ca9007d5f1b (diff)
downloadgit-50a6c8efa2bbeddf46ca34c7765024108202e04b.zip
git-50a6c8efa2bbeddf46ca34c7765024108202e04b.tar.gz
git-50a6c8efa2bbeddf46ca34c7765024108202e04b.tar.bz2
use st_add and st_mult for allocation size computation
If our size computation overflows size_t, we may allocate a much smaller buffer than we expected and overflow it. It's probably impossible to trigger an overflow in most of these sites in practice, but it is easy enough convert their additions and multiplications into overflow-checking variants. This may be fixing real bugs, and it makes auditing the code easier. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/qsort.c')
-rw-r--r--compat/qsort.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/qsort.c b/compat/qsort.c
index 9574d53..7d071af 100644
--- a/compat/qsort.c
+++ b/compat/qsort.c
@@ -47,7 +47,7 @@ static void msort_with_tmp(void *b, size_t n, size_t s,
void git_qsort(void *b, size_t n, size_t s,
int (*cmp)(const void *, const void *))
{
- const size_t size = n * s;
+ const size_t size = st_mult(n, s);
char buf[1024];
if (size < sizeof(buf)) {