1 files changed, 6 insertions, 18 deletions

diff --git a/src/sp_pcre_compat.c b/src/sp_pcre_compat.c
index 203fb7a..81c51fd 100644
--- a/src/sp_pcre_compat.c
+++ b/src/sp_pcre_compat.c
@@ -1,13 +1,5 @@
 #include "php_snuffleupagus.h"
 
-inline void sp_pcre_free(sp_pcre* regexp) {
-#ifdef SP_HAS_PCRE2
-  pcre2_code_free(regexp);
-        regexp = NULL;
-#else
-  (void)regexp;
-#endif
-}
 
 sp_pcre* sp_pcre_compile(const char* const pattern) {
   assert(NULL != pattern);
@@ -17,9 +9,8 @@ sp_pcre* sp_pcre_compile(const char* const pattern) {
   unsigned char pcre_error[128] = {0};
   int errornumber;
   PCRE2_SIZE erroroffset;
-  ret = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED,
-                      PCRE2_CASELESS, &errornumber, &erroroffset, NULL);
-  pcre2_get_error_message(errornumber, pcre_error, sizeof(pcre_error));
+  ret = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, PCRE2_CASELESS, &errornumber, &erroroffset, NULL);
+  pcre2_get_error_message(errornumber, pcre_error, sizeof(pcre_error)-1);
 #else
   const char* pcre_error = NULL;
   int erroroffset;
@@ -27,29 +18,26 @@ sp_pcre* sp_pcre_compile(const char* const pattern) {
 #endif
 
   if (NULL == ret) {
-    sp_log_err("config", "Failed to compile '%s': %s on line %zu.", pattern,
-               pcre_error, sp_line_no);
+    sp_log_err("config", "Failed to compile '%s': %s.", pattern, pcre_error);
   }
   return ret;
 }
 
-bool ZEND_HOT sp_is_regexp_matching_len(const sp_pcre* regexp, const char* str,
-                                        size_t len) {
+bool ZEND_HOT sp_is_regexp_matching_len(const sp_pcre* regexp, const char* str, size_t len) {
   int ret = 0;
 
   assert(NULL != regexp);
   assert(NULL != str);
 
 #ifdef SP_HAS_PCRE2
-  pcre2_match_data* match_data =
-      pcre2_match_data_create_from_pattern(regexp, NULL);
+  pcre2_match_data* match_data = pcre2_match_data_create_from_pattern(regexp, NULL);
   if (NULL == match_data) {
     sp_log_err("regexp", "Unable to get memory for a regxp.");
   }
   ret = pcre2_match(regexp, (PCRE2_SPTR)str, len, 0, 0, match_data, NULL);
   pcre2_match_data_free(match_data);
 #else
-  int vec[30];
+  int vec[30] = {0};
   ret = pcre_exec(regexp, NULL, str, len, 0, 0, vec, sizeof(vec) / sizeof(int));
 #endif