oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Make cgetstr() not return allocated memory on failure [CID-170]

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-07-30 10:04:44 +02:00
parent 09f64eb7c5
commit 0da57a49d7
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/roken/getcap.c
View File

@@ -854,7 +854,9 @@ cgetstr(char *buf, const char *cap, char **str)
const char *bp; const char *bp;
char *mp; char *mp;
int len; int len;
char *mem; char *mem, *nmem;
*str = NULL;
/* /*
* Find string capability cap * Find string capability cap
@@ -941,8 +943,11 @@ cgetstr(char *buf, const char *cap, char **str)
if (m_room == 0) { if (m_room == 0) {
size_t size = mp - mem; size_t size = mp - mem;
if ((mem = realloc(mem, size + SFRAG)) == NULL) if ((nmem = realloc(mem, size + SFRAG)) == NULL) {
free(mem);
return (-2); return (-2);
}
mem = nmem;
m_room = SFRAG; m_room = SFRAG;
mp = mem + size; mp = mem + size;
} }
@@ -954,9 +959,13 @@ cgetstr(char *buf, const char *cap, char **str)
/* /*
* Give back any extra memory and return value and success. * Give back any extra memory and return value and success.
*/ */
if (m_room != 0) if (m_room != 0) {
if ((mem = realloc(mem, (size_t)(mp - mem))) == NULL) if ((nmem = realloc(mem, (size_t)(mp - mem))) == NULL) {
free(mem);
return (-2); return (-2);
}
mem = nmem;
}
*str = mem; *str = mem;
return (len); return (len);
} }