extlz4 0.3 → 0.3.1

data/contrib/lz4/ossfuzz/standaloneengine.c

@@ -0,0 +1,74 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "fuzz.h"
+
+/**
+ * Main procedure for standalone fuzzing engine.
+ *
+ * Reads filenames from the argument array. For each filename, read the file
+ * into memory and then call the fuzzing interface with the data.
+ */
+int main(int argc, char **argv)
+{
+  int ii;
+  for(ii = 1; ii < argc; ii++)
+  {
+    FILE *infile;
+    printf("[%s] ", argv[ii]);
+
+    /* Try and open the file. */
+    infile = fopen(argv[ii], "rb");
+    if(infile)
+    {
+      uint8_t *buffer = NULL;
+      size_t buffer_len;
+
+      printf("Opened.. ");
+
+      /* Get the length of the file. */
+      fseek(infile, 0L, SEEK_END);
+      buffer_len = ftell(infile);
+
+      /* Reset the file indicator to the beginning of the file. */
+      fseek(infile, 0L, SEEK_SET);
+
+      /* Allocate a buffer for the file contents. */
+      buffer = (uint8_t *)calloc(buffer_len, sizeof(uint8_t));
+      if(buffer)
+      {
+        /* Read all the text from the file into the buffer. */
+        fread(buffer, sizeof(uint8_t), buffer_len, infile);
+        printf("Read %zu bytes, fuzzing.. ", buffer_len);
+
+        /* Call the fuzzer with the data. */
+        LLVMFuzzerTestOneInput(buffer, buffer_len);
+
+        printf("complete !!");
+
+        /* Free the buffer as it's no longer needed. */
+        free(buffer);
+        buffer = NULL;
+      }
+      else
+      {
+        fprintf(stderr,
+                "[%s] Failed to allocate %zu bytes \n",
+                argv[ii],
+                buffer_len);
+      }
+
+      /* Close the file as it's no longer needed. */
+      fclose(infile);
+      infile = NULL;
+    }
+    else
+    {
+      /* Failed to open the file. Maybe wrong name or wrong permissions? */
+      fprintf(stderr, "[%s] Open failed. \n", argv[ii]);
+    }
+
+    printf("\n");
+  }
+}

data/contrib/lz4/ossfuzz/travisoss.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -ex
+
+# Clone the oss-fuzz repository
+git clone https://github.com/google/oss-fuzz.git /tmp/ossfuzz
+
+if [[ ! -d /tmp/ossfuzz/projects/lz4 ]]
+then
+    echo "Could not find the lz4 project in ossfuzz"
+    exit 1
+fi
+
+# Modify the oss-fuzz Dockerfile so that we're checking out the current branch on travis.
+sed -i "s@https://github.com/lz4/lz4.git@-b $TRAVIS_BRANCH https://github.com/lz4/lz4.git@" /tmp/ossfuzz/projects/lz4/Dockerfile
+
+# Try and build the fuzzers
+pushd /tmp/ossfuzz
+python infra/helper.py build_image --pull lz4
+python infra/helper.py build_fuzzers lz4
+popd

data/ext/blockapi.c

@@ -32,7 +32,7 @@ aux_LZ4_compress_fast_continue_nogvl(va_list *vp)
 static int
 aux_LZ4_compress_fast_continue(void *context, const char *src, char *dest, int srcsize, int destsize, int acceleration)
 {
-    return (int)aux_thread_call_without_gvl(
+    return (int)(intptr_t)aux_thread_call_without_gvl(
             aux_LZ4_compress_fast_continue_nogvl, NULL,
             context, src, dest, srcsize, destsize, acceleration);
 }
@@ -54,7 +54,7 @@ static int
 aux_LZ4_compressHC_continue(void *context, const char *src, char *dest, int srcsize, int destsize, int acceleration__ignored__)
 {
     (void)acceleration__ignored__;
-    return (int)aux_thread_call_without_gvl(
+    return (int)(intptr_t)aux_thread_call_without_gvl(
             aux_LZ4_compressHC_continue_nogvl, NULL,
             context, src, dest, srcsize, destsize);
 }
@@ -76,7 +76,7 @@ aux_LZ4_decompress_safe_continue_nogvl(va_list *vp)
 static int
 aux_LZ4_decompress_safe_continue(LZ4_streamDecode_t *context, const char *src, char *dest, int srcsize, int maxsize)
 {
-    return (int)aux_thread_call_without_gvl(
+    return (int)(intptr_t)aux_thread_call_without_gvl(
             aux_LZ4_decompress_safe_continue_nogvl, NULL,
             context, src, dest, srcsize, maxsize);
 }

data/ext/hashargs.c

@@ -142,7 +142,7 @@ rbx_scanhash(VALUE hash, VALUE rest, struct rbx_scanhash_arg *args, struct rbx_s
     hash = rbx_scanhash_to_hash(hash);
     if (!NIL_P(hash) && !RHASH_EMPTY_P(hash)) {
         struct rbx_scanhash_args argset = { args, end, rest };
-        rb_hash_foreach(hash, rbx_scanhash_foreach, (VALUE)&argset);
+        rb_hash_foreach(hash, (int (*)(VALUE, VALUE, VALUE))rbx_scanhash_foreach, (VALUE)&argset);
     }
 
     rbx_scanhash_check_missingkeys(args, end);

data/lib/extlz4.rb

@@ -4,7 +4,11 @@ require "stringio"
 
 ver = RUBY_VERSION[/\d+\.\d+/]
 soname = File.basename(__FILE__, ".rb") << ".so"
-require_relative File.join(ver, soname)
+begin
+  require_relative File.join(ver, soname)
+rescue LoadError
+  require File.join(ver, soname)
+end
 
 require_relative "extlz4/version"
 

data/lib/extlz4/version.rb

@@ -1,3 +1,3 @@
 module LZ4
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 end

data/test/common.rb

@@ -14,5 +14,5 @@ SAMPLES = {
   "random (big size)"   => OpenSSL::Random.random_bytes(BIGSIZE),
 }
 
-SAMPLES["freebsd ports index"] = File.read("/usr/ports/INDEX-10", mode: "rb") rescue nil # if on FreeBSD
-SAMPLES["freebsd kernel"] = File.read("/boot/kernel/kernel", mode: "rb") rescue nil # if on FreeBSD
+(SAMPLES["freebsd ports index"] = File.read("/usr/ports/INDEX-12", mode: "rb")) rescue nil # if on FreeBSD
+(SAMPLES["freebsd kernel"] = File.read("/boot/kernel/kernel", mode: "rb")) rescue nil # if on FreeBSD

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extlz4
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - dearblue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,10 +86,12 @@ files:
 - bin/extlz4
 - contrib/lz4/INSTALL
 - contrib/lz4/LICENSE
+- contrib/lz4/Makefile.inc
 - contrib/lz4/NEWS
 - contrib/lz4/README.md
 - contrib/lz4/lib/LICENSE
 - contrib/lz4/lib/README.md
+- contrib/lz4/lib/liblz4-dll.rc.in
 - contrib/lz4/lib/liblz4.pc.in
 - contrib/lz4/lib/lz4.c
 - contrib/lz4/lib/lz4.h
@@ -100,6 +102,23 @@ files:
 - contrib/lz4/lib/lz4hc.h
 - contrib/lz4/lib/xxhash.c
 - contrib/lz4/lib/xxhash.h
+- contrib/lz4/ossfuzz/Makefile
+- contrib/lz4/ossfuzz/compress_frame_fuzzer.c
+- contrib/lz4/ossfuzz/compress_fuzzer.c
+- contrib/lz4/ossfuzz/compress_hc_fuzzer.c
+- contrib/lz4/ossfuzz/decompress_frame_fuzzer.c
+- contrib/lz4/ossfuzz/decompress_fuzzer.c
+- contrib/lz4/ossfuzz/fuzz.h
+- contrib/lz4/ossfuzz/fuzz_helpers.h
+- contrib/lz4/ossfuzz/lz4_helpers.c
+- contrib/lz4/ossfuzz/lz4_helpers.h
+- contrib/lz4/ossfuzz/ossfuzz.sh
+- contrib/lz4/ossfuzz/round_trip_frame_fuzzer.c
+- contrib/lz4/ossfuzz/round_trip_fuzzer.c
+- contrib/lz4/ossfuzz/round_trip_hc_fuzzer.c
+- contrib/lz4/ossfuzz/round_trip_stream_fuzzer.c
+- contrib/lz4/ossfuzz/standaloneengine.c
+- contrib/lz4/ossfuzz/travisoss.sh
 - examples/frameapi.rb
 - ext/blockapi.c
 - ext/depend
@@ -142,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ruby bindings for LZ4