storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix StrStream memory leak

Browse Source 
ISclose() doesn't free memory if a stream's function pointer, close, is NULL.
However, str_stream's close pointer is always NULL and thus leaks
memory.
This commit is contained in:
Kuang-che Wu
2021-10-26 15:45:06 +08:00
parent b201f426e4
commit b0ebd5737e
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
istream.c
View File

@@ -185,12 +185,16 @@ int
ISclose(InputStream stream) ISclose(InputStream stream)
{ {
MySignalHandler(*prevtrap) (); MySignalHandler(*prevtrap) ();
if (stream == NULL || stream->base.close == NULL || if (stream == NULL)
stream->base.type & IST_UNCLOSE)
return -1; return -1;
if (stream->base.close != NULL) {
if (stream->base.type & IST_UNCLOSE) {
return -1;
}
prevtrap = mySignal(SIGINT, SIG_IGN); prevtrap = mySignal(SIGINT, SIG_IGN);
stream->base.close (stream->base.handle); stream->base.close (stream->base.handle);
mySignal(SIGINT, prevtrap); mySignal(SIGINT, prevtrap);
}
xfree(stream->base.stream.buf); xfree(stream->base.stream.buf);
xfree(stream); xfree(stream);
return 0; return 0;