kanayago 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c6e26071a97395c4f35c029908d78bba8a927f75129aa361367dc9cf549c3ca
-  data.tar.gz: be48eae66a3bc69256ff3a9dba5afa842b8b8876f7be66eb72d79774fb94d878
+  metadata.gz: d25dec3b7633f7b58a2fe0ad33b1e6f05ef7e47bf5898d7b468a9bd60634c462
+  data.tar.gz: becaefd024bdf3b3a196c8971fac45211e69e13e2396d672d383795c98ca9038
 SHA512:
-  metadata.gz: 5073effb4706b23b912a61f79a3bb40d2565e59f4d9805c6ba6f3006c613d8029340d2e164e67f94eb0341cc7b14d340ca5a9f862ee8c4fb84a2b8a86f1622b9
-  data.tar.gz: 5731b6e8463b384cbd3dfe7bd3bf67835ea0a4a8f51ac0ee84259f8fd04d414fd5b2e1ea38e79f6f3dfab83787207c86757dfa5bce0180bfbf6fbac1102665ef
+  metadata.gz: 3f7089b463e7a7a3024f6a249dec5902e8ca399826c996027f513b76e32ccb2f43c650f784c55354b2cb731c1cac00cd7c625a76e1c82b998e428872882ce0cd
+  data.tar.gz: bcaf717b512cff34f3b31e1cf08eaf23789a6c93469b55b0b466dacbd4227a8be372357b7f28926238fb8e1eab014b476f30b1bd32033222ed7f014c7793823f

data/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.1]
+
+### Fixed
+- Fix segmentation fault when parsing dynamic symbols in complex hash structures
+- Fix segmentation fault when parsing nested modules with outer constant references
+- Fix `module_node_new` to use `RNODE_MODULE` instead of incorrect `RNODE_CLASS` macro
+- Add NULL pointer checks in `dynamic_string_node_new`, `dynamic_symbol_node_new`, `dynamic_execute_string_node_new`, and `dynamic_regexp_node_new`
+
+### Changed
+- Remove incorrect `@super` field access from `ModuleNode` (modules do not have superclasses)
+
 ## [0.4.0]
 
 ### Added

data/README.md

@@ -31,7 +31,7 @@ Finally, build `Kanayago` gem  and install it.
 
 ```console
 bundle exec rake build
-gem install pkg/kanayago-0.4.0.gem
+gem install pkg/kanayago-0.4.1.gem
 ```
 
 ## Usage

data/ext/kanayago/kanayago.c

@@ -193,9 +193,8 @@ module_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cModuleNode);
 
-    rb_ivar_set(obj, rb_intern("@cpath"), ast_to_node_instance(RNODE_CLASS(node)->nd_cpath));
-    rb_ivar_set(obj, rb_intern("@super"), ast_to_node_instance(RNODE_CLASS(node)->nd_super));
-    rb_ivar_set(obj, rb_intern("@body"), ast_to_node_instance(RNODE_CLASS(node)->nd_body));
+    rb_ivar_set(obj, rb_intern("@cpath"), ast_to_node_instance(RNODE_MODULE(node)->nd_cpath));
+    rb_ivar_set(obj, rb_intern("@body"), ast_to_node_instance(RNODE_MODULE(node)->nd_body));
 
     return obj;
 }

data/ext/kanayago/string_node.c

@@ -19,12 +19,22 @@ dynamic_string_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicStringNode);
     rb_parser_string_t *str = RNODE_DSTR(node)->string;
-    rb_encoding *enc = str->enc;
-    char *ptr = str->ptr;
-    long len = str->len;
-
-    rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
-    rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance((const NODE *)RNODE_DSTR(node)->nd_next));
+    const NODE *nd_next = (const NODE *)RNODE_DSTR(node)->nd_next;
+
+    if (str) {
+        rb_encoding *enc = str->enc;
+        char *ptr = str->ptr;
+        long len = str->len;
+        rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
+    } else {
+        rb_ivar_set(obj, rb_intern("@string"), rb_str_new("", 0));
+    }
+
+    if (nd_next && nd_next != (NODE *)-1) {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance(nd_next));
+    } else {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), Qnil);
+    }
 
     return obj;
 }
@@ -34,12 +44,22 @@ dynamic_symbol_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicSymbolNode);
     rb_parser_string_t *str = RNODE_DSYM(node)->string;
-    rb_encoding *enc = str->enc;
-    char *ptr = str->ptr;
-    long len = str->len;
-
-    rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
-    rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance((const NODE *)RNODE_DSYM(node)->nd_next));
+    const NODE *nd_next = (const NODE *)RNODE_DSYM(node)->nd_next;
+
+    if (str) {
+        rb_encoding *enc = str->enc;
+        char *ptr = str->ptr;
+        long len = str->len;
+        rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
+    } else {
+        rb_ivar_set(obj, rb_intern("@string"), rb_str_new("", 0));
+    }
+
+    if (nd_next && nd_next != (NODE *)-1) {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance(nd_next));
+    } else {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), Qnil);
+    }
 
     return obj;
 }
@@ -77,12 +97,22 @@ dynamic_execute_string_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicExecuteStringNode);
     rb_parser_string_t *str = RNODE_DXSTR(node)->string;
-    rb_encoding *enc = str->enc;
-    char *ptr = str->ptr;
-    long len = str->len;
-
-    rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
-    rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance((const NODE *)RNODE_DXSTR(node)->nd_next));
+    const NODE *nd_next = (const NODE *)RNODE_DXSTR(node)->nd_next;
+
+    if (str) {
+        rb_encoding *enc = str->enc;
+        char *ptr = str->ptr;
+        long len = str->len;
+        rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
+    } else {
+        rb_ivar_set(obj, rb_intern("@string"), rb_str_new("", 0));
+    }
+
+    if (nd_next && nd_next != (NODE *)-1) {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance(nd_next));
+    } else {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), Qnil);
+    }
 
     return obj;
 }
@@ -112,13 +142,24 @@ dynamic_regexp_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicRegexpNode);
     rb_parser_string_t *str = RNODE_DREGX(node)->string;
-    rb_encoding *enc = str->enc;
-    char *ptr = str->ptr;
-    long len = str->len;
     long options = RNODE_DREGX(node)->as.nd_cflag;
+    const NODE *nd_next = (const NODE *)RNODE_DREGX(node)->nd_next;
+
+    if (str) {
+        rb_encoding *enc = str->enc;
+        char *ptr = str->ptr;
+        long len = str->len;
+        rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
+    } else {
+        rb_ivar_set(obj, rb_intern("@string"), rb_str_new("", 0));
+    }
+
+    if (nd_next && nd_next != (NODE *)-1) {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance(nd_next));
+    } else {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), Qnil);
+    }
 
-    rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
-    rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance((const NODE *)RNODE_DREGX(node)->nd_next));
     rb_ivar_set(obj, rb_intern("@options"), LONG2FIX(options));
 
     return obj;

data/lib/kanayago/statement_node.rb

@@ -74,7 +74,7 @@ module Kanayago
   end
 
   class ModuleNode
-    attr_reader :cpath, :super, :body
+    attr_reader :cpath, :body
   end
 
   class SingletonClassNode

data/lib/kanayago/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanayago
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kanayago
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - S-H-GAMELINKS