diff options
| author | Frank M. Kromann <fmk@php.net> | 2000-10-20 19:55:03 +0000 |
|---|---|---|
| committer | Frank M. Kromann <fmk@php.net> | 2000-10-20 19:55:03 +0000 |
| commit | a2cb42039f9bfff4c173cec1187a9fe6e5207cda (patch) | |
| tree | 3507de8f94c0c2697fcc3609075de32a3687d41e /ext/mssql/php_mssql.c | |
| parent | 222d00471413d12cca248839c90b5312690fa190 (diff) | |
| download | php-git-a2cb42039f9bfff4c173cec1187a9fe6e5207cda.tar.gz | |
Fixing bug in mssql_fetch_object() and mssql_close()
Diffstat (limited to 'ext/mssql/php_mssql.c')
| -rw-r--r-- | ext/mssql/php_mssql.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 9ae0a28daa..94e2a40b1c 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -12,7 +12,7 @@ | 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> | +----------------------------------------------------------------------+ */ @@ -620,7 +620,11 @@ PHP_FUNCTION(mssql_close) 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_FUNCTION(mssql_fetch_object) 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; } } |