From: Arpad Ray <arpad@php.net>
Date: Mon, 29 Aug 2011 21:11:07 +0000 (+0000)
Subject: fix #55510: $_FILES 'name' missing first character after upload
X-Git-Tag: php-5.3.9RC1~328
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e1bfba57617793c0443fd46866d470c17768b70;p=php

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

diff --git a/main/rfc1867.c b/main/rfc1867.c
index e05412aeef..01b71317cc 100644
--- 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