diff options
| author | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2014-12-29 19:17:43 +0100 |
|---|---|---|
| committer | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2014-12-29 19:17:43 +0100 |
| commit | 0e711ebd624b8b1b35bd3126868f4887bf0ece71 (patch) | |
| tree | 2ed66cc41806c7f84efc7b008a422b5b852faca5 | |
| parent | 4e0ac557f912d11844f457b8faa00887328bd97e (diff) | |
| parent | b942ec41e6938c10f0cab70869503fbe42a35b88 (diff) | |
Merge pull request #6055 from fritsch/fix-coverity
Fix coverity: Some Reverts
| -rw-r--r-- | xbmc/filesystem/iso9660.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/xbmc/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp index 11e6818b7d..fbe34b20e1 100644 --- a/xbmc/filesystem/iso9660.cpp +++ b/xbmc/filesystem/iso9660.cpp @@ -628,11 +628,7 @@ HANDLE iso9660::FindFirstFile( char *szLocalFolder, WIN32_FIND_DATA *wfdFile ) if ( m_searchpointer ) { - if (sizeof(m_searchpointer->name) > sizeof(wfdFile->cFileName) -1) - CLog::Log(LOGWARNING, "iso9660::FindFirstFile length of search pattern too large"); - - strncpy(wfdFile->cFileName, m_searchpointer->name, sizeof(wfdFile->cFileName) - 1 ); - wfdFile->cFileName[sizeof(wfdFile->cFileName) - 1] = 0; + strcpy(wfdFile->cFileName, m_searchpointer->name ); if ( m_searchpointer->type == 2 ) wfdFile->dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY; @@ -658,11 +654,7 @@ int iso9660::FindNextFile( HANDLE szLocalFolder, WIN32_FIND_DATA *wfdFile ) if ( m_searchpointer ) { - if (sizeof(m_searchpointer->name) > sizeof(wfdFile->cFileName) -1) - CLog::Log(LOGWARNING, "iso9660::FindNextFile Search pattern too large"); - - strncpy(wfdFile->cFileName, m_searchpointer->name, sizeof(wfdFile->cFileName) - 1 ); - wfdFile->cFileName[sizeof(wfdFile->cFileName) - 1] = 0; + strcpy(wfdFile->cFileName, m_searchpointer->name ); if ( m_searchpointer->type == 2 ) wfdFile->dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY; @@ -722,12 +714,7 @@ HANDLE iso9660::OpenFile(const char *filename) while ( strpbrk( pointer, "\\/" ) ) pointer = strpbrk( pointer, "\\/" ) + 1; - if (sizeof(filename) > sizeof(work) -1) - CLog::Log(LOGWARNING, "iso9660::OpenFile supplied path length too large"); - - strncpy(work, filename, sizeof(work) - 1 ); - work[sizeof(work) - 1] = 0; - + strcpy(work, filename ); pointer2 = work; while ( strpbrk(pointer2 + 1, "\\" ) ) |