]> granicus.if.org Git - php/commitdiff
Fixed NULL pointer dereferencing
authorDmitry Stogov <dmitry@zend.com>
Wed, 9 Apr 2014 07:39:39 +0000 (11:39 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 9 Apr 2014 07:39:39 +0000 (11:39 +0400)
ext/mbstring/mbstring.c

index 2ffc31cc0cafcb8ce615b8c3fe69968863bb6b06..a464b1c5c78f9af475fc445980c309f70e6e7f35 100644 (file)
@@ -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;