com php-src: Fixed NULL pointer dereferencing: ext/mbstring/mbstring.c
| From: | Dmitry Stogov | Date: | Wed, 09 Apr 2014 07:39:39 +0000 |
| Subject: | com php-src: Fixed NULL pointer dereferencing: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77467@lists.php.net to get a copy of this message | ||
Commit: 98ab24f1afe30608a9701b7f7ca0a24b5e5bd123
Author: Dmitry Stogov <dmitry@zend.com> Wed, 9 Apr 2014 11:39:39 +0400
Parents: abbb1c0f0077bb092c9ec10d783b46c87357235a
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98ab24f1afe30608a9701b7f7ca0a24b5e5bd123
Log:
Fixed NULL pointer dereferencing
Changed paths:
M ext/mbstring/mbstring.c
Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 2ffc31c..a464b1c 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4314,7 +4314,7 @@ PHP_FUNCTION(mb_send_mail)
extra_cmd = php_escape_shell_cmd(extra_cmd->val);
}
- if (!err && php_mail(to_r, subject, message, headers, extra_cmd->val TSRMLS_CC)) {
+ if (!err && php_mail(to_r, subject, message, headers, extra_cmd ? extra_cmd->val : NULL
TSRMLS_CC)) {
RETVAL_TRUE;
} else {
RETVAL_FALSE;