fix #55510: $_FILES 'name' missing first character after upload

diff --git a/main/rfc1867.c b/main/rfc1867.c
index e05412aeef5aff45b3d1ce03d13e5d9ee201c40b..01b71317cc13be5256a3c4ae346d2baeed898283 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -1210,11 +1210,12 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
                        }
 #ifdef PHP_WIN32
                        if (PG(magic_quotes_gpc)) {
-                               s = s ? s : filename;
-                               tmp = strrchr(s, '\'');
-                               s = tmp > s ? tmp : s;
-                               tmp = strrchr(s, '"');
-                               s = tmp > s ? tmp : s;
+                               if ((tmp = strrchr(s ? s : filename, '\'')) > s) {
+                                       s = tmp;
+                               }
+                               if ((tmp = strrchr(s ? s : filename, '"')) > s) {
+                                       s = tmp;
+                               }
                        }
 #endif