mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

rcinput: fix corrupted iterator on input device hot-unplug

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
Stefan Seyfried
2017-09-25 11:25:50 +02:00
committed by Thilo Graf
parent 8fc2db736a
commit 5731cf10a4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/rcinput.cpp
View File

@@ -1305,7 +1305,10 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
}
}
for (std::vector<in_dev>::iterator i = indev.begin(); i != indev.end(); ++i) {
/* iterate backwards or the vector will be corrupted by the indev.erase(i) */
std::vector<in_dev>::iterator i = indev.end();
while (i != indev.begin()) {
--i;
if (((*i).fd != -1) && (FD_ISSET((*i).fd, &rfds))) {
uint64_t now_pressed = 0;
t_input_event ev;
@@ -1317,7 +1320,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
if (errno == ENODEV) {
/* hot-unplugged? */
::close((*i).fd);
indev.erase(i);
i = indev.erase(i);
}
continue;
}