[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/basic_functions.c trunk/ext/standard/basic_functions.c

2011-11-09 Thread Felipe Pena 
felipe   Wed, 09 Nov 2011 22:16:31 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=318962

Log:
- Initialize BG(serialize_lock) to make valgrind happy

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U   php/php-src/trunk/ext/standard/basic_functions.c

Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-11-09 
21:53:55 UTC (rev 318961)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-11-09 
22:16:31 UTC (rev 318962)
@@ -3450,6 +3450,7 @@
BG(left) = -1;
BG(user_tick_functions) = NULL;
BG(user_filter_map) = NULL;
+   BG(serialize_lock) = 0;

memset(BG(serialize), 0, sizeof(BG(serialize)));
memset(BG(unserialize), 0, sizeof(BG(unserialize)));

Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2011-11-09 21:53:55 UTC 
(rev 318961)
+++ php/php-src/trunk/ext/standard/basic_functions.c2011-11-09 22:16:31 UTC 
(rev 318962)
@@ -3452,6 +3452,7 @@
BG(left) = -1;
BG(user_tick_functions) = NULL;
BG(user_filter_map) = NULL;
+   BG(serialize_lock) = 0;

memset(BG(serialize), 0, sizeof(BG(serialize)));
memset(BG(unserialize), 0, sizeof(BG(unserialize)));

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/basic_functions.c trunk/ext/standard/basic_functions.c

2011-06-23 Thread Felipe Pena 
felipe   Thu, 23 Jun 2011 21:53:25 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=312419

Log:
- Missing valid path check

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U   php/php-src/trunk/ext/standard/basic_functions.c

Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-06-23 
21:49:43 UTC (rev 312418)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-06-23 
21:53:25 UTC (rev 312419)
@@ -4610,7 +4610,7 @@
int opt_err = 0, argc = ZEND_NUM_ARGS();
long erropt = 0;

-   if (zend_parse_parameters(argc TSRMLS_CC, s|lss, message, 
message_len, erropt, opt, opt_len, headers, headers_len) == FAILURE) {
+   if (zend_parse_parameters(argc TSRMLS_CC, s|lps, message, 
message_len, erropt, opt, opt_len, headers, headers_len) == FAILURE) {
return;
}


Modified: php/php-src/trunk/ext/standard/basic_functions.c
===
--- php/php-src/trunk/ext/standard/basic_functions.c2011-06-23 21:49:43 UTC 
(rev 312418)
+++ php/php-src/trunk/ext/standard/basic_functions.c2011-06-23 21:53:25 UTC 
(rev 312419)
@@ -4640,7 +4640,7 @@
int opt_err = 0, argc = ZEND_NUM_ARGS();
long erropt = 0;

-   if (zend_parse_parameters(argc TSRMLS_CC, s|lss, message, 
message_len, erropt, opt, opt_len, headers, headers_len) == FAILURE) {
+   if (zend_parse_parameters(argc TSRMLS_CC, s|lps, message, 
message_len, erropt, opt, opt_len, headers, headers_len) == FAILURE) {
return;
}


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php