extlz4 0.3.1 → 0.3.2

data/contrib/lz4/ossfuzz/round_trip_hc_fuzzer.c

@@ -9,16 +9,20 @@
 #include <string.h>
 
 #include "fuzz_helpers.h"
+#include "fuzz_data_producer.h"
 #include "lz4.h"
 #include "lz4hc.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 {
-    uint32_t seed = FUZZ_seed(&data, &size);
+    FUZZ_dataProducer_t *producer = FUZZ_dataProducer_create(data, size);
+    int const level = FUZZ_dataProducer_range32(producer,
+        LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX);
+    size = FUZZ_dataProducer_remainingBytes(producer);
+
     size_t const dstCapacity = LZ4_compressBound(size);
     char* const dst = (char*)malloc(dstCapacity);
     char* const rt = (char*)malloc(size);
-    int const level = FUZZ_rand32(&seed, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX);
 
     FUZZ_ASSERT(dst);
     FUZZ_ASSERT(rt);
@@ -34,6 +38,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 
     free(dst);
     free(rt);
+    FUZZ_dataProducer_free(producer);
 
     return 0;
 }

data/contrib/lz4/ossfuzz/travisoss.sh

@@ -12,7 +12,12 @@ then
 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
+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

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/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"

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/gemstub.rb

@@ -2,17 +2,6 @@ unless ver = File.read("README.md").scan(/^\s*[\*\-]\s*version:{1,2}\s*(.+)/i).f
   raise "バージョン情報が README.md に見つかりません"
 end
 
-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)(?:$|/))
 
@@ -33,8 +22,8 @@ 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", "~> 1.12", ">= 1.12.3"
-  s.add_development_dependency "test-unit", "~> 3.2", ">= 3.2.7"
+  s.add_development_dependency "rake", "~> 0"
+  s.add_development_dependency "test-unit", "~> 3.3"
 end

data/lib/extlz4.rb

@@ -10,8 +10,6 @@ rescue LoadError
   require File.join(ver, soname)
 end
 
-require_relative "extlz4/version"
-
 #
 # LZ4 data and streaming data processor.
 #

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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extlz4
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - dearblue
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,44 +16,32 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.7
+        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:
@@ -64,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
@@ -77,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
@@ -89,6 +77,30 @@ files:
 - contrib/lz4/Makefile.inc
 - contrib/lz4/NEWS
 - contrib/lz4/README.md
+- 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
@@ -109,6 +121,8 @@ files:
 - 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
@@ -119,6 +133,8 @@ files:
 - 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
@@ -134,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
@@ -142,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
@@ -161,8 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.14
+signing_key:
 specification_version: 4
 summary: ruby bindings for LZ4
 test_files: []

data/lib/extlz4/version.rb

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