firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 09:20:39 +01:00
Code Issues

Fix #8100 - The isc_array_lookup_bounds function returns invalid values for low and high array bounds.
All checks were successful
continuous-integration/drone Build is passing
Details

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2024-05-04 21:10:58 -03:00
parent 154a09a81c
commit 17b007d14f
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/yvalve/array.cpp
View File

@ -148,7 +148,8 @@ void iscArrayLookupBoundsImpl(Why::YAttachment* attachment,
LocalStatus status;
CheckStatusWrapper statusWrapper(&status);
iscArrayLookupDescImpl(attachment, transaction, relationName, fieldName, desc);
MetaString globalField;
iscArrayLookupDescImpl(attachment, transaction, relationName, fieldName, desc, &globalField);
ISC_ARRAY_BOUND* tail = desc->array_desc_bounds;
@ -161,7 +162,7 @@ void iscArrayLookupBoundsImpl(Why::YAttachment* attachment,
)""";
FB_MESSAGE(InputMessage, CheckStatusWrapper,
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN * 4), fieldName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), fieldName)
) inputMessage(&statusWrapper, MasterInterfacePtr());
inputMessage.clear();
@ -171,7 +172,7 @@ void iscArrayLookupBoundsImpl(Why::YAttachment* attachment,
) outputMessage(&statusWrapper, MasterInterfacePtr());
inputMessage->fieldNameNull = FB_FALSE;
inputMessage->fieldName.set((const char*) fieldName);
inputMessage->fieldName.set(globalField.c_str());
auto resultSet = makeNoIncRef(attachment->openCursor(&statusWrapper, transaction, 0, sql,
SQL_DIALECT_CURRENT, inputMessage.getMetadata(), inputMessage.getData(),
@ -190,7 +191,8 @@ void iscArrayLookupBoundsImpl(Why::YAttachment* attachment,
void iscArrayLookupDescImpl(Why::YAttachment* attachment,
Why::YTransaction* transaction, const SCHAR* relationName, const SCHAR* fieldName, ISC_ARRAY_DESC* desc)
Why::YTransaction* transaction, const SCHAR* relationName, const SCHAR* fieldName, ISC_ARRAY_DESC* desc,
MetaString* globalField)
{
LocalStatus status;
CheckStatusWrapper statusWrapper(&status);
@ -201,7 +203,8 @@ void iscArrayLookupDescImpl(Why::YAttachment* attachment,
desc->array_desc_flags = 0;
constexpr auto sql = R"""(
select f.rdb$field_type,
select f.rdb$field_name,
f.rdb$field_type,
f.rdb$field_scale,
f.rdb$field_length,
f.rdb$dimensions
@ -213,12 +216,13 @@ void iscArrayLookupDescImpl(Why::YAttachment* attachment,
)""";
FB_MESSAGE(InputMessage, CheckStatusWrapper,
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN * 4), relationName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN * 4), fieldName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), relationName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), fieldName)
) inputMessage(&statusWrapper, MasterInterfacePtr());
inputMessage.clear();
FB_MESSAGE(OutputMessage, CheckStatusWrapper,
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), fieldName)
(FB_INTEGER, fieldType)
(FB_INTEGER, fieldScale)
(FB_INTEGER, fieldLength)
@ -238,6 +242,9 @@ void iscArrayLookupDescImpl(Why::YAttachment* attachment,
if (resultSet->fetchNext(&statusWrapper, outputMessage.getData()) == IStatus::RESULT_OK)
{
if (globalField)
globalField->assign(outputMessage->fieldName.str, outputMessage->fieldName.length);
desc->array_desc_dtype = outputMessage->fieldTypeNull ? 0 : outputMessage->fieldType;
desc->array_desc_scale = outputMessage->fieldScaleNull ? 0 : outputMessage->fieldScale;
desc->array_desc_length = outputMessage->fieldLengthNull ? 0 : outputMessage->fieldLength;

4
src/yvalve/array_proto.h
View File

@ -24,6 +24,8 @@
#ifndef DSQL_ARRAY_PROTO_H
#define DSQL_ARRAY_PROTO_H
#include "../common/classes/MetaString.h"
namespace Why {
class YAttachment;
class YTransaction;
@ -58,6 +60,6 @@ void iscArrayLookupBoundsImpl(Why::YAttachment* attachment, Why::YTransaction* t
const SCHAR* relationName, const SCHAR* fieldName, ISC_ARRAY_DESC* desc);
void iscArrayLookupDescImpl(Why::YAttachment* attachment, Why::YTransaction* transaction,
const SCHAR* relationName, const SCHAR* fieldName, ISC_ARRAY_DESC* desc);
const SCHAR* relationName, const SCHAR* fieldName, ISC_ARRAY_DESC* desc, Firebird::MetaString* globalField);
#endif // DSQL_ARRAY_PROTO_H

8
src/yvalve/blob.cpp
View File

@ -154,8 +154,8 @@ void iscBlobLookupDescImpl(Why::YAttachment* attachment, Why::YTransaction* tran
)""";
FB_MESSAGE(InputMessage, CheckStatusWrapper,
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN * 4), relationName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN * 4), fieldName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), relationName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), fieldName)
) inputMessage(&statusWrapper, MasterInterfacePtr());
inputMessage.clear();
@ -197,8 +197,8 @@ void iscBlobLookupDescImpl(Why::YAttachment* attachment, Why::YTransaction* tran
)""";
FB_MESSAGE(InputMessage, CheckStatusWrapper,
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN * 4), procedureName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN * 4), fieldName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), procedureName)
(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), fieldName)
) inputMessage(&statusWrapper, MasterInterfacePtr());
inputMessage.clear();

2
src/yvalve/why.cpp
View File

@ -1618,7 +1618,7 @@ ISC_STATUS API_ROUTINE isc_array_lookup_desc(ISC_STATUS* userStatus, FB_API_HAND
RefPtr<YAttachment> attachment(translateHandle(attachments, dbHandle));
RefPtr<YTransaction> transaction(translateHandle(transactions, traHandle));
iscArrayLookupDescImpl(attachment, transaction, relationName, fieldName, desc);
iscArrayLookupDescImpl(attachment, transaction, relationName, fieldName, desc, nullptr);
}
catch (const Exception& e)
{