oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/BufferedSocket: OnSocketReady() returns true after close

Browse Source 
Fixes use-after-free bug (https://bugs.musicpd.org/view.php?id=4548).
This commit is contained in:
Max Kellermann 2016-07-07 13:52:20 +02:00
parent 6f59d71e07
commit b46cf57d98
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -5,6 +5,7 @@ ver 0.19.17 (not yet released)
* fix spurious seek error "Failed to allocate silence buffer" * fix spurious seek error "Failed to allocate silence buffer"
* replay gain: fix "replay_gain_handler mixer" setting * replay gain: fix "replay_gain_handler mixer" setting
* DSD: use 0x69 as silence pattern * DSD: use 0x69 as silence pattern
* fix use-after-free bug on "close"
ver 0.19.16 (2016/06/13) ver 0.19.16 (2016/06/13)
* faster seeking * faster seeking

8
src/event/BufferedSocket.cxx
View File

@ -118,9 +118,15 @@ BufferedSocket::OnSocketReady(unsigned flags)
if (flags & READ) { if (flags & READ) {
assert(!input.IsFull()); assert(!input.IsFull());
if (!ReadToBuffer() || !ResumeInput()) if (!ReadToBuffer())
return false; return false;
if (!ResumeInput())
/* we must return "true" here or
SocketMonitor::Dispatch() will call
Cancel() on a freed object */
return true;
if (!input.IsFull()) if (!input.IsFull())
ScheduleRead(); ScheduleRead();
} }