fix a bug on false positive error report

CindyLinz · May 23, 2017 · 011d8fe · 011d8fe
1 parent 04b5fad
commit 011d8fe
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/R3.xs b/R3.xs
@@ -1418,7 +1418,7 @@ int r3_tree_compile_patterns(node * n, char **errstr) {
             &pcre_error,               /* for error message */
             &pcre_erroffset,           /* for error offset */
             NULL);                /* use default character tables */
-    if (n->pcre_pattern == NULL) {
+    if (n->pcre_pattern == NULL && pcre_error != NULL) {
         if (errstr) {
             asprintf(errstr, "PCRE compilation failed at offset %d: %s, pattern: %s", pcre_erroffset, pcre_error, n->combined_pattern);
         }
@@ -1429,9 +1429,9 @@ int r3_tree_compile_patterns(node * n, char **errstr) {
         pcre_free_study(n->pcre_extra);
     }
     n->pcre_extra = pcre_study(n->pcre_pattern, 0, &pcre_error);
-    if (n->pcre_extra == NULL) {
+    if (n->pcre_extra == NULL && pcre_error != NULL) {
         if (errstr) {
-            asprintf(errstr, "PCRE study failed at offset %s, pattern: %s", pcre_error, n->combined_pattern);
+            asprintf(errstr, "PCRE study failed at offset %d: %s, pattern: %s", pcre_erroffset, pcre_error, n->combined_pattern);
         }
         return -1;
     }