From: Xinchen Hui <laruence@php.net>
Date: Thu, 3 Jul 2014 15:58:21 +0000 (+0800)
Subject: Fixed segfault if empty POST
X-Git-Tag: POST_PHPNG_MERGE~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21ccbbad7d964c4ee00b46a40f8733bef2ee126f;p=php

Fixed segfault if empty POST
---

diff --git a/main/php_variables.c b/main/php_variables.c
index 30a84822af..fbd91dc286 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -328,9 +328,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
 				smart_str_appendl(&post_data.str, buf, len);
 
 				if (SUCCESS != add_post_vars(arr, &post_data, 0 TSRMLS_CC)) {
-					if (post_data.str.s) {
-						smart_str_free(&post_data.str);
-					}
+					smart_str_free(&post_data.str);
 					return;
 				}
 			}
@@ -340,8 +338,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
 			}
 		}
 
-		add_post_vars(arr, &post_data, 1 TSRMLS_CC);
 		if (post_data.str.s) {
+			add_post_vars(arr, &post_data, 1 TSRMLS_CC);
 			smart_str_free(&post_data.str);
 		}
 	}