AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2025-01-23 15:19:29 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

util: Be OOM-safe and use _cleanup_free_

Browse Source
This commit is contained in:
Lucas De Marchi 2013-11-18 05:31:14 -02:00
parent 1dda626f6b
commit 9c306bad2e
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libkmod/libkmod-util.c
View File

@ -46,8 +46,8 @@
char *getline_wrapped(FILE *fp, unsigned int *linenum)
{
int size = 256;
int i = 0;
char *buf = malloc(size);
int i = 0, n = 0;
_cleanup_free_ char *buf = malloc(size);
if (buf == NULL)
return NULL;
@ -57,26 +57,33 @@ char *getline_wrapped(FILE *fp, unsigned int *linenum)
switch(ch) {
case EOF:
if (i == 0) {
free(buf);
if (i == 0)
return NULL;
}
/* else fall through */
case '\n':
n++;
{
char *ret;
if (i == size) {
ret = realloc(buf, size + 1);
if (!ret)
return NULL;
} else
ret = buf;
ret[i] = '\0';
buf = NULL;
if (linenum)
(*linenum)++;
if (i == size)
buf = realloc(buf, size + 1);
buf[i] = '\0';
return buf;
*linenum += n;
return ret;
}
case '\\':
ch = getc_unlocked(fp);
if (ch == '\n') {
if (linenum)
(*linenum)++;
n++;
continue;
}
/* else fall through */
@ -85,8 +92,12 @@ char *getline_wrapped(FILE *fp, unsigned int *linenum)
buf[i++] = ch;
if (i == size) {
char *tmp;
size *= 2;
buf = realloc(buf, size);
tmp = realloc(buf, size);
if (!tmp)
return NULL;
buf = tmp;
}
}
}