Merge remote-tracking branch 'upstream/master'

1 files changed, 7 insertions, 4 deletions

diff --git a/src/sp_disable_xxe.c b/src/sp_disable_xxe.c
index 53148c8..113d84b 100644
--- a/src/sp_disable_xxe.c
+++ b/src/sp_disable_xxe.c
@@ -3,18 +3,21 @@
 PHP_FUNCTION(sp_libxml_disable_entity_loader) { RETURN_TRUE; }
 
 int hook_libxml_disable_entity_loader() {
-  zval func_name;
-  zval hmac;
-  zval params[1];
-
   TSRMLS_FETCH();
 
+// External entities are disabled by default in PHP8+
+#if PHP_VERSION_ID < 80000
   /* Call the php function here instead of re-implementing it is a bit
    * ugly, but we do not want to introduce compile-time dependencies against
    * libxml. */
+  zval func_name;
+  zval hmac;
+  zval params[1];
+
   ZVAL_STRING(&func_name, "libxml_disable_entity_loader");
   ZVAL_STRING(&params[0], "true");
   call_user_function(CG(function_table), NULL, &func_name, &hmac, 1, params);
+#endif
 
   HOOK_FUNCTION("libxml_disable_entity_loader", sp_internal_functions_hook,
                 PHP_FN(sp_libxml_disable_entity_loader));