multi_string_replace 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03680f4522d98a7a162df95c1151feedabe821febc15a03c7a98a6996dd43cc1'
-  data.tar.gz: 80222e5675b3310fd079e6099026f8fa584d77542a0a34a30a3c6c3c67643cdb
+  metadata.gz: 72d264c0f004c543ee366c43752b7d80b411a8cb95143c6e875a3426fe714b37
+  data.tar.gz: f7f1fc6527d23d292608b177af9522c250b18b9d8edda50159c50a3da728ec4f
 SHA512:
-  metadata.gz: 6bcda8e829e5fd9e747c567a44c09363f304bbc8162d661418fb491f6626019c158d8a60345bb814cab42598c3830d884e6b8b70b20215d9614cb36d6913928e
-  data.tar.gz: 3f2895d64ba1d7560e866104f499a592767fa1dd161c1ff3d975126091d8330f06e85e25f37182de46f05c5dcb51a3f8ed4e38b352b78c8a1955dde1fdca5396
+  metadata.gz: dd1a23c3980abb96c2016063b67c05aec5931af39606736763e427809ba6aec4892a321372bd4ff775108581192be19d992efab17509fc64ea83672015a29966
+  data.tar.gz: 365a8a589f2950c7b9641a03ac56ca29a3cbf865579013df03c0a52b61fc4d58a7c51e09ad435b7b3876ebfc22dc33c27df63a931b2972bd66afd63aad0ccf14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    multi_string_replace (1.0.4)
+    multi_string_replace (1.0.6)
 
 GEM
   remote: https://rubygems.org/
@@ -28,11 +28,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.3.26)
   multi_string_replace!
   rake
   rake-compiler
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.5
+   2.3.26

data/ext/multi_string_replace/aho_trie.c

@@ -88,13 +88,16 @@ bool __aho_connect_link(struct aho_trie_node* p, struct aho_trie_node* q)
     struct aho_trie_node *pf = NULL;
     int i = 0;
     /* is root node */
-    if (p->parent == NULL)
+    if (p->failure_link == NULL || p->parent == NULL)
     {
         q->failure_link = p;
         return true;
     }
 
     pf = p->failure_link;
+    
+    if( pf == NULL )
+        return true;
 
     /* check child node of failure link(p) */
     if (pf->child_list[q->text] != NULL)
@@ -207,6 +210,9 @@ bool __aho_find_trie_node(struct aho_trie_node** restrict start, const unsigned
 
     search_node = *start;
 
+    if (search_node == NULL)
+        return false;
+
     if (search_node->child_list[(unsigned int)text] != NULL)
     {
         /* find it! move to find child node! */
@@ -225,7 +231,7 @@ struct aho_text_t* aho_find_trie_node(struct aho_trie_node** restrict start, con
         /* not found!
          * when root node stop
          */
-        if( (*start)->parent == NULL)
+        if( *start == NULL || (*start)->parent == NULL)
         {
             return NULL;
         }

data/ext/multi_string_replace/ahocorasick.c

@@ -49,7 +49,7 @@ int aho_add_match_text(struct ahocorasick * restrict aho, const char* text, unsi
 
     a_text->id = aho->accumulate_text_id++;
 
-    memcpy(a_text->text, text, len);
+    memcpy(a_text->text, text, len + 1);
 
     a_text->len = len;
     a_text->prev = NULL;
@@ -90,15 +90,18 @@ bool aho_del_match_text(struct ahocorasick * restrict aho, const int id)
             if (iter == aho->text_list_head)
             {
                 aho->text_list_head = iter->next;
+                free(iter->text);
             }
             else if (iter == aho->text_list_tail)
             {
                 aho->text_list_tail = iter->prev;
+                free(iter->text);
             }
             else
             {
                 iter->prev->next = iter->next;
                 iter->next->prev = iter->prev;
+                free(iter->text);
             }
             free(iter);
             aho->text_list_len--;
@@ -226,7 +229,7 @@ VALUE aho_replace_text(struct ahocorasick * restrict aho, const char* data,
         last_concat_pos = i + 1;
     }
 
-    if (last_concat_pos < data_len - 1) {
+    if (last_concat_pos < data_len) {
         rb_str_cat(main_result, &data[last_concat_pos], data_len - last_concat_pos);
     }
 

data/ext/multi_string_replace/multi_string_replace.c

@@ -55,6 +55,7 @@ VALUE multi_string_match(VALUE self, VALUE body, VALUE keys)
 
   aho_create_trie(&aho);
   aho_register_match_callback(result, &aho, callback_match_pos, (void*)target);
+
   aho_findtext(&aho, target, RSTRING_LEN(body));
   aho_destroy(&aho);
   return result;
@@ -99,7 +100,6 @@ VALUE multi_string_replace(VALUE self, VALUE body, VALUE replace)
    aho_add_match_text(&aho, StringValuePtr(entry), RSTRING_LEN(entry));
   }
   aho_create_trie(&aho);
-
   VALUE result = aho_replace_text(&aho, target, RSTRING_LEN(body), values, value_sizes, ruby_val);
   aho_destroy(&aho);
   return result;

data/lib/multi_string_replace/version.rb

@@ -1,3 +1,3 @@
 module MultiStringReplace
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 end

data/multi_string_replace.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions = ["ext/multi_string_replace/extconf.rb"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.3.26"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake-compiler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_string_replace
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Joseph Dayo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.3.26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.3.26
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ files:
 - bin/benchmark.rb
 - bin/console
 - bin/setup
+- ext/multi_string_replace/.sitearchdir.-.multi_string_replace.time
 - ext/multi_string_replace/aho_queue.c
 - ext/multi_string_replace/aho_queue.h
 - ext/multi_string_replace/aho_text.h
@@ -106,7 +107,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A fast multiple string replace library for ruby. Uses a C implementation
   of the Aho–Corasick Algorithm