Merge pull request #100 from guzba/ryan

0.10.18

Author: guzba

.gitignore

@@ -14,3 +14,4 @@ tmp/
 dump.txt
 test_tmp/
 *.dSYM/
+emscripten/

src/zippy/gzip.nim

@@ -65,13 +65,24 @@ proc uncompressGzip*(
     checksum = read32(src, len - 8)
     isize = read32(src, len - 4)
 
+  when sizeof(int) == 4:
+    if isize > int.high.uint32:
+      raise newException(ZippyError, "Uncompressed size exceeds max string len")
+
   if trustSize:
-    dst.setLen(isize + 16) # Leave some room to write past the end
+    when sizeof(int) == 4:
+      dst.setLen(isize)
+    else:
+      dst.setLen(isize + 16) # Leave some room to write past the end
 
   inflate(dst, src, len, pos)
 
   if checksum != crc32(dst):
     raise newException(ZippyError, "Checksum verification failed")
 
-  if isize != (dst.len mod (1 shl 32)).uint32:
-    raise newException(ZippyError, "Size verification failed")
+  when sizeof(int) == 4:
+    if isize != dst.len.uint32:
+      raise newException(ZippyError, "Size verification failed")
+  else:
+    if isize != (dst.len mod (1 shl 32)).uint32:
+      raise newException(ZippyError, "Size verification failed")

tests/config.nims

@@ -1 +1,27 @@
 --path:"../src"
+
+when defined(emscripten):
+  --nimcache:tmp
+  --os:linux
+  --cpu:wasm32
+  --cc:clang
+  when defined(windows):
+    --clang.exe:emcc.bat
+    --clang.linkerexe:emcc.bat
+    --clang.cpp.exe:emcc.bat
+    --clang.cpp.linkerexe:emcc.bat
+  else:
+    --clang.exe:emcc
+    --clang.linkerexe:emcc
+    --clang.cpp.exe:emcc
+    --clang.cpp.linkerexe:emcc
+  --listCmd
+  --gc:arc
+  --exceptions:goto
+  --define:noSignalHandler
+  --debugger:native
+  --define:release
+
+  mkdir("emscripten")
+
+  switch("passL", "-o emscripten/zippy.html --preload-file tests/data")

zippy.nimble

@@ -1,4 +1,4 @@
-version       = "0.10.17"
+version       = "0.10.18"
 author        = "Ryan Oldenburg"
 description   = "Pure Nim implementation of deflate, zlib, gzip and zip."
 license       = "MIT"