- Fixed a typo in class WAV causing the IOOpReport buffer to not be

passed by refference for 'fileIsValidWAV', which led to undefined behavior when the function was called. In turn this prevented converting WAV to SMF - Incremented version number for next release
oblivioncth · Oct 1, 2019 · 0a72e53 · 0a72e53
1 parent 62e3d77
commit 0a72e53
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/CoH_BSC_Editor.pro b/CoH_BSC_Editor.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
+QT += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 

diff --git a/src/version.h b/src/version.h
@@ -1,11 +1,11 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VER_FILEVERSION             0,1,2,0
-#define VER_FILEVERSION_STR         "0.1.2.0"
+#define VER_FILEVERSION             0,1,3,0
+#define VER_FILEVERSION_STR         "0.1.3.0"
 
-#define VER_PRODUCTVERSION          0,1,2,0
-#define VER_PRODUCTVERSION_STR      "0.1.2.0"
+#define VER_PRODUCTVERSION          0,1,3,0
+#define VER_PRODUCTVERSION_STR      "0.1.3.0"
 
 #define VER_COMPANYNAME_STR         "Obby Apps"
 #define VER_FILEDESCRIPTION_STR     "BSCWorks (CoH:v14)"

diff --git a/src/wav.cpp b/src/wav.cpp
@@ -13,18 +13,16 @@ WAV::WAV(QByteArray rawData)
 
 //-Class Functions------------------------------------------------------------------------------------------------
 //Public:
-bool WAV::fileIsValidWAV(QFile &possibleWAV, Qx::IO::IOOpReport reportBuffer)
+bool WAV::fileIsValidWAV(QFile &possibleWAV, Qx::IO::IOOpReport& reportBuffer)
 {
+    // Get header region
     QByteArray headers;
-    reportBuffer = Qx::IO::readBytesFromFile(headers, possibleWAV, 0x00, 0x1B);
+    reportBuffer = Qx::IO::readBytesFromFile(headers, possibleWAV, 0x00, 0x0F);
 
     if(!reportBuffer.wasSuccessful())
         return false;
     else
     {
-        // Get header region
-        QByteArray headers;
-        reportBuffer = Qx::IO::readBytesFromFile(headers, possibleWAV, 0x00, 0x0F);
         long long fullFileSize = QFileInfo(possibleWAV).size();
 
         QByteArray riffSigRegion = headers.left(L_RIFF_SIG);

diff --git a/src/wav.h b/src/wav.h
@@ -32,7 +32,7 @@ class WAV
 
 //-Class Functions------------------------------------------------------------------------------------------------------
 public:
-    static bool fileIsValidWAV(QFile& possibleWAV, Qx::IO::IOOpReport reportBuffer);
+    static bool fileIsValidWAV(QFile& possibleWAV, Qx::IO::IOOpReport& reportBuffer);
 
 private: