rj_schema 1.0.0 → 1.0.4

data/ext/rj_schema/rapidjson/test/unittest/valuetest.cpp

@@ -1078,9 +1078,9 @@ static void TestArray(T& x, Allocator& allocator) {
 }
 
 TEST(Value, Array) {
+    Value::AllocatorType allocator;
     Value x(kArrayType);
     const Value& y = x;
-    Value::AllocatorType allocator;
 
     EXPECT_EQ(kArrayType, x.GetType());
     EXPECT_TRUE(x.IsArray());
@@ -1119,6 +1119,16 @@ TEST(Value, Array) {
     z.SetArray();
     EXPECT_TRUE(z.IsArray());
     EXPECT_TRUE(z.Empty());
+
+    // PR #1503: assign from inner Value
+    {
+        CrtAllocator a; // Free() is not a noop
+        GenericValue<UTF8<>, CrtAllocator> nullValue;
+        GenericValue<UTF8<>, CrtAllocator> arrayValue(kArrayType);
+        arrayValue.PushBack(nullValue, a);
+        arrayValue = arrayValue[0]; // shouldn't crash (use after free)
+        EXPECT_TRUE(arrayValue.IsNull());
+    }
 }
 
 TEST(Value, ArrayHelper) {
@@ -1481,9 +1491,9 @@ static void TestObject(T& x, Allocator& allocator) {
 }
 
 TEST(Value, Object) {
+    Value::AllocatorType allocator;
     Value x(kObjectType);
     const Value& y = x; // const version
-    Value::AllocatorType allocator;
 
     EXPECT_EQ(kObjectType, x.GetType());
     EXPECT_TRUE(x.IsObject());

data/ext/rj_schema/rj_schema.cpp

@@ -10,16 +10,6 @@
 
 #include <unordered_map>
 #include <sstream>
-#include <ruby.h>
-#include <ruby/version.h>
-
-#if (RUBY_API_VERSION_MAJOR > 2 || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 7)) && defined(__GLIBC__)
-namespace std {
-	static inline void* ruby_nonempty_memcpy(void *dest, const void *src, size_t n) {
-		return ::ruby_nonempty_memcpy(dest, src, n);
-	}
-};
-#endif
 
 #define RAPIDJSON_SCHEMA_USE_INTERNALREGEX 0
 #define RAPIDJSON_SCHEMA_USE_STDREGEX 1
@@ -30,6 +20,9 @@ namespace std {
 #include <rapidjson/error/error.h>
 #include <rapidjson/error/en.h>
 
+#include <ruby.h>
+#include <ruby/version.h>
+
 typedef rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator> ErrorType;
 typedef std::unordered_map<std::string, VALUE> SchemaInput;
 typedef std::unordered_map<ID, rapidjson::SchemaDocument> SchemaCollection;

data/lib/rj_schema.rb

@@ -1,7 +1,7 @@
 require 'json'
 
 class RjSchema
-  VERSION = '1.0.0'
+  VERSION = '1.0.4'
 end
 
 require 'rj_schema/rj_schema'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rj_schema
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Christian Semmler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -231,6 +231,7 @@ files:
 - ext/rj_schema/rapidjson/bin/jsonschema/tests/draft4/type.json
 - ext/rj_schema/rapidjson/bin/jsonschema/tests/draft4/uniqueItems.json
 - ext/rj_schema/rapidjson/bin/jsonschema/tox.ini
+- ext/rj_schema/rapidjson/bin/types/alotofkeys.json
 - ext/rj_schema/rapidjson/bin/types/booleans.json
 - ext/rj_schema/rapidjson/bin/types/floats.json
 - ext/rj_schema/rapidjson/bin/types/guids.json
@@ -242,6 +243,7 @@ files:
 - ext/rj_schema/rapidjson/bin/unittestschema/address.json
 - ext/rj_schema/rapidjson/bin/unittestschema/allOf_address.json
 - ext/rj_schema/rapidjson/bin/unittestschema/anyOf_address.json
+- ext/rj_schema/rapidjson/bin/unittestschema/idandref.json
 - ext/rj_schema/rapidjson/bin/unittestschema/oneOf_address.json
 - ext/rj_schema/rapidjson/contrib/natvis/LICENSE
 - ext/rj_schema/rapidjson/contrib/natvis/README.md
@@ -321,6 +323,7 @@ files:
 - ext/rj_schema/rapidjson/example/simplereader/simplereader.cpp
 - ext/rj_schema/rapidjson/example/simplewriter/simplewriter.cpp
 - ext/rj_schema/rapidjson/example/sortkeys/sortkeys.cpp
+- ext/rj_schema/rapidjson/example/traverseaspointer.cpp
 - ext/rj_schema/rapidjson/example/tutorial/tutorial.cpp
 - ext/rj_schema/rapidjson/include/rapidjson/allocators.h
 - ext/rj_schema/rapidjson/include/rapidjson/cursorstreamwrapper.h
@@ -358,6 +361,7 @@ files:
 - ext/rj_schema/rapidjson/include/rapidjson/schema.h
 - ext/rj_schema/rapidjson/include/rapidjson/stream.h
 - ext/rj_schema/rapidjson/include/rapidjson/stringbuffer.h
+- ext/rj_schema/rapidjson/include/rapidjson/uri.h
 - ext/rj_schema/rapidjson/include/rapidjson/writer.h
 - ext/rj_schema/rapidjson/include_dirs.js
 - ext/rj_schema/rapidjson/library.json
@@ -390,6 +394,7 @@ files:
 - ext/rj_schema/rapidjson/test/unittest/jsoncheckertest.cpp
 - ext/rj_schema/rapidjson/test/unittest/namespacetest.cpp
 - ext/rj_schema/rapidjson/test/unittest/ostreamwrappertest.cpp
+- ext/rj_schema/rapidjson/test/unittest/platformtest.cpp
 - ext/rj_schema/rapidjson/test/unittest/pointertest.cpp
 - ext/rj_schema/rapidjson/test/unittest/prettywritertest.cpp
 - ext/rj_schema/rapidjson/test/unittest/readertest.cpp
@@ -401,6 +406,7 @@ files:
 - ext/rj_schema/rapidjson/test/unittest/strtodtest.cpp
 - ext/rj_schema/rapidjson/test/unittest/unittest.cpp
 - ext/rj_schema/rapidjson/test/unittest/unittest.h
+- ext/rj_schema/rapidjson/test/unittest/uritest.cpp
 - ext/rj_schema/rapidjson/test/unittest/valuetest.cpp
 - ext/rj_schema/rapidjson/test/unittest/writertest.cpp
 - ext/rj_schema/rapidjson/test/valgrind.supp
@@ -742,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: JSON schema validation with RapidJSON