mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:54:13 +00:00
winedbg: Eliminate a possible memory leak in input_fetch_entire_line.
This commit is contained in:
parent
9981938486
commit
218d970bdd
1 changed files with 11 additions and 14 deletions
|
@ -462,6 +462,7 @@ static HANDLE dbg_parser_output;
|
|||
|
||||
int input_fetch_entire_line(const char* pfx, char** line)
|
||||
{
|
||||
char* buffer;
|
||||
char ch;
|
||||
DWORD nread;
|
||||
size_t len, alloc;
|
||||
|
@ -471,33 +472,29 @@ int input_fetch_entire_line(const char* pfx, char** line)
|
|||
*/
|
||||
WriteFile(dbg_parser_output, pfx, strlen(pfx), &nread, NULL);
|
||||
|
||||
if (*line)
|
||||
{
|
||||
alloc = HeapSize(GetProcessHeap(), 0, *line);
|
||||
assert(alloc);
|
||||
}
|
||||
else
|
||||
{
|
||||
*line = HeapAlloc(GetProcessHeap(), 0, alloc = 16);
|
||||
assert(*line);
|
||||
}
|
||||
buffer = HeapAlloc(GetProcessHeap(), 0, alloc = 16);
|
||||
assert(buffer != NULL);
|
||||
|
||||
len = 0;
|
||||
do
|
||||
{
|
||||
if (!ReadFile(dbg_parser_input, &ch, 1, &nread, NULL) || nread == 0)
|
||||
{
|
||||
HeapFree(GetProcessHeap(), 0, buffer);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (len + 2 > alloc)
|
||||
{
|
||||
while (len + 2 > alloc) alloc *= 2;
|
||||
*line = dbg_heap_realloc(*line, alloc);
|
||||
buffer = dbg_heap_realloc(buffer, alloc);
|
||||
}
|
||||
(*line)[len++] = ch;
|
||||
buffer[len++] = ch;
|
||||
}
|
||||
while (ch != '\n');
|
||||
(*line)[len] = '\0';
|
||||
buffer[len] = '\0';
|
||||
|
||||
*line = buffer;
|
||||
return len;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue