extlz4 0.2.4.2 → 0.3.2

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,26 @@
+#!/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.
+if [ "x${TRAVIS_PULL_REQUEST}" = "xfalse" ]
+then
+    sed -i "s@https://github.com/lz4/lz4.git@-b ${TRAVIS_BRANCH} https://github.com/lz4/lz4.git@" /tmp/ossfuzz/projects/lz4/Dockerfile
+else
+    sed -i "s@https://github.com/lz4/lz4.git@-b ${TRAVIS_PULL_REQUEST_BRANCH} https://github.com/${TRAVIS_PULL_REQUEST_SLUG}.git@" /tmp/ossfuzz/projects/lz4/Dockerfile
+fi
+
+# 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);
 }
@@ -504,7 +504,7 @@ blkenc_update(int argc, VALUE argv[], VALUE enc)
     int s = p->traits->update(p->context, srcp, RSTRING_PTR(dest), srcsize, maxsize, p->level);
     if (s <= 0) {
         rb_raise(extlz4_eError,
-                "destsize too small (given destsize is %zu)",
+                "destsize too small (given destsize is %"PRIuSIZE")",
                 rb_str_capacity(dest));
     }
     p->prefixsize = p->traits->savedict(p->context, p->prefix, sizeof(p->prefix));
@@ -684,7 +684,7 @@ blkenc_s_encode(int argc, VALUE argv[], VALUE lz4)
     size_t srcsize = RSTRING_LEN(src);
     if (srcsize > LZ4_MAX_INPUT_SIZE) {
         rb_raise(extlz4_eError,
-                 "source size is too big for lz4 encode (given %zu, but max %zu bytes)",
+                 "source size is too big for lz4 encode (given %"PRIuSIZE", but max %"PRIuSIZE" bytes)",
                  srcsize, (size_t)LZ4_MAX_INPUT_SIZE);
     }
     aux_str_reserve(dest, maxsize);

data/ext/extlz4.c

@@ -40,6 +40,8 @@ VALUE extlz4_mLZ4;
 RBEXT_API void
 Init_extlz4(void)
 {
+    RB_EXT_RACTOR_SAFE(true);
+
     extlz4_mLZ4 = rb_define_module("LZ4");
 
     /*

data/ext/extlz4.h

@@ -6,6 +6,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <stdbool.h>
 
 #ifndef RB_OBJ_FROZEN
 #   define RB_OBJ_FROZEN    OBJ_FROZEN
@@ -17,6 +18,10 @@ extern VALUE extlz4_eError;    /* class LZ4::Error < ::RuntimeError */
 extern void extlz4_init_blockapi(void);
 extern void extlz4_init_frameapi(void);
 
+#ifndef RB_EXT_RACTOR_SAFE
+# define RB_EXT_RACTOR_SAFE(FEATURE) ((void)(FEATURE))
+#endif
+
 #define AUX_FUNCALL(RECV, METHOD, ...)                          \
     ({                                                          \
         VALUE args__[] = { __VA_ARGS__ };                       \

data/ext/frameapi.c

@@ -503,7 +503,7 @@ fdec_read_args(int argc, VALUE argv[], size_t *size, VALUE *buf)
         *size = NUM2SIZET(argv[0]);
         *buf = argv[1];
         rb_check_type(*buf, RUBY_T_STRING);
-        rb_str_modify(*buf);
+        aux_str_reserve(*buf, *size);
         rb_str_set_len(*buf, 0);
         break;
     default:

data/ext/hashargs.c

@@ -6,7 +6,7 @@
  * To the extent possible under law, dearblue has waived all copyright
  * and related or neighboring rights to this work.
  *
- *     dearblue <dearblue@users.noreply.github.com>
+ *     dearblue <dearblue@users.osdn.me>
  */
 
 #include "hashargs.h"
@@ -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/ext/hashargs.h

@@ -6,7 +6,7 @@
  * To the extent possible under law, dearblue has waived all copyright
  * and related or neighboring rights to this work.
  *
- *     dearblue <dearblue@users.noreply.github.com>
+ *     dearblue <dearblue@users.osdn.me>
  */
 
 #ifndef RBX_HASHARGS_H

data/ext/lz4_amalgam.c

@@ -3,29 +3,6 @@
 #endif
 
 #include "../contrib/lz4/lib/lz4.c"
-
-#define LZ4_isLittleEndian      amalg_LZ4_isLittleEndian
-#define LZ4_read16              amalg_LZ4_read16
-#define LZ4_read32              amalg_LZ4_read32
-#define LZ4_read_ARCH           amalg_LZ4_read_ARCH
-#define LZ4_write16             amalg_LZ4_write16
-#define LZ4_write32             amalg_LZ4_write32
-#define LZ4_readLE16            amalg_LZ4_readLE16
-#define LZ4_writeLE16           amalg_LZ4_writeLE16
-#define LZ4_copy8               amalg_LZ4_copy8
-#define LZ4_wildCopy            amalg_LZ4_wildCopy
-#define LZ4_minLength           amalg_LZ4_minLength
-#define LZ4_NbCommonBytes       amalg_LZ4_NbCommonBytes
-#define LZ4_count               amalg_LZ4_count
-#define limitedOutput           amalg_limitedOutput
-#define limitedOutput_directive amalg_limitedOutput_directive
-#define unalign                 amalg_unalign
 #include "../contrib/lz4/lib/lz4hc.c"
-
-#undef ALLOCATOR
-#undef KB
-#undef MB
-#undef GB
 #include "../contrib/lz4/lib/lz4frame.c"
-
 #include "../contrib/lz4/lib/xxhash.c"

data/gemstub.rb

@@ -1,19 +1,7 @@
-unless File.read("README.md", 4096) =~ /^\s*\*\s*version:{1,2}\s*(.+)/i
+unless ver = File.read("README.md").scan(/^\s*[\*\-]\s*version:{1,2}\s*(.+)/i).flatten[-1]
   raise "バージョン情報が README.md に見つかりません"
 end
 
-ver = $1
-verfile = "lib/extlz4/version.rb"
-LIB << verfile
-
-file verfile => "README.md" do |*args|
-  File.binwrite args[0].name, <<-VERSION_FILE
-module LZ4
-  VERSION = "#{ver}"
-end
-  VERSION_FILE
-end
-
 
 unmatch = %r(\bcontrib/lz4/(?:Makefile|appveyor\.yml|contrib|doc|examples|lib/Makefile|lib/dll|programs|tests|visual)(?:$|/))
 
@@ -29,12 +17,13 @@ GEMSTUB = Gem::Specification.new do |s|
   s.version = ver
   s.summary = "ruby bindings for LZ4"
   s.description = <<EOS
-ruby bindings for LZ4 <https://github.com/lz4/lz4>.
+unofficial ruby bindings for LZ4 <https://github.com/lz4/lz4>.
 EOS
   s.homepage = "https://github.com/dearblue/ruby-extlz4"
   s.license = "BSD-2-Clause"
   s.author = "dearblue"
-  s.email = "dearblue@users.noreply.github.com"
+  s.email = "dearblue@users.osdn.me"
 
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "~> 0"
+  s.add_development_dependency "test-unit", "~> 3.3"
 end

data/lib/extlz4.rb

@@ -4,9 +4,11 @@ require "stringio"
 
 ver = RUBY_VERSION[/\d+\.\d+/]
 soname = File.basename(__FILE__, ".rb") << ".so"
-require_relative File.join(ver, soname)
-
-require_relative "extlz4/version"
+begin
+  require_relative File.join(ver, soname)
+rescue LoadError
+  require File.join(ver, soname)
+end
 
 #
 # LZ4 data and streaming data processor.
@@ -322,6 +324,52 @@ module LZ4
     alias block_stream_decompress block_stream_decode
     alias block_stream_uncompress block_stream_decode
   end
+
+  refine String do
+    #
+    # call-seq:
+    #   to_lz4frame(level = 1, opts = {}) -> lz4 frame'd data
+    #
+    def to_lz4frame(*args)
+      LZ4.encode self, *args
+    end
+
+    #
+    # call-seq:
+    #   unlz4frame -> decoded data
+    #
+    def unlz4frame(*args, &block)
+      LZ4.decode self, *args, &block
+    end
+
+    def to_lz4block(*args)
+      LZ4.block_encode(self, *args)
+    end
+
+    def unlz4block(*args)
+      LZ4.block_decode(self, *args)
+    end
+  end
+
+  refine Object do
+    #
+    # call-seq:
+    #   to_lz4frame(level = 1, opts = {}) -> stream encoder
+    #   to_lz4frame(level = 1, opts = {}) { |stream_encoder| ... } -> yield_status
+    #
+    def to_lz4frame(*args, &block)
+      LZ4.encode self, *args, &block
+    end
+
+    #
+    # call-seq:
+    #    -> decoder
+    #    { |decoder| ... } -> yield_status
+    #
+    def unlz4frame(*args, &block)
+      LZ4.decode self, *args, &block
+    end
+  end
 end
 
 require_relative "extlz4/compat"

data/lib/extlz4/oldstream.rb

@@ -5,7 +5,7 @@
 # To the extent possible under law, dearblue has waived all copyright
 # and related or neighboring rights to this work.
 #
-#     dearblue <dearblue@users.noreply.github.com>
+#     dearblue <dearblue@users.osdn.me>
 #
 
 require_relative "../extlz4"

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,33 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: extlz4
 version: !ruby/object:Gem::Version
-  version: 0.2.4.2
+  version: 0.3.2
 platform: ruby
 authors:
 - dearblue
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: 'ruby bindings for LZ4 <https://github.com/lz4/lz4>.
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+description: 'unofficial ruby bindings for LZ4 <https://github.com/lz4/lz4>.
 
-'
-email: dearblue@users.noreply.github.com
+  '
+email: dearblue@users.osdn.me
 executables:
 - extlz4
 extensions:
@@ -38,6 +52,7 @@ extra_rdoc_files:
 - README.md
 - contrib/lz4/LICENSE
 - contrib/lz4/README.md
+- contrib/lz4/build/README.md
 - contrib/lz4/lib/LICENSE
 - contrib/lz4/lib/README.md
 - ext/blockapi.c
@@ -51,7 +66,6 @@ extra_rdoc_files:
 - lib/extlz4/compat.rb
 - lib/extlz4/fix-0.1bug.rb
 - lib/extlz4/oldstream.rb
-- lib/extlz4/version.rb
 files:
 - HISTORY.ja.md
 - LICENSE
@@ -60,11 +74,36 @@ files:
 - bin/extlz4
 - contrib/lz4/INSTALL
 - contrib/lz4/LICENSE
+- contrib/lz4/Makefile.inc
 - contrib/lz4/NEWS
 - contrib/lz4/README.md
-- contrib/lz4/circle.yml
+- contrib/lz4/build/README.md
+- contrib/lz4/build/VS2010/datagen/datagen.vcxproj
+- contrib/lz4/build/VS2010/frametest/frametest.vcxproj
+- contrib/lz4/build/VS2010/fullbench-dll/fullbench-dll.vcxproj
+- contrib/lz4/build/VS2010/fullbench/fullbench.vcxproj
+- contrib/lz4/build/VS2010/fuzzer/fuzzer.vcxproj
+- contrib/lz4/build/VS2010/liblz4-dll/liblz4-dll.rc
+- contrib/lz4/build/VS2010/liblz4-dll/liblz4-dll.vcxproj
+- contrib/lz4/build/VS2010/liblz4/liblz4.vcxproj
+- contrib/lz4/build/VS2010/lz4.sln
+- contrib/lz4/build/VS2010/lz4/lz4.rc
+- contrib/lz4/build/VS2010/lz4/lz4.vcxproj
+- contrib/lz4/build/VS2017/datagen/datagen.vcxproj
+- contrib/lz4/build/VS2017/frametest/frametest.vcxproj
+- contrib/lz4/build/VS2017/fullbench-dll/fullbench-dll.vcxproj
+- contrib/lz4/build/VS2017/fullbench/fullbench.vcxproj
+- contrib/lz4/build/VS2017/fuzzer/fuzzer.vcxproj
+- contrib/lz4/build/VS2017/liblz4-dll/liblz4-dll.rc
+- contrib/lz4/build/VS2017/liblz4-dll/liblz4-dll.vcxproj
+- contrib/lz4/build/VS2017/liblz4/liblz4.vcxproj
+- contrib/lz4/build/VS2017/lz4.sln
+- contrib/lz4/build/VS2017/lz4/lz4.rc
+- contrib/lz4/build/VS2017/lz4/lz4.vcxproj
+- contrib/lz4/build/cmake/CMakeLists.txt
 - 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
@@ -73,9 +112,29 @@ files:
 - contrib/lz4/lib/lz4frame_static.h
 - contrib/lz4/lib/lz4hc.c
 - contrib/lz4/lib/lz4hc.h
-- contrib/lz4/lib/lz4opt.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_data_producer.c
+- contrib/lz4/ossfuzz/fuzz_data_producer.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
+- contrib/lz4/tmp
+- contrib/lz4/tmpsparse
 - examples/frameapi.rb
 - ext/blockapi.c
 - ext/depend
@@ -91,7 +150,6 @@ files:
 - lib/extlz4/compat.rb
 - lib/extlz4/fix-0.1bug.rb
 - lib/extlz4/oldstream.rb
-- lib/extlz4/version.rb
 - test/common.rb
 - test/test_blockapi.rb
 - test/test_frameapi.rb
@@ -99,7 +157,7 @@ homepage: https://github.com/dearblue/ruby-extlz4
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset"
 - UTF-8
@@ -118,9 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.14
+signing_key:
 specification_version: 4
 summary: ruby bindings for LZ4
 test_files: []