From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 3 Mar 2014 10:12:13 +0000 (+0800)
Subject: Fixed NULL pointer def
X-Git-Tag: POST_PHPNG_MERGE~412^2~436^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebfa9e04156dbace382489bd27c7fb170ac43149;p=php

Fixed NULL pointer def
---

diff --git a/ext/standard/head.c b/ext/standard/head.c
index 2fa5e1fdad..04a3c89460 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -95,11 +95,12 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
 	len += name_len;
 	if (value && url_encode) {
 		encoded_value = php_url_encode(value, value_len);
+		len += encoded_value->len;
 	} else if (value) {
 		encoded_value = STR_INIT(value, value_len, 0);
+		len += encoded_value->len;
 	}
 
-	len += encoded_value->len;
 	if (path) {
 		len += path_len;
 	}