Merge pull request libgit2#4986 from lhchavez/realloc

pks-t · web-flow · commit 12c6e1facc1b · 2019-02-20T10:54:00.000+01:00
Make stdalloc__reallocarray call stdalloc__realloc
diff --git a/src/stdalloc.c b/src/stdalloc.c
@@ -88,11 +88,10 @@ static void *stdalloc__reallocarray(void *ptr, size_t nelem, size_t elsize, cons
 {
 	size_t newsize;
 
-	GIT_UNUSED(file);
-	GIT_UNUSED(line);
+	if (GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize))
+		return NULL;
 
-	return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ?
-		NULL : realloc(ptr, newsize);
+	return stdalloc__realloc(ptr, newsize, file, line);
 }
 
 static void *stdalloc__mallocarray(size_t nelem, size_t elsize, const char *file, int line)

Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,10 @@ static void stdalloc__reallocarray(void ptr, size_t nelem, size_t elsize, cons`
`88`	`88`	`{`
`89`	`89`	`size_t newsize;`
`90`	`90`
`91`		`- GIT_UNUSED(file);`
`92`		`- GIT_UNUSED(line);`
	`91`	`+ if (GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize))`
	`92`	`+ return NULL;`
`93`	`93`
`94`		`- return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ?`
`95`		`- NULL : realloc(ptr, newsize);`
	`94`	`+ return stdalloc__realloc(ptr, newsize, file, line);`
`96`	`95`	`}`
`97`	`96`
`98`	`97`	`static void stdalloc__mallocarray(size_t nelem, size_t elsize, const char file, int line)`