com php-src: Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability: ext/standard/info.c ext/standard/tests/general
_functions/bug67498.phpt

From: Date: Tue, 24 Jun 2014 17:29:26 +0000
Subject: com php-src: Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability: ext/standard/info.c ext/standard/tests/general
_functions/bug67498.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-79047@lists.php.net to get a copy of this message
Commit: 84f9fe0fdcc660d7f2b479b4cd5dd4216e3bc5ff Author: Stanislav Malyshev <stas@php.net> Mon, 23 Jun 2014 00:19:37 -0700 Parents: b03993dde90b59a6b80ede62a6a268c5b4d390f6 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=84f9fe0fdcc660d7f2b479b4cd5dd4216e3bc5ff Log: Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability Bugs: https://bugs.php..net/67498 Changed paths: M ext/standard/info.c A ext/standard/tests/general_functions/bug67498.phpt Diff: diff --git a/ext/standard/info.c b/ext/standard/info.c index 03ced35..0626a70 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -866,16 +866,16 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) php_info_print_table_start(); php_info_print_table_header(2, "Variable", "Value"); - if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE) { + if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) { php_info_print_table_row(2, "PHP_SELF", Z_STRVAL_PP(data)); } - if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE) { + if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) { php_info_print_table_row(2, "PHP_AUTH_TYPE", Z_STRVAL_PP(data)); } - if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE) { + if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) { php_info_print_table_row(2, "PHP_AUTH_USER", Z_STRVAL_PP(data)); } - if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) { + if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) { php_info_print_table_row(2, "PHP_AUTH_PW", Z_STRVAL_PP(data)); } php_print_gpcse_array(ZEND_STRL("_REQUEST") TSRMLS_CC); diff --git a/ext/standard/tests/general_functions/bug67498.phpt b/ext/standard/tests/general_functions/bug67498.phpt new file mode 100644 index 0000000..5b5951b --- /dev/null +++ b/ext/standard/tests/general_functions/bug67498.phpt @@ -0,0 +1,15 @@ +--TEST-- +phpinfo() Type Confusion Information Leak Vulnerability +--FILE-- +<?php +$PHP_SELF = 1; +phpinfo(INFO_VARIABLES); + +?> +==DONE== +--EXPECTF-- +phpinfo() + +PHP Variables +%A +==DONE==

« previous php.cvs (#79047) next »