diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-27 09:36:14 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-27 09:36:14 +0100 |
| commit | 1a9c8e1468399c99224c54c35ea25394650cfa3e (patch) | |
| tree | f5c37525463323628d8b4b6f8c14895eb57dce6a /connectivity | |
| parent | Merge branch 'libreoffice-6-4' into (diff) | |
| parent | tdf#131380 crash on loading specific xlsx document (diff) | |
| download | core-1a9c8e1468399c99224c54c35ea25394650cfa3e.tar.gz core-1a9c8e1468399c99224c54c35ea25394650cfa3e.zip | |
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Change-Id: I586df286d337e2f6d7986e2d9cea8271d9e72f3d
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/firebird/Util.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx index c4d6eeece4d1..572767851770 100644 --- a/connectivity/source/drivers/firebird/Util.cxx +++ b/connectivity/source/drivers/firebird/Util.cxx @@ -304,12 +304,12 @@ void firebird::mallocSQLVAR(XSQLDA* pSqlda) case SQL_TIMESTAMP: pVar->sqldata = static_cast<char*>(malloc(sizeof(ISC_TIMESTAMP))); break; + // an ARRAY is in fact a BLOB of a specialized type + // See https://firebirdsql.org/file/documentation/reference_manuals/fblangref25-en/html/fblangref25-datatypes-bnrytypes.html#fblangref25-datatypes-array + case SQL_ARRAY: case SQL_BLOB: pVar->sqldata = static_cast<char*>(malloc(sizeof(ISC_QUAD))); break; - case SQL_ARRAY: - assert(false); // TODO: implement - break; case SQL_TYPE_TIME: pVar->sqldata = static_cast<char*>(malloc(sizeof(ISC_TIME))); break; @@ -353,6 +353,9 @@ void firebird::freeSQLVAR(XSQLDA* pSqlda) case SQL_DOUBLE: case SQL_D_FLOAT: case SQL_TIMESTAMP: + // an ARRAY is in fact a BLOB of a specialized type + // See https://firebirdsql.org/file/documentation/reference_manuals/fblangref25-en/html/fblangref25-datatypes-bnrytypes.html#fblangref25-datatypes-array + case SQL_ARRAY: case SQL_BLOB: case SQL_INT64: case SQL_TYPE_TIME: @@ -364,9 +367,6 @@ void firebird::freeSQLVAR(XSQLDA* pSqlda) pVar->sqldata = nullptr; } break; - case SQL_ARRAY: - assert(false); // TODO: implement - break; case SQL_NULL: assert(false); // TODO: implement break; |