durable_rules 2.0.22 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea83e9efc9d1e06b799a9408e24dc95126cadcdc
-  data.tar.gz: 9334d4fb5bbe5c97d8e46cf00a624adcd782af86
+  metadata.gz: 5220161e2cc19405339ce104109a5ab075b092d5
+  data.tar.gz: 5e377d29c7c5d3985ddd8649b5abbf264f7d6612
 SHA512:
-  metadata.gz: 9240234e76cf597c487320d53ec9ebe9ba9a7ba65a0f64a685de3eb2b037457a11eb89fd61eca7dc4135aa473ae86dc92aebea8eb941d504270c4de29416e974
-  data.tar.gz: 1056a380df74c2a30b266d33a09c6745bcd41b1b255e2f6a9628fb5c5d30db65c83606b45e7758d679f36a50026a9ea1ba98c94a308f51a323ace387ee3fd68e
+  metadata.gz: 0f86aca1a3edb8a690940bbbccd9802399174bc23c15bae438b95bde71bb9322374ee58caca508f1dc47dbfc25d5ea128d4479541b34645d16c4b20d577f9119
+  data.tar.gz: 9304dd821caa413367edffa5e410bbf19f7a504ab06182796d7cdd2d8e1ad27454382968b64483a32757e968b50f20dbd616dd5028a6e7b4c2cd54f6e3f5d13c

data/librb/durable.rb

@@ -9,9 +9,12 @@ module Durable
       @@main_host = Engine::Host.new
     end
 
-    @@main_host.register_rulesets @@rulesets
-
-    @@rulesets = {}
+    begin
+      @@main_host.register_rulesets @@rulesets
+    ensure
+      @@rulesets = {}
+    end
+    
     @@main_host 
   end
 

data/src/rules/events.c

@@ -486,13 +486,67 @@ static unsigned int reduceExpression(ruleset *tree,
 
     if (currentExpression->right.type == JSON_REGEX || currentExpression->right.type == JSON_IREGEX) {
         targetProperty->type = JSON_BOOL;
+        targetProperty->value.b = 0;
+
+        char *leftString = "";
+        unsigned short leftLength = 0;
+        switch(leftProperty->type) {
+            case JSON_INT:
+                {
+    #ifdef _WIN32
+                    leftString = (char *)_alloca(sizeof(char)*(MAX_INT_LENGTH + 1));
+                    sprintf_s(leftString, sizeof(char)*(MAX_INT_LENGTH + 1), "%lld", leftProperty->value.i);
+    #else
+                    char newString[MAX_INT_LENGTH + 1];
+                    leftString = newString;
+                    snprintf(leftString, sizeof(char)*(MAX_INT_LENGTH + 1), "%lld", leftProperty->value.i);
+    #endif         
+                    leftLength = strlen(leftString);
+                    break;
+                }
+            case JSON_DOUBLE:
+                {
+    #ifdef _WIN32
+                    leftString = (char *)_alloca(sizeof(char)*(MAX_DOUBLE_LENGTH + 1));
+                    sprintf_s(leftString, sizeof(char)*(MAX_DOUBLE_LENGTH + 1), "%f", leftProperty->value.d);
+    #else
+                    char newString[MAX_DOUBLE_LENGTH + 1];
+                    leftString = newString;
+                    snprintf(leftString, sizeof(char)*(MAX_DOUBLE_LENGTH + 1), "%f", leftProperty->value.d);
+    #endif         
+                    leftLength = strlen(leftString);
+                    break;
+                }
+            case JSON_BOOL:
+                if (leftProperty->value.b) {
+                    leftString = "true";
+                    leftLength = 4;
+                }
+                else {
+                    leftString = "false";
+                    leftLength = 5;
+                }
+
+                break;
+            case JSON_NIL:
+                leftString = "nil";
+                leftLength = 3;
+                break;
+            case JSON_STRING:
+                leftString = leftProperty->value.s;
+                leftLength = leftProperty->valueLength;
+                break;
+        }
+
         targetProperty->value.b = evaluateRegex(tree,
-                                                leftProperty->value.s, 
-                                                leftProperty->valueLength, 
+                                                leftString, 
+                                                leftLength, 
                                                 (currentExpression->right.type == JSON_REGEX) ? 0 : 1,
                                                 currentExpression->right.value.regex.vocabularyLength,
                                                 currentExpression->right.value.regex.statesLength,
                                                 currentExpression->right.value.regex.stateMachineOffset);
+        
+
         return RULES_OK;
     }
 

data/src/rules/regex.c

@@ -23,6 +23,7 @@
 #define MAX_SET 8192
 #define MAX_LIST 1024
 #define MAX_INTERVAL 100
+#define MAX_REFCOUNT 1000
 
 
 #define CREATE_QUEUE(type) \
@@ -597,10 +598,6 @@ static unsigned int linkStates(state *previousState,
     previousState->transitions[previousState->transitionsLength].next = nextState;
     ++previousState->transitionsLength;
     ++nextState->refCount;
-    if (previousState->transitionsLength == MAX_TRANSITIONS) {
-        return ERR_REGEX_MAX_TRANSITIONS;
-    }
-
     return RULES_OK;
 }
 
@@ -852,10 +849,18 @@ static unsigned int validateGraph(char **first, char *last) {
         switch (currentToken.type) {
             case REGEX_SYMBOL:
             case REGEX_UNION:
-            case REGEX_STAR:
             case REGEX_PLUS:
-            case REGEX_QUESTION:
                 break;
+            case REGEX_STAR:
+            case REGEX_QUESTION:
+            {
+                char *nextFirst = *first; 
+                token nextToken;
+                unsigned int nextResult = readNextToken(&nextFirst, last, &nextToken); 
+                if (nextResult == REGEX_PARSE_OK && nextToken.type == REGEX_STAR) {
+                    return ERR_REGEX_INVALID;
+                }
+            }
             case REGEX_REGEX:
                 result = validateGraph(first, last);
                 if (result != REGEX_PARSE_OK) {
@@ -1141,7 +1146,7 @@ static unsigned int transformToDFA(state *nfa,
             }
         }
 
-        DEQUEUE(&currentState);    
+        DEQUEUE(&currentState);
     }
 
     return RULES_OK;
@@ -1343,6 +1348,12 @@ unsigned int compileRegex(void *tree,
     if (result != RULES_OK) {
         return result;
     }
+
+    if (!*vocabularyLength || !*statesLength) {
+        return ERR_REGEX_INVALID;
+    }
+
+
     void *newStateMachine;    
     result = storeRegexStateMachine((ruleset *)tree, 
                                     *vocabularyLength, 

data/src/rules/rete.h

@@ -1,6 +1,6 @@
 #include "state.h"
 
-// #define _PRINT 1
+//#define _PRINT 1
 
 #define OP_NOP 0
 #define OP_LT 0x01

data/src/rules/rules.h

@@ -40,6 +40,7 @@
 #define ERR_REGEX_LIST_FULL 505
 #define ERR_REGEX_SET_FULL 506
 #define ERR_REGEX_CONFLICT 507
+#define ERR_REGEX_INVALID 508
 
 #define NEXT_BUCKET_LENGTH 512
 #define NEXT_LIST_LENGTH 128

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.23
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake