From: Anatol Belski <ab@php.net>
Date: Tue, 19 Aug 2014 12:20:56 +0000 (+0200)
Subject: fix incompatible types
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f07b41b465a5bb314a2d3b2bf309828e2dd7e299;p=php

fix incompatible types
---

diff --git a/ext/session/session.c b/ext/session/session.c
index b03cfaa614..1a678b8ddb 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1266,12 +1266,13 @@ static void php_session_remove_cookie(TSRMLS_D) {
 	zend_llist *l = &SG(sapi_headers).headers;
 	zend_llist_element *next;
 	zend_llist_element *current;
-	char *session_cookie, *e_session_name;
+	char *session_cookie;
+	zend_string *e_session_name;
 	int session_cookie_len, len = sizeof("Set-Cookie")-1;
 
 	e_session_name = php_url_encode(PS(session_name), strlen(PS(session_name)));
-	spprintf(&session_cookie, 0, "Set-Cookie: %s=", e_session_name);
-	efree(e_session_name);
+	spprintf(&session_cookie, 0, "Set-Cookie: %s=", e_session_name->val);
+	STR_FREE(e_session_name);
 
 	session_cookie_len = strlen(session_cookie);
 	current = l->head;