actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #571 from mattmccutchen/master

Browse Source 
getDevice: Do not read a dirent after calling closedir.
This commit is contained in:
Kyzentun
2015-04-23 20:54:52 -06:00
parent 7ff045f920 cb7efb1570
commit ede974ce73
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/InputHandler/LinuxInputManager.cpp
+7 -3
View File
@@ -13,17 +13,21 @@
RString getDevice(RString inputDir, RString type) RString getDevice(RString inputDir, RString type)
{ {
RString result = "";
DIR* dir = opendir( inputDir.c_str() ); DIR* dir = opendir( inputDir.c_str() );
if(dir == NULL) if(dir == NULL)
{ LOG->Warn("LinuxInputManager: Couldn't open %s: %s.", inputDir.c_str(), strerror(errno) ); return ""; } { LOG->Warn("LinuxInputManager: Couldn't open %s: %s.", inputDir.c_str(), strerror(errno) ); return ""; }
struct dirent* d; struct dirent* d;
while( ( d = readdir(dir) ) != NULL) while( ( d = readdir(dir) ) != NULL)
if( strncmp( type.c_str(), d->d_name, type.size() ) == 0) break; if( strncmp( type.c_str(), d->d_name, type.size() ) == 0)
{
result = RString("/dev/input/") + d->d_name;
break;
}
closedir(dir); closedir(dir);
if( d == NULL ) return ""; return result;
return RString("/dev/input/") + d->d_name;
} }
LinuxInputManager::LinuxInputManager() LinuxInputManager::LinuxInputManager()