From 7391ea68e8b592275443ec640f70e055af49c69e Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Mon, 29 Dec 2014 16:30:20 +0100
Subject: Revert "fixed: CID 719032 Copy into fixed size buffer"
This reverts commit f696216f4f14fc36c9653363bcbac277bde25c35. (sizeof misuse)
---
xbmc/filesystem/iso9660.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/xbmc/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp
index 11e6818b7d..5ccb859f1e 100644
--- a/xbmc/filesystem/iso9660.cpp
+++ b/xbmc/filesystem/iso9660.cpp
@@ -722,12 +722,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, "\\" ) )
--
cgit v1.2.3
From 59509c8eacee6e2e094d72f915cdb1dfe3d9751e Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Mon, 29 Dec 2014 16:30:36 +0100
Subject: Revert "fixed: CID 719030 Copy into fixed size buffer"
This reverts commit 79e35d9cac9cc3bf871813262ea54e410206fd68. (sizeof misuse)
---
xbmc/filesystem/iso9660.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/xbmc/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp
index 5ccb859f1e..cb0816e282 100644
--- a/xbmc/filesystem/iso9660.cpp
+++ b/xbmc/filesystem/iso9660.cpp
@@ -658,11 +658,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;
--
cgit v1.2.3
From b942ec41e6938c10f0cab70869503fbe42a35b88 Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Mon, 29 Dec 2014 16:30:57 +0100
Subject: Revert "fixed: CID 719030 Copy into fixed size buffer"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
´This reverts commit a72861ac87530d2b1ad94828200c4c5716429fa7. (sizeof misuse)
---
xbmc/filesystem/iso9660.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/xbmc/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp
index cb0816e282..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;
--
cgit v1.2.3