From 67aea1b6237ae6c8fff605ef1560288f78ae113e Mon Sep 17 00:00:00 2001
From: surrim <surrim@happyhydro.org>
Date: Mon, 16 Mar 2020 23:51:17 +0100
Subject: [PATCH] Fix serendipity_killPath().

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
---
 docs/NEWS                        | 3 +++
 include/functions_images.inc.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/docs/NEWS b/docs/NEWS
index 7aad9646..111c7227 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,6 +1,9 @@
 Version 2.3.3-beta1 ()
 ------------------------------------------------------------------------
 
+   * Fix serendipity_killPath().
+     Thanks to @surrim!
+
    * Don't allow requesting an archive page that doesn't exist.
      Thanks to @lotharsm!
 
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index dc9c9050..88109dd1 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -1839,6 +1839,7 @@ function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
     static $serious = true;
 
     if ($handle = @opendir($basedir . $directory)) {
+        $filestack = [];
         while (false !== ($file = @readdir($handle))) {
             if ($file != '.' && $file != '..') {
                 if (is_dir($basedir . $directory . $file)) {