Fix/workaround at least one class of buffer underruns in the GL plugin. Fix some bad deletes (instead of delete []). etc.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@404 8ced0084-cf51-0410-be5f-012b33b47a6e

4 files changed, 7 insertions, 3 deletions

diff --git a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
index 0ca1e93389..5b540b729d 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
@@ -55,7 +55,8 @@ CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem)
 

 CBannerLoaderGC::~CBannerLoaderGC()

 {

-	delete[] m_pBannerFile;

+	delete [] m_pBannerFile;

+	m_pBannerFile = NULL;

 }

 

 

diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
index 357c53639f..4744223d9a 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
@@ -70,7 +70,8 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IFileSystem& _rFileSystem)
 

 CBannerLoaderWii::~CBannerLoaderWii()

 {

-	delete m_pBuffer;

+	delete [] m_pBuffer;

+	m_pBuffer = NULL;

 }

 

 

diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
index 4319cc001a..8d40df18ec 100644
--- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp
+++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
@@ -42,7 +42,7 @@ CARCFile::CARCFile(const u8* _pBuffer, size_t _BufferSize)
 

 CARCFile::~CARCFile()

 {

-	delete m_pBuffer;

+	delete [] m_pBuffer;

 }

 

 

diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
index 51f0f862cb..bbab62c531 100644
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
@@ -36,7 +36,9 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, c
 CVolumeWiiCrypted::~CVolumeWiiCrypted()

 {

 	delete m_pReader; // is this really our responsibility?

+	m_pReader = NULL;

 	delete[] m_pBuffer;

+	m_pBuffer = NULL;

 }