com php-src: Fix bug #68706 - uninitalized pointer in mbstring: ext/mbstring/mbstring.c

From: Date: Sun, 04 Jan 2015 05:55:29 +0000
Subject: com php-src: Fix bug #68706 - uninitalized pointer in mbstring: ext/mbstring/mbstring.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83952@lists.php.net to get a copy of this message
Commit: 599d7a3968cfaf0317adca52bfb0e73ba3e3f52a Author: Stanislav Malyshev <stas@php.net> Sat, 3 Jan 2015 21:55:29 -0800 Parents: df4aaa81ef5a65056e09958a5ab62fa8d296bfc1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=599d7a3968cfaf0317adca52bfb0e73ba3e3f52a Log: Fix bug #68706 - uninitalized pointer in mbstring Bugs: https://bugs.php.net/68706 Changed paths: M ext/mbstring/mbstring.c Diff: diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index d816ee5..90a94d6 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3890,7 +3890,7 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t size_t icnt; int state = 0; int crlf_state = -1; - char *token; + char *token = NULL; size_t token_pos; zend_string *fld_name, *fld_val; @@ -3917,8 +3917,9 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t } if (state == 0 || state == 1) { - fld_name = zend_string_init(token, token_pos, 0); - + if(token) { + fld_name = zend_string_init(token, token_pos, 0); + } state = 2; } else { token_pos++; @@ -3982,7 +3983,9 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t case 3: if (crlf_state == -1) { - fld_val = zend_string_init(token, token_pos, 0); + if(token) { + fld_val = zend_string_init(token, token_pos, 0); + } if (fld_name != NULL && fld_val != NULL) { zval val; @@ -4029,8 +4032,9 @@ out: state = 3; } if (state == 3) { - fld_val = zend_string_init(token, 0, 0); - + if(token) { + fld_val = zend_string_init(token, token_pos, 0); + } if (fld_name != NULL && fld_val != NULL) { zval val; /* FIXME: some locale free implementation is

« previous php.cvs (#83952) next »