cvs: php4 /ext/mssql php_mssql.c

fmk Fri Oct 20 12:55:03 2000 EDT Modified files: /php4/ext/mssql php_mssql.c Log: Fixing bug in mssql_fetch_object() and mssql_close() Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.27 php4/ext/mssql/php_mssql.c:1.28 --- php4/ext/mssql/php_mssql.c:1.27 Fri Oct 20 11:25:05 2000 +++ php4/ext/mssql/php_mssql.c Fri Oct 20 12:55:03 2000 @@ -12,11 +12,11 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Frank M. Kromann <fmk@businesnet.dk> | + | Authors: Frank M. Kromann <fmk@swwwing.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.27 2000/10/20 18:25:05 andrei Exp $ */ +/* $Id: php_mssql.c,v 1.28 2000/10/20 19:55:03 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -620,8 +620,12 @@ break; } ZEND_FETCH_RESOURCE2(mssql_ptr, mssql_link *, mssql_link_index, id, "MS SQL-Link", le_link, le_plink); - zend_list_delete((*mssql_link_index)->value.lval); + if (mssql_link_index) + zend_list_delete((*mssql_link_index)->value.lval); + else + zend_list_delete(id); + RETURN_TRUE; } @@ -1048,6 +1052,8 @@ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); if (return_value->type==IS_ARRAY) { return_value->type=IS_OBJECT; + return_value->value.obj.properties = return_value->value.ht; + return_value->value.obj.ce = &zend_standard_class_def; } }