test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-09 15:47:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix input_linux.cc's crash while inputdevice is remoed

Browse Source
This commit is contained in:
houzh 2023-12-06 11:04:28 +08:00
parent 64f383d73d
commit 98a51c9349
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/core/inputeventsource.cc
View File

@ -58,15 +58,15 @@ void InputEventSource::onDeviceChanged(const INPUTEVENT*es){
case EV_ADD:
/*noting todo*/
LOGI("device %d is added",es->device);
for(auto d:mDevices)LOGI("device %d %s",d.first,d.second->getName().c_str());
getdevice(es->device);
for(auto d:mDevices)LOGI("::device %d classes=%x %s",d.first,d.second->getClasses(),d.second->getName().c_str());
break;
case EV_REMOVE:
if(itr!=mDevices.end())dev = itr->second;
LOGI("device %s:%d/%d is removed", dev->getName().c_str(), es->device,dev->getId());
mDevices.erase(itr);
LOGI_IF(dev,"device %s:%d/%d is removed", dev->getName().c_str(), es->device,dev->getId());
LOGI_IF(dev==nullptr,"remove unknwon dev %s:%d",dev->getName().c_str(), es->device);
if(itr!=mDevices.end())mDevices.erase(itr);
break;
default:LOGI("dev %d unknown event %d",es->device,es->type);break;
}
}

6
src/porting/common/input_linux.cc
View File

@ -204,7 +204,7 @@ INT InputGetEvents(INPUTEVENT*outevents,UINT max,DWORD timeout) {
LOGI("read(dev.inotify=%d/%d)",total,sizeof(struct inotify_event));
if(total<sizeof(struct inotify_event))
continue;
while(elen<total){
while(elen<total){
ievent = (struct inotify_event*)(inotifyBuffer+event_pos);
std::string path = WATCHED_PATH;
path.append("/").append(ievent->name);
@ -216,7 +216,7 @@ INT InputGetEvents(INPUTEVENT*outevents,UINT max,DWORD timeout) {
e->device = it->fd;
e->type = EV_REMOVE;
LOGI("..device %s:%d/%d deleted found=%d",path.c_str(),ievent->wd,it->fd,(it!=dev.fds.end()));
if(it!=dev.fds.end()){close(it->fd);dev.fds.erase(it);}
if(it!=dev.fds.end()){FD_CLR(it->fd,&rfds);close(it->fd);dev.fds.erase(it);}
e++;
}else if(ievent->mask & IN_CREATE){
e->device = open(path.c_str(),O_RDWR);
@ -232,7 +232,7 @@ INT InputGetEvents(INPUTEVENT*outevents,UINT max,DWORD timeout) {
}
}else {/*for input devices*/
rc = read(FDS[i].fd,events, sizeof(events)/sizeof(struct input_event));
for(int j=0; j<rc/sizeof(struct input_event)&&(count<max); j++,e++,count++) {
for(int j=0; (rc>0)&&j<rc/sizeof(struct input_event)&&(count<max); j++,e++,count++) {
e->tv_sec = events[j].time.tv_sec;
e->tv_usec= events[j].time.tv_usec;
e->type = events[j].type;