cvs: php4(PHP_4_3) /ext/odbc php_odbc.c php_odbc.h

wez Wed Apr 30 06:46:44 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/odbc php_odbc.c php_odbc.h Log: MFH: Fix memory leak and enable for IBM DB2. Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.143.2.6 php4/ext/odbc/php_odbc.c:1.143.2.7 --- php4/ext/odbc/php_odbc.c:1.143.2.6 Tue Mar 11 23:46:15 2003 +++ php4/ext/odbc/php_odbc.c Wed Apr 30 06:46:43 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.143.2.6 2003/03/12 04:46:15 iliaa Exp $ */ +/* $Id: php_odbc.c,v 1.143.2.7 2003/04/30 10:46:43 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -84,7 +84,7 @@ PHP_FE(odbc_error, NULL) PHP_FE(odbc_errormsg, NULL) PHP_FE(odbc_exec, NULL) -#ifdef HAVE_DBMAKER +#ifdef PHP_ODBC_HAVE_FETCH_HASH PHP_FE(odbc_fetch_array, NULL) PHP_FE(odbc_fetch_object, NULL) #endif @@ -1346,7 +1346,7 @@ } /* }}} */ -#ifdef HAVE_DBMAKER +#ifdef PHP_ODBC_HAVE_FETCH_HASH #define ODBC_NUM 1 #define ODBC_OBJECT 2 @@ -1414,6 +1414,8 @@ RETURN_FALSE; } + array_init(return_value); + #ifdef HAVE_SQL_EXTENDED_FETCH if (rownum > 0 && result->fetch_abs) result->fetched = rownum; @@ -1422,8 +1424,7 @@ result->fetched++; for(i = 0; i < result->numcols; i++) { - ALLOC_ZVAL(tmp); - tmp->refcount = 1; + ALLOC_INIT_ZVAL(tmp); Z_TYPE_P(tmp) = IS_STRING; Z_STRLEN_P(tmp) = 0; sql_c_type = SQL_C_CHAR; Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.48.4.1 php4/ext/odbc/php_odbc.h:1.48.4.2 --- php4/ext/odbc/php_odbc.h:1.48.4.1 Tue Dec 31 11:35:05 2002 +++ php4/ext/odbc/php_odbc.h Wed Apr 30 06:46:43 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.48.4.1 2002/12/31 16:35:05 sebastian Exp $ */ +/* $Id: php_odbc.h,v 1.48.4.2 2003/04/30 10:46:43 wez Exp $ */ #ifndef PHP_ODBC_H #define PHP_ODBC_H @@ -33,6 +33,10 @@ extern zend_module_entry odbc_module_entry; #define odbc_module_ptr &odbc_module_entry +#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) +# define PHP_ODBC_HAVE_FETCH_HASH 1 +#endif + /* user functions */ PHP_MINIT_FUNCTION(odbc); PHP_MSHUTDOWN_FUNCTION(odbc); @@ -54,7 +58,7 @@ PHP_FUNCTION(odbc_do); PHP_FUNCTION(odbc_exec); PHP_FUNCTION(odbc_execute); -#ifdef HAVE_DBMAKER +#ifdef PHP_ODBC_HAVE_FETCH_HASH PHP_FUNCTION(odbc_fetch_array); PHP_FUNCTION(odbc_fetch_object); #endif