From 8e988473ddc38d0e7be4f2cde33f07f7ab20ca3b Mon Sep 17 00:00:00 2001 From: Nick Nevzorov <62462330+NickNevzorov@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:53:00 +0200 Subject: [PATCH 1/3] Update build num -> 16 --- WriteBuildNo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WriteBuildNo.h b/WriteBuildNo.h index ae99d2e..5a382f7 100644 --- a/WriteBuildNo.h +++ b/WriteBuildNo.h @@ -4,4 +4,4 @@ // Note - there must be two tabs between BUILDNUM_VERSION and // the actual number, otherwise the makefile for linux will not // pick up the value. -#define BUILDNUM_VERSION 15 +#define BUILDNUM_VERSION 16 From d366ff3fd1c7894d122c67625d566bcaab18bdbf Mon Sep 17 00:00:00 2001 From: Nick Nevzorov <62462330+NickNevzorov@users.noreply.github.com> Date: Mon, 16 Dec 2024 21:24:34 +0200 Subject: [PATCH 2/3] https://github.com/FirebirdSQL/firebird-odbc-driver/issues/236 --- IscDbc/Attachment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IscDbc/Attachment.cpp b/IscDbc/Attachment.cpp index 998cbc6..a7b47d8 100644 --- a/IscDbc/Attachment.cpp +++ b/IscDbc/Attachment.cpp @@ -357,7 +357,7 @@ void Attachment::openDatabase(const char *dbName, Properties *properties) if( ( check_status.getState() & IStatus::STATE_ERRORS ) == 0 ) { - for (auto p = result; p < result + sizeof (result) && *p != isc_info_end;) + for (auto p = result; p < result + sizeof (result) && *p != isc_info_end && *p != isc_info_truncated;) { char item = *p++; int length = GDS->_vax_integer (p, 2); From df55cb7a52d8fe12d80f833e445d4af652001029 Mon Sep 17 00:00:00 2001 From: Nick Nevzorov <62462330+NickNevzorov@users.noreply.github.com> Date: Tue, 17 Dec 2024 14:58:42 +0200 Subject: [PATCH 3/3] Update Attachment.cpp --- IscDbc/Attachment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IscDbc/Attachment.cpp b/IscDbc/Attachment.cpp index a7b47d8..fe549e1 100644 --- a/IscDbc/Attachment.cpp +++ b/IscDbc/Attachment.cpp @@ -42,11 +42,11 @@ static char databaseInfoItems [] = { isc_info_db_id, isc_info_db_sql_dialect, isc_info_base_level, - isc_info_user_names, isc_info_ods_version, isc_info_firebird_version, isc_info_version, isc_info_page_size, + isc_info_user_names, isc_info_end };