Merge pull request #6 from jangko/fix_invalid_datasize

fix invalid datasize

.appveyor.yml

@@ -1,9 +1,9 @@
 version: '{build}'
 
 cache:
-- x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z -> .appveyor.yml
-- i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -> .appveyor.yml
-- Nim -> .appveyor.yml
+ - x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z -> .appveyor.yml
+ - i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z -> .appveyor.yml
+ - Nim -> .appveyor.yml
 
 matrix:
   # We always want 32 and 64-bit compilation
@@ -17,13 +17,13 @@ install:
   - setlocal EnableExtensions EnableDelayedExpansion
 
   - IF "%PLATFORM%" == "x86" (
-      SET "MINGW_ARCHIVE=i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z" &
-      SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win32/Personal%%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z" &
+      SET "MINGW_ARCHIVE=i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z" &
+      SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win32/Personal%%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z" &
       SET "MINGW_DIR=mingw32"
     ) ELSE (
       IF "%PLATFORM%" == "x64" (
-        SET "MINGW_ARCHIVE=x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z" &
-        SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win64/Personal%%20Builds/mingw-builds/4.9.2/threads-win32/seh/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z" &
+        SET "MINGW_ARCHIVE=x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z" &
+        SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win64/Personal%%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z" &
         SET "MINGW_DIR=mingw64"
       ) else (
         echo "Unknown platform"
@@ -42,7 +42,7 @@ install:
   - SET "NEED_REBUILD="
 
   - IF NOT EXIST "Nim\\.git\\" (
-      git clone https://github.com/nim-lang/Nim.git
+      git clone --depth 1 https://github.com/nim-lang/Nim.git
     ) ELSE (
       ( cd Nim ) &
       ( git pull ) &

nimBMP.nim

@@ -521,7 +521,7 @@ proc decodeBMP*(s: Stream): BMP =
 
     if info.imageSize == 0:
       info.imageSize = DWORD(dataSize)
-      if dataSize + int64(header.offset) != int64(header.fileSize):
+      if dataSize + int64(header.offset) > int64(header.fileSize):
         raise BMPError("invalid dataSize")
 
     if dataSize > int64(info.imageSize):

nimBMP.nimble

@@ -1,5 +1,5 @@
 packageName   = "nimBMP"
-version       = "0.1.7"
+version       = "0.1.8"
 author        = "Andri Lim"
 description   = "BMP encoder and decoder"
 license       = "MIT"
@@ -11,6 +11,12 @@ task tests, "Run tests":
   withDir("tests"):
     exec "nim c -r testCodec.nim"
     exec "nim c -r testSuite.nim"
+    exec "nim c -r test_misc.nim"
 
     exec "nim c -r -d:release testCodec.nim"
     exec "nim c -r -d:release testSuite.nim"
+    exec "nim c -r -d:release test_misc.nim"
+
+    exec "nim c -r -d:release --gc:arc testCodec.nim"
+    exec "nim c -r -d:release --gc:arc testSuite.nim"
+    exec "nim c -r -d:release --gc:arc test_misc.nim"

tests/test_misc.nim

@@ -0,0 +1,19 @@
+import ../nimBMP, os, unittest
+
+const testFolder = "misc"
+
+suite "misc test":
+  test "1bit":
+    var bmp = loadBMP24(testFolder / "1bit.bmp")
+    check bmp.width == 96
+    check bmp.height == 16
+
+  test "4bit":
+    var bmp = loadBMP24(testFolder / "4bit.bmp")
+    check bmp.width == 134
+    check bmp.height == 38
+
+  test "8bit":
+    var bmp = loadBMP24(testFolder / "8bit.bmp")
+    check bmp.width == 216
+    check bmp.height == 143