Fixed issue #13: bin2cpp crashes when encoding a generated file with size=1000 fill=random seed=1

Author: end2endzone

msvc/bin2cpp_unittest.vcxproj

@@ -107,6 +107,7 @@
     <ClCompile Include="..\test\main.cpp" />
     <ClCompile Include="..\test\TestExtraction.cpp" />
     <ClCompile Include="generated_files\testHtml100000\_testHtml100000.cpp" />
+    <ClCompile Include="generated_files\testIssue13\_testIssue13.cpp" />
     <ClCompile Include="generated_files\testRandom1\_testRandom1.cpp" />
     <ClCompile Include="generated_files\testRandom2\_testRandom2.cpp" />
     <ClCompile Include="generated_files\testRandom3\_testRandom3.cpp" />
@@ -133,6 +134,7 @@
     <ClInclude Include="..\test\gtesthelper.h" />
     <ClInclude Include="..\test\TestExtraction.h" />
     <ClInclude Include="generated_files\testHtml100000\_testHtml100000.h" />
+    <ClInclude Include="generated_files\testIssue13\_testIssue13.h" />
     <ClInclude Include="generated_files\testRandom1\_testRandom1.h" />
     <ClInclude Include="generated_files\testRandom2\_testRandom2.h" />
     <ClInclude Include="generated_files\testRandom3\_testRandom3.h" />

msvc/bin2cpp_unittest.vcxproj.filters

@@ -57,6 +57,9 @@
     <ClCompile Include="generated_files\testRandom3\_testRandom3.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
+    <ClCompile Include="generated_files\testIssue13\_testIssue13.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="bin2cppTest.x86.debug.xml">
@@ -98,6 +101,9 @@
     <ClInclude Include="generated_files\testRandom3\_testRandom3.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
+    <ClInclude Include="generated_files\testIssue13\_testIssue13.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="generate_test_files.bat" />

msvc/generate_test_files.bat

@@ -60,4 +60,12 @@ REM   mkdir %OUTDIR% 1>NUL 2>NUL
 REM   testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=31457280 --fill=sequential
 REM   bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 450 -override
 
+set TEST_NAME=testIssue13
+set OUTDIR=.\generated_files\%TEST_NAME%
+mkdir %OUTDIR% 1>NUL 2>NUL
+echo testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=1
+testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=1
+echo bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 100 -override
+bin2cpp.exe %OUTDIR%\%TEST_NAME%.bin %OUTDIR% _%TEST_NAME%.h %TEST_NAME% 100 -override
+
 dir >NUL

src/bin2cpp.cpp

@@ -448,14 +448,17 @@ namespace bin2cpp
       //read a chunk of the file
       size_t readSize = fread(buffer, 1, iChunkSize, input);
 
-      //send to MD5 for analysist
-      MD5Update(&context, buffer, readSize);
-
       bool isLastChunk = !(readSize == iChunkSize);
 
-      if (isLastChunk)
+      if (isLastChunk || readSize == 0)
         fprintf(cpp, "      oLength = %d;\n", lastSegmentSize);
 
+      if (readSize == 0)
+        continue; //nothing to output if nothing was read
+
+      //send to MD5 for analysist
+      MD5Update(&context, buffer, readSize);
+
       //output mode 1
       fprintf(cpp, "      buffer = \"%s\"; if (iIndex == index) return buffer; index++;\n", toCppString(buffer, readSize).c_str(), readSize);
 

test/TestExtraction.cpp

@@ -9,6 +9,7 @@
 #include "generated_files\testText10\_testText10.h"
 #include "generated_files\testText1000\_testText1000.h"
 #include "generated_files\testText100000\_testText100000.h"
+#include "generated_files\testIssue13\_testIssue13.h"
 
 gTestHelper & hlp = gTestHelper::getInstance();
 
@@ -161,3 +162,18 @@ TEST_F(TestExtraction, testSequential10MB)
   bool equal = hlp.isFileEquals(expectedFilePath.c_str(), outputFilePath.c_str(), reason);
   ASSERT_TRUE(equal) << reason.c_str();
 }
+
+TEST_F(TestExtraction, testIssue13)
+{
+  static const std::string expectedFilePath = getExpectedFilePath();
+  static const std::string outputFilePath   = getActualFilePath();
+
+  const bin2cpp::File & file = bin2cpp::getTestIssue13File();
+  bool extractSuccess = file.save(outputFilePath.c_str());
+  ASSERT_TRUE(extractSuccess);
+
+  //assert content is the same
+  std::string reason;
+  bool equal = hlp.isFileEquals(expectedFilePath.c_str(), outputFilePath.c_str(), reason);
+  ASSERT_TRUE(equal) << reason.c_str();
+}