archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix more crashes related to this switch to z_value

Browse source
This commit is contained in:
Rasmus Lerdorf 2001-07-21 00:14:14 +00:00
parent 6d4e4e0cf5
commit bf513871bc
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/standard/head.c
View file

@ -132,7 +132,7 @@ PHP_FUNCTION(setcookie)
len += Z_STRLEN_PP(z_domain);
}
cookie = emalloc(len + 100);
if (!Z_STRVAL_PP(z_value) || !Z_STRVAL_PP(z_value)[0]) {
if (z_value && (!Z_STRVAL_PP(z_value) || (Z_STRVAL_PP(z_value) && !Z_STRVAL_PP(z_value)[0]))) {
/*
* MSIE doesn't delete a cookie when you set it to a null value
* so in order to force cookies to be deleted, even on MSIE, we
@ -144,7 +144,7 @@ PHP_FUNCTION(setcookie)
efree(dt);
} else {
/* FIXME: XXX: this is not binary data safe */
sprintf(cookie, "Set-Cookie: %s=%s", Z_STRVAL_PP(z_name), Z_STRVAL_PP(z_value) ? encoded_value : "");
sprintf(cookie, "Set-Cookie: %s=%s", Z_STRVAL_PP(z_name), (z_value && Z_STRVAL_PP(z_value)) ? encoded_value : "");
if (expires > 0) {
strcat(cookie, "; expires=");
dt = php_std_date(expires);