3rd time's a charm

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 3589a4f1e23d5e071947877fd4a64c6d103d0c95..bc3d87f5907dcb56200062a6a2f9f28f1ac8d6ba 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -202,10 +202,8 @@ static void php_mime_split(char *buf, int cnt, char *boundary, zval *array_ptr)
                                                }
                                                abuf = estrndup(namebuf, strlen(namebuf)-arr_len);
                                                sprintf(lbuf, "%s_name[%s]", abuf, arr_index);
-                                               add_protected_variable(lbuf PLS_CC);
                                        } else {
                                                sprintf(lbuf, "%s_name", namebuf);
-                                               add_protected_variable(lbuf PLS_CC);
                                        }
                                        s = strrchr(filenamebuf, '\\');
                                        if (s && s > filenamebuf) {
@@ -213,6 +211,7 @@ static void php_mime_split(char *buf, int cnt, char *boundary, zval *array_ptr)
                                        } else {
                                                safe_php_register_variable(lbuf, filenamebuf, NULL ELS_CC PLS_CC);
                                        }
+                                       add_protected_variable(lbuf PLS_CC);
 
                                        /* Add $foo[name] */
                     if (is_arr_upload) {