cvs: /php4 ChangeLog /php4/ext/oracle oracle.c

thies Thu Sep 23 06:23:12 1999 EDT Modified files: /php4 ChangeLog /php4/ext/oracle oracle.c Log: Ora_Fetch_Into now resets the returned array in all cases Index: php4/ChangeLog diff -u php4/ChangeLog:1.131 php4/ChangeLog:1.132 --- php4/ChangeLog:1.131 Thu Sep 23 05:15:37 1999 +++ php4/ChangeLog Thu Sep 23 06:23:11 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ?? 1999, Version 4.0 Beta 3 +- Ora_Fetch_Into now resets the returned array in all cases (Thies) - Fixed NULL-Column problem in Oracle-Driver (Thies) - Added extra metadata functions to ODBC, SQLTables etc (nick@easysoft.com) - Fixed SEGV in mcal make_event_object() (Andrew Skalski) Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.20 php4/ext/oracle/oracle.c:1.21 --- php4/ext/oracle/oracle.c:1.20 Thu Sep 23 05:15:38 1999 +++ php4/ext/oracle/oracle.c Thu Sep 23 06:23:11 1999 @@ -1125,21 +1125,22 @@ RETURN_FALSE; } - if (arr->type != IS_ARRAY){ - if (array_init(arr) == FAILURE){ - php_error(E_WARNING, "Can't convert to type Array"); - RETURN_FALSE; - } - } - if (ofetch(&cursor->cda)) { if (cursor->cda.rc != NO_DATA_FOUND) { - php_error(E_WARNING, "Ora_Fetch_Into failed (%s)", - ora_error(&cursor->cda)); + php_error(E_WARNING, "Ora_Fetch_Into failed (%s)",ora_error(&cursor->cda)); } RETURN_FALSE; } cursor->fetched++; + + if (arr->type != IS_ARRAY){ + pval_destructor(arr); + if (array_init(arr) == FAILURE){ + php_error(E_WARNING, "Can't convert to type Array"); + RETURN_FALSE; + } + } + zend_hash_internal_pointer_reset(arr->value.ht); for (i = 0; i < cursor->ncols; i++) {