shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

strv: add an additional overflow check when enlarging strv()s

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=76745
This commit is contained in:
Lennart Poettering 2014-10-21 14:01:28 +02:00
parent bb604b2f42
commit 97569e154b
Notes: Lennart Poettering 2014-10-27 13:16:33 +01:00 
Backport: bugfix
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shared/strv.c
View File

@ -380,13 +380,19 @@ char *strv_join_quoted(char **l) {
int strv_push(char ***l, char *value) {
char **c;
unsigned n;
unsigned n, m;
if (!value)
return 0;
n = strv_length(*l);
c = realloc(*l, sizeof(char*) * (n + 2));
/* increase and check for overflow */
m = n + 2;
if (m < n)
return -ENOMEM;
c = realloc(*l, sizeof(char*) * (size_t) m);
if (!c)
return -ENOMEM;
@ -399,13 +405,19 @@ int strv_push(char ***l, char *value) {
int strv_push_prepend(char ***l, char *value) {
char **c;
unsigned n, i;
unsigned n, m, i;
if (!value)
return 0;
n = strv_length(*l);
c = new(char*, n + 2);
/* increase and check for overflow */
m = n + 2;
if (m < n)
return -ENOMEM;
c = new(char*, m);
if (!c)
return -ENOMEM;