abies Wed Aug 20 19:01:34 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/interbase interbase.c
Log:
MFH Fix false warning on zero-size BLOB fetch (introduced in RC3)
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.91.2.19
php-src/ext/interbase/interbase.c:1.91.2.20
--- php-src/ext/interbase/interbase.c:1.91.2.19 Sun Aug 17 12:43:49 2003
+++ php-src/ext/interbase/interbase.c Wed Aug 20 19:01:32 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.91.2.19 2003/08/17 16:43:49 abies Exp $ */
+/* $Id: interbase.c,v 1.91.2.20 2003/08/20 23:01:32 abies Exp $ */
/* TODO: Arrays, roles?
@@ -624,7 +624,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.19 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.20 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "yes");
#endif
@@ -2118,7 +2118,9 @@
ibase_blob_handle blob_handle;
unsigned long max_len = 0;
- char bl_items[] =
{isc_info_blob_total_length}, bl_info[20], *p;
+ static char bl_items[] =
{isc_info_blob_total_length};
+ char bl_info[20];
+ unsigned short i;
blob_handle.bl_handle = NULL;
blob_handle.bl_qd = *(ISC_QUAD ISC_FAR
*) var->sqldata;
@@ -2134,27 +2136,32 @@
}
/* find total length of blob's data */
- for (p = bl_info; *p != isc_info_end
&& p < bl_info + sizeof(bl_info);) {
- unsigned short item_len, item
= *p++;
+ for (i = 0; i < sizeof(bl_info); ) {
+ unsigned short item_len;
+ char item = bl_info[i++];
+
+ if (item == isc_info_end ||
item == isc_info_truncated ||
+ item == isc_info_error
|| i >= sizeof(bl_info)) {
+
+
_php_ibase_module_error("Could not determine BLOB size (internal error)");
+ RETURN_FALSE;
+ }
+
+ item_len = (unsigned short)
isc_vax_integer(&bl_info[i], 2);
- item_len = (unsigned short)
isc_vax_integer(p, 2);
- p += 2;
if (item ==
isc_info_blob_total_length) {
- max_len =
isc_vax_integer(p, item_len);
+ max_len =
isc_vax_integer(&bl_info[i+2], item_len);
break;
}
- p += item_len;
+ i += item_len+2;
}
if (max_len == 0) {
- _php_ibase_module_error("Could
not determine BLOB size (internal error)");
- RETURN_FALSE;
- }
-
- if (_php_ibase_blob_get(&tmp,
&blob_handle, max_len TSRMLS_CC) != SUCCESS) {
+ ZVAL_STRING(&tmp, "", 1);
+ } else if (_php_ibase_blob_get(&tmp,
&blob_handle, max_len TSRMLS_CC) != SUCCESS) {
RETURN_FALSE;
}
-
+
if (isc_close_blob(IB_STATUS,
&blob_handle.bl_handle)) {
zval_dtor(&tmp);
_php_ibase_error(TSRMLS_C);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
