com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: Zend/zend _highlight.c ext/pdo_mysql/pdo_mysql.c

From: Date: Mon, 24 Feb 2014 09:16:31 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: Zend/zend _highlight.c ext/pdo_mysql/pdo_mysql.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76193@lists.php.net to get a copy of this message
Commit: 94cfa3a120f8de63b446f0f9842c21f8bbd8e7bf Author: Anatol Belski <ab@php.net> Mon, 24 Feb 2014 10:16:31 +0100 Parents: 734d1b8e6fbef213d3b475c3872ebaae763da0c6 60ed3f78bdab82b21c67b12ecd31ff7fd710e4f2 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94cfa3a120f8de63b446f0f9842c21f8bbd8e7bf Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport * origin/PHP-5.6: fixed macro add clear_env option to FPM config Make sure value is initialized We can't dereference dbh if it is NULL Changed paths: MM Zend/zend_highlight.c MM ext/pdo_mysql/pdo_mysql.c Diff: diff --cc Zend/zend_highlight.c index 3bc94ad,e4f8d02..02051b3 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@@ -54,10 -54,10 +54,10 @@@ ZEND_API void zend_html_putc(char c } -ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) +ZEND_API void zend_html_puts(const char *s, zend_size_t len TSRMLS_DC) { const unsigned char *ptr = (const unsigned char*)s, *end = ptr + len; - unsigned char *filtered; + unsigned char *filtered = NULL; size_t filtered_len; if (LANG_SCNG(output_filter)) {

« previous php.cvs (#76193) next »