cvs: php-src(PHP_5_2) /ext/standard info.c
| From: | Antony Dovgal | Date: | Tue, 08 Aug 2006 13:12:00 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/standard info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39837@lists.php.net to get a copy of this message | ||
tony2001 Tue Aug 8 13:12:00 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard info.c
Log:
zend_hash_get_current_key_ex() returns string_len + 1, so we need to subtract 1 to get the real
length
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.4&r2=1.249.2.10.2.5&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.4 php-src/ext/standard/info.c:1.249.2.10.2.5
--- php-src/ext/standard/info.c:1.249.2.10.2.4 Tue Aug 8 10:36:58 2006
+++ php-src/ext/standard/info.c Tue Aug 8 13:12:00 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.249.2.10.2.4 2006/08/08 10:36:58 pajoye Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.5 2006/08/08 13:12:00 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -133,9 +133,9 @@
switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(data), &string_key, &string_len,
&num_key, 0, NULL)) {
case HASH_KEY_IS_STRING:
if (!sapi_module.phpinfo_as_text) {
- php_info_html_esc_write(string_key, string_len TSRMLS_CC);
+ php_info_html_esc_write(string_key, string_len - 1 TSRMLS_CC);
} else {
- PHPWRITE(string_key, string_len);
+ PHPWRITE(string_key, string_len - 1);
}
break;
case HASH_KEY_IS_LONG: