Fix two minor issues

- Fix an infinite loop on `echo` hook
- Use the correct function to compare filenames internally

2 files changed, 6 insertions, 4 deletions

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index 3f9e1eb..ff0c6c3 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -265,12 +265,14 @@ static PHP_INI_MH(OnUpdateConfiguration) {
     // This is needed to implement the global strict mode
     CG(compiler_options) |= ZEND_COMPILE_HANDLE_OP_ARRAY;
   }
-  if (zend_hash_str_find(
+
+  // If `zend_write_default` is not NULL it is already hooked.
+  if ((zend_hash_str_find(
           SNUFFLEUPAGUS_G(config).config_disabled_functions_hooked, "echo",
           strlen("echo")) ||
       zend_hash_str_find(
           SNUFFLEUPAGUS_G(config).config_disabled_functions_ret_hooked, "echo",
-          strlen("echo"))) {
+          strlen("echo"))) && NULL == zend_write_default) {
     zend_write_default = zend_write;
     zend_write = hook_echo;
   }
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index 4a4f7d8..b498732 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -208,11 +208,11 @@ static zend_execute_data* is_file_matching(
 
   zend_execute_data* ex = execute_data;
   if (config_node->filename) {
-    if (zend_string_equals_literal(current_filename, config_node->filename)) {
+    if (zend_string_equals(current_filename, config_node->filename)) {
       return ex;
     }
     ITERATE(ex);
-    if (zend_string_equals_literal(ex->func->op_array.filename,
+    if (zend_string_equals(ex->func->op_array.filename,
                                    config_node->filename)) {
       return ex;
     }