svn: /php/php-src/branches/PHP_5_3/ext/standard/ basic_functions.c
| From: | Felipe Pena | Date: | Thu, 23 Jun 2011 21:48:15 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3/ext/standard/ basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65334@lists.php.net to get a copy of this message | ||
felipe Thu, 23 Jun 2011 21:48:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312417
Log:
- Fixed crash in error_log() (strlen(NULL)) reported by: shm, Maksymilian Arciemowicz
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-06-23 21:45:31 UTC (rev 312416)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2011-06-23 21:48:15 UTC (rev 312417)
@@ -4678,7 +4678,7 @@
opt_err = erropt;
}
- if (opt_err == 3) {
+ if (opt_err == 3 && opt) {
if (strlen(opt) != opt_len) {
RETURN_FALSE;
}