php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixing crash when listing databsaes

Browse Source 
Fixing rowcount to woirk when the result contains an array og data.
This commit is contained in:
Frank M. Kromann
2001-04-03 18:09:02 +00:00
parent 83b5a2fb0c
commit 8003b3aa9d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ext/fbsql/php_fbsql.c
View File

@@ -1745,6 +1745,7 @@ PHP_FUNCTION(fbsql_list_dbs)
phpResult->connection = NULL;
phpResult->fetchHandle = NULL;
phpResult->rowHandler = NULL;
phpResult->ResultmetaData = NULL;
phpResult->metaData = NULL;
phpResult->batchSize = FB_SQL_G(batchSize);
phpResult->columnCount = 1;
@@ -1763,11 +1764,11 @@ PHP_FUNCTION(fbsql_list_dbs)
phpLink->results = realloc(phpLink->results,sizeof(PHPFBResult*)* phpLink->resultCount);
for (j=i; j < phpLink->resultCount ; j++)phpLink->results[j] = NULL;
}
phpLink->results[i] = phpResult;
phpLink->results[i] = phpResult;
return_value->value.lval = phpResult->index;
return_value->type = IS_LONG;
FB_SQL_G(resultIndex) = phpResult->index;
FB_SQL_G(linkIndex) = phpLink->index;
return_value->type = IS_LONG;
FB_SQL_G(resultIndex) = phpResult->index;
FB_SQL_G(linkIndex) = phpLink->index;
}
/* }}} */
@@ -2447,11 +2448,15 @@ PHP_FUNCTION(fbsql_num_rows)
result = phpfbGetResult(resultIndex);
if (result == NULL) RETURN_FALSE;
rowCount = fbcmdRowCount (result->metaData);
if (rowCount == -1)
{
phpfbFetchRow(result,0x7fffffff);
if (result->array)
rowCount = result->rowCount;
else {
rowCount = fbcmdRowCount(result->metaData);
if (rowCount == -1)
{
phpfbFetchRow(result,0x7fffffff);
rowCount = result->rowCount;
}
}
return_value->value.lval = rowCount;
return_value->type = IS_LONG;