durable_rules 0.34.18 → 0.34.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ede28c26f0087d55595d6e8262fa6937cb26625f
-  data.tar.gz: bd5ac33cbe9887938d2ebe9fbb60121d870538b3
+  metadata.gz: 8c9e5f1398313b056da22ae2f5f3f2e530290b13
+  data.tar.gz: 4c855b1f826d50b56b092c5c7f16a45ad26fe4d4
 SHA512:
-  metadata.gz: fa7d9872f33c0de2c4aadb736bec251f760293708d09c7dd9562fa88e3c06cdaa7db031a603caacf930ed453d1955f1513fc40fbf71fb629abb739d59c11994d
-  data.tar.gz: 5a73610275300a5e6e35fdad63ba31cb1dd83edb746aad890bbd1a86093b943c44c0d0458ff8ce1dd1edd26a7f003481afddb10b4ae3cfb16e2bcc6495de4b75
+  metadata.gz: 8ed7203164847dbb9a410f737150dbb0e4b65a2cbe786066e97eb0f7aab9e008cbbd56c89a2a7fda94a44706c07a8334f856ade7590801e76a94403670898c08
+  data.tar.gz: c9a0aa9a35890f73c1236716287a7ec380b2ccaa5fd3d7a843b753f45d3debb79dc975f7666ef76c58ef24650c7d9ad441a34e676ad511c8d0972eabd78fb1cf

data/src/rules/events.c

@@ -381,9 +381,9 @@ static unsigned int handleBeta(ruleset *tree,
 
     node *actionNode = NULL;
 #ifdef _WIN32
-	char *prefix = (char *)_alloca(sizeof(char)*(prefixLength));
+    char *prefix = (char *)_alloca(sizeof(char)*(prefixLength));
 #else
-	char prefix[prefixLength];
+    char prefix[prefixLength];
 #endif
     char *currentPrefix = prefix;
     currentNode = betaNode;
@@ -777,11 +777,11 @@ static unsigned int isMatch(ruleset *tree,
             {
                 rightLength = rightProperty->valueLength + 1;
 #ifdef _WIN32
-				char *leftStringInt = (char *)_alloca(sizeof(char)*(rightLength));
-				sprintf_s(leftStringInt, rightLength, "%ld", currentProperty->value.i);
+                char *leftStringInt = (char *)_alloca(sizeof(char)*(rightLength));
+                sprintf_s(leftStringInt, sizeof(char)*(rightLength), "%ld", currentProperty->value.i);
 #else
-				char leftStringInt[rightLength];
-				snprintf(leftStringInt, rightLength, "%ld", currentProperty->value.i);
+                char leftStringInt[rightLength];
+                snprintf(leftStringInt, sizeof(char)*(rightLength), "%ld", currentProperty->value.i);
 #endif         
                 *propertyMatch = compareStringProperty(leftStringInt, 
                                                        rightState + rightProperty->valueOffset,
@@ -802,11 +802,11 @@ static unsigned int isMatch(ruleset *tree,
             {
                 rightLength = rightProperty->valueLength + 1;
 #ifdef _WIN32
-				char *leftStringDouble = (char *)_alloca(sizeof(char)*(rightLength));
-				sprintf_s(leftStringDouble, rightLength, "%f", currentProperty->value.d);
+                char *leftStringDouble = (char *)_alloca(sizeof(char)*(rightLength));
+                sprintf_s(leftStringDouble, sizeof(char)*(rightLength), "%f", currentProperty->value.d);
 #else
-				char leftStringDouble[rightLength];
-				snprintf(leftStringDouble, rightLength, "%f", currentProperty->value.d);
+                char leftStringDouble[rightLength];
+                snprintf(leftStringDouble, sizeof(char)*(rightLength), "%f", currentProperty->value.d);
 #endif         
                 *propertyMatch = compareStringProperty(leftStringDouble,
                                                        rightState + rightProperty->valueOffset,
@@ -832,11 +832,11 @@ static unsigned int isMatch(ruleset *tree,
             {
                 leftLength = currentProperty->valueLength + 1;
 #ifdef _WIN32
-				char *rightStringInt = (char *)_alloca(sizeof(char)*(leftLength));
-				sprintf_s(rightStringInt, leftLength, "%ld", rightProperty->value.i);
+                char *rightStringInt = (char *)_alloca(sizeof(char)*(leftLength));
+                sprintf_s(rightStringInt, sizeof(char)*(leftLength), "%ld", rightProperty->value.i);
 #else
-				char rightStringInt[leftLength];
-				snprintf(rightStringInt, leftLength, "%ld", rightProperty->value.i);
+                char rightStringInt[leftLength];
+                snprintf(rightStringInt, sizeof(char)*(leftLength), "%ld", rightProperty->value.i);
 #endif
                 *propertyMatch = compareString(message + currentProperty->valueOffset, 
                                                currentProperty->valueLength, 
@@ -848,11 +848,11 @@ static unsigned int isMatch(ruleset *tree,
             {
                 leftLength = currentProperty->valueLength + 1;
 #ifdef _WIN32
-				char *rightStringDouble = (char *)_alloca(sizeof(char)*(leftLength));
-				sprintf_s(rightStringDouble, leftLength, "%f", rightProperty->value.d);
+                char *rightStringDouble = (char *)_alloca(sizeof(char)*(leftLength));
+                sprintf_s(rightStringDouble, sizeof(char)*(leftLength), "%f", rightProperty->value.d);
 #else
-				char rightStringDouble[leftLength];
-				snprintf(rightStringDouble, leftLength, "%f", rightProperty->value.d);
+                char rightStringDouble[leftLength];
+                snprintf(rightStringDouble, sizeof(char)*(leftLength), "%f", rightProperty->value.d);
 #endif              
                 *propertyMatch = compareString(message + currentProperty->valueOffset, 
                                                currentProperty->valueLength, 
@@ -1064,9 +1064,9 @@ static unsigned int handleMessageCore(ruleset *tree,
         return result;
     }
 #ifdef _WIN32
-	char *sid = (char *)_alloca(sizeof(char)*(sidLength + 1));
+    char *sid = (char *)_alloca(sizeof(char)*(sidLength + 1));
 #else
-	char sid[sidLength + 1];
+    char sid[sidLength + 1];
 #endif  
     strncpy(sid, message + sidProperty->valueOffset, sidLength);
     sid[sidLength] = '\0';
@@ -1076,9 +1076,9 @@ static unsigned int handleMessageCore(ruleset *tree,
         return result;
     }
 #ifdef _WIN32
-	char *mid = (char *)_alloca(sizeof(char)*(midLength + 1));
+    char *mid = (char *)_alloca(sizeof(char)*(midLength + 1));
 #else
-	char mid[midLength + 1];
+    char mid[midLength + 1];
 #endif  
     strncpy(mid, message + midProperty->valueOffset, midLength);
     mid[midLength] = '\0';
@@ -1223,27 +1223,27 @@ static unsigned int handleMessageCore(ruleset *tree,
                 return result;
             }            
 #ifdef _WIN32
-			char *stateMessage = (char *)_alloca(sizeof(char)*(36 + sidLength));
-			char *newState = (char *)_alloca(sizeof(char)*(12 + sidLength));
-			if (sidProperty->type == JSON_STRING) {
-				sprintf_s(stateMessage, 36 + sidLength, "{\"id\":\"$s\", \"sid\":\"%s\", \"$s\":1}", sid);
-				sprintf_s(newState, 12 + sidLength, "{\"sid\":\"%s\"}", sid);
-			}
-			else {
-				sprintf_s(stateMessage, 36 + sidLength, "{\"id\":\"$s\", \"sid\":%s, \"$s\":1}", sid);
-				sprintf_s(newState, 12 + sidLength, "{\"sid\":%s}", sid);
-			}
+            char *stateMessage = (char *)_alloca(sizeof(char)*(36 + sidLength));
+            char *newState = (char *)_alloca(sizeof(char)*(12 + sidLength));
+            if (sidProperty->type == JSON_STRING) {
+                sprintf_s(stateMessage, sizeof(char)*(36 + sidLength), "{\"id\":\"$s\", \"sid\":\"%s\", \"$s\":1}", sid);
+                sprintf_s(newState, sizeof(char)*(12 + sidLength), "{\"sid\":\"%s\"}", sid);
+            }
+            else {
+                sprintf_s(stateMessage, sizeof(char)*(36 + sidLength), "{\"id\":\"$s\", \"sid\":%s, \"$s\":1}", sid);
+                sprintf_s(newState, sizeof(char)*(12 + sidLength), "{\"sid\":%s}", sid);
+            }
 #else
-			char stateMessage[36 + sidLength];
-			char newState[12 + sidLength];
-			if (sidProperty->type == JSON_STRING) {
-				snprintf(stateMessage, 36 + sidLength, "{\"id\":\"$s\", \"sid\":\"%s\", \"$s\":1}", sid);
-				snprintf(newState, 12 + sidLength, "{\"sid\":\"%s\"}", sid);
-			}
-			else {
-				snprintf(stateMessage, 36 + sidLength, "{\"id\":\"$s\", \"sid\":%s, \"$s\":1}", sid);
-				snprintf(newState, 12 + sidLength, "{\"sid\":%s}", sid);
-			}
+            char stateMessage[36 + sidLength];
+            char newState[12 + sidLength];
+            if (sidProperty->type == JSON_STRING) {
+                snprintf(stateMessage, sizeof(char)*(36 + sidLength), "{\"id\":\"$s\", \"sid\":\"%s\", \"$s\":1}", sid);
+                snprintf(newState, sizeof(char)*(12 + sidLength), "{\"sid\":\"%s\"}", sid);
+            }
+            else {
+                snprintf(stateMessage, sizeof(char)*(36 + sidLength), "{\"id\":\"$s\", \"sid\":%s, \"$s\":1}", sid);
+                snprintf(newState, sizeof(char)*(12 + sidLength), "{\"sid\":%s}", sid);
+            }
 #endif
 
             if (*commandCount == MAX_COMMAND_COUNT) {
@@ -1415,15 +1415,15 @@ static unsigned int handleState(ruleset *tree,
 
     char *stateMessagePostfix = state + 1;
 #ifdef _WIN32
-	char *stateMessage = (char *)_alloca(sizeof(char)*(40 + stateLength - 1));
+    char *stateMessage = (char *)_alloca(sizeof(char)*(40 + stateLength - 1));
 #else
-	char stateMessage[40 + stateLength - 1];
+    char stateMessage[40 + stateLength - 1];
 #endif
     
 #ifdef _WIN32
-    sprintf_s(stateMessage, 40 + stateLength - 1, "{\"id\":\"$v-%016lu\", \"$s\":1, %s", stateVersion, stateMessagePostfix);
+    sprintf_s(stateMessage, sizeof(char)*(40 + stateLength - 1), "{\"id\":\"$v-%016lu\", \"$s\":1, %s", stateVersion, stateMessagePostfix);
 #else
-	snprintf(stateMessage, 40 + stateLength - 1, "{\"id\":\"$v-%016lu\", \"$s\":1, %s", stateVersion, stateMessagePostfix);
+    snprintf(stateMessage, sizeof(char)*(40 + stateLength - 1), "{\"id\":\"$v-%016lu\", \"$s\":1, %s", stateVersion, stateMessagePostfix);
 #endif
     unsigned int result = handleMessage(tree, 
                                         state,

data/src/rules/net.c

@@ -1244,11 +1244,11 @@ static unsigned int loadEvalMessageCommand(ruleset *tree, binding *rulesBinding)
 
 #ifdef _WIN32
     char *actionKey = (char *)_alloca(sizeof(char) * (nameLength + 3));
-    sprintf_s(actionKey, nameLength + 3, "%s!a", name);
+    sprintf_s(actionKey, sizeof(char) * (nameLength + 3), "%s!a", name);
     node **sortedActions = (node **)_alloca(sizeof(node *) * tree->nodeOffset);
 #else
     char actionKey[nameLength + 3];
-    snprintf(actionKey, nameLength + 3, "%s!a", name);
+    snprintf(actionKey, sizeof(char) * (nameLength + 3), "%s!a", name);
     node *sortedActions[tree->nodeOffset];
 #endif
     
@@ -2411,13 +2411,13 @@ unsigned int formatEvalMessage(void *rulesBinding,
     char score[11];
     char keysLengthString[5];
 #ifdef _WIN32
-    sprintf_s(keysLengthString, 5, "%d", keysLength);
-    sprintf_s(score, 11, "%ld", currentTime);
+    sprintf_s(keysLengthString, sizeof(char) * 5, "%d", keysLength);
+    sprintf_s(score, sizeof(char) * 11, "%ld", currentTime);
     char **argv = (char **)_alloca(sizeof(char*)*(8 + keysLength + propertiesLength * 3));
     size_t *argvl = (size_t *)_alloca(sizeof(size_t)*(8 + keysLength +  propertiesLength * 3));
 #else
-    snprintf(keysLengthString, 5, "%d", keysLength);
-    snprintf(score, 11, "%ld", currentTime);
+    snprintf(keysLengthString, sizeof(char) * 5, "%d", keysLength);
+    snprintf(score, sizeof(char) * 11, "%ld", currentTime);
     char *argv[8 + keysLength + propertiesLength * 3];
     size_t argvl[8 + keysLength + propertiesLength * 3];
 #endif
@@ -2497,11 +2497,11 @@ unsigned int formatStoreMessage(void *rulesBinding,
     binding *bindingContext = (binding*)rulesBinding;
     char keysLengthString[5];
 #ifdef _WIN32
-    sprintf_s(keysLengthString, 5, "%d", keysLength);
+    sprintf_s(keysLengthString, sizeof(char) * 5, "%d", keysLength);
     char **argv = (char **)_alloca(sizeof(char*)*(6 + keysLength + propertiesLength * 3));
     size_t *argvl = (size_t *)_alloca(sizeof(size_t)*(6 + keysLength + propertiesLength * 3));
 #else
-    snprintf(keysLengthString, 5, "%d", keysLength);
+    snprintf(keysLengthString, sizeof(char) * 5, "%d", keysLength);
     char *argv[6 + keysLength + propertiesLength * 3];
     size_t argvl[6 + keysLength + propertiesLength * 3];
 #endif

data/src/rules/regex.c

@@ -606,9 +606,10 @@ static void deleteTransition(state *previousState, unsigned short index) {
 static void unlinkStates(state *previousState, 
                          state *nextState, 
                          unsigned int tokenSymbol) {
+    unsigned short nextId = nextState->id;
     for (int i = 0; i < previousState->transitionsLength; ++i) {
         if (previousState->transitions[i].symbol == tokenSymbol && 
-            previousState->transitions[i].next->id == nextState->id) {
+            previousState->transitions[i].next->id == nextId) {
             deleteTransition(previousState, i);
         }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.18
+  version: 0.34.19
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake