andrei Tue Jan 25 18:58:23 2005 EDT
Modified files:
/php-src/ext/standard browscap.c
Log:
Don't depend on empty_string.
http://cvs.php.net/diff.php/php-src/ext/standard/browscap.c?r1=1.83&r2=1.84&ty=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.83
php-src/ext/standard/browscap.c:1.84
--- php-src/ext/standard/browscap.c:1.83 Tue Jan 25 16:33:55 2005
+++ php-src/ext/standard/browscap.c Tue Jan 25 18:58:22 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.83 2005/01/25 21:33:55 andrei Exp $ */
+/* $Id: browscap.c,v 1.84 2005/01/25 23:58:22 andrei Exp $ */
#include "php.h"
#include "php_regex.h"
@@ -39,7 +39,7 @@
zend_hash_destroy(Z_ARRVAL_PP(pvalue));
free(Z_ARRVAL_PP(pvalue));
} else if (Z_TYPE_PP(pvalue) == IS_STRING) {
- if (Z_STRVAL_PP(pvalue) && Z_STRVAL_PP(pvalue) != empty_string)
{
+ if (Z_STRVAL_PP(pvalue)) {
free(Z_STRVAL_PP(pvalue));
}
}
@@ -102,7 +102,7 @@
new_property = (zval *) malloc(sizeof(zval));
INIT_PZVAL(new_property);
- Z_STRVAL_P(new_property) =
Z_STRLEN_P(arg2)?zend_strndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2)):empty_string;
+ Z_STRVAL_P(new_property) =
zend_strndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2));
Z_STRLEN_P(new_property) = Z_STRLEN_P(arg2);
Z_TYPE_P(new_property) = IS_STRING;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
