dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-08 00:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: check for overflow in greedy_realloc()

Browse Source
This commit is contained in:
Lennart Poettering
2013-12-10 18:53:03 +00:00
parent e77f18939b
commit 98088803bb
Notes: Lennart Poettering 2014-02-17 22:48:22 +01:00 
Backport: bugfix
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/util.c
View File

@@ -5792,12 +5792,18 @@ void* greedy_realloc(void **p, size_t *allocated, size_t need) {
size_t a;
void *q;
assert(p);
assert(allocated);
if (*allocated >= need)
return *p;
a = MAX(64u, need * 2);
/* check for overflows */
if (a < need)
return NULL;
q = realloc(*p, a);
if (!q)
return NULL;
@@ -5808,9 +5814,14 @@ void* greedy_realloc(void **p, size_t *allocated, size_t need) {
}
void* greedy_realloc0(void **p, size_t *allocated, size_t need) {
size_t prev = *allocated;
size_t prev;
uint8_t *q;
assert(p);
assert(allocated);
prev = *allocated;
q = greedy_realloc(p, allocated, need);
if (!q)
return NULL;