cvs: php-src /ext/pdo pdo.c pdo_stmt.c

wez Fri Mar 11 20:16:59 2005 EDT Modified files: /php-src/ext/pdo pdo.c pdo_stmt.c Log: show list of PDO drivers in phpinfo. Highlight a possible problem area; iterator leaks when used in foreach(), at least with sqlite2 driver. http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.43&r2=1.44&ty=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.43 php-src/ext/pdo/pdo.c:1.44 --- php-src/ext/pdo/pdo.c:1.43 Wed Mar 9 00:03:57 2005 +++ php-src/ext/pdo/pdo.c Fri Mar 11 20:16:59 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.43 2005/03/09 05:03:57 wez Exp $ */ +/* $Id: pdo.c,v 1.44 2005/03/12 01:16:59 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -389,8 +389,21 @@ /* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(pdo) { + HashPosition pos; + ulong num_key; + char *name; + int namelen; + php_info_print_table_start(); php_info_print_table_header(2, "pdo support", "enabled"); + php_info_print_table_header(1, "Available PDO Drivers"); + + zend_hash_internal_pointer_reset_ex(&pdo_driver_hash, &pos); + while (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(&pdo_driver_hash, &name, &namelen, &num_key, 0, &pos)) { + php_info_print_table_row(1, name); + zend_hash_move_forward_ex(&pdo_driver_hash, &pos); + } + php_info_print_table_end(); #if 0 http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.91&r2=1.92&ty=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.91 php-src/ext/pdo/pdo_stmt.c:1.92 --- php-src/ext/pdo/pdo_stmt.c:1.91 Wed Mar 9 00:50:03 2005 +++ php-src/ext/pdo/pdo_stmt.c Fri Mar 11 20:16:59 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.91 2005/03/09 05:50:03 wez Exp $ */ +/* $Id: pdo_stmt.c,v 1.92 2005/03/12 01:16:59 wez Exp $ */ /* The PDO Statement Handle Class */ @@ -1939,7 +1939,7 @@ return; } - ptr_ptr = emalloc(sizeof(*ptr_ptr)); + ptr_ptr = emalloc(sizeof(*ptr_ptr)); /* leaks somewhere */ *ptr_ptr = I->fetch_ahead; ZVAL_ADDREF(I->fetch_ahead);