[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/firebird/StatementCommonBase.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 939c5b7c2421b226e555cfd14d35d699be787b32
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Jun 11 19:24:03 2014 +0200

    Related fdo#79714 OSX-crash opening query or table in embedded Firebird ODB
    
    See https://bugs.freedesktop.org/attachment.cgi?id=100839 and other comments
    
    Cherry-picked from 0acd0ed3a58698a34e11dd82f3368a983f8530df
    
    Change-Id: I1187b171caf54997f5e8850ade4a3fb35ad9ec29
    Reviewed-on: https://gerrit.libreoffice.org/9741
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 381b14b..49415fa 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -194,6 +194,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql,
         free(pOutSqlda);
         pOutSqlda = (XSQLDA*) malloc(XSQLDA_LENGTH(n));
         pOutSqlda->version = SQLDA_VERSION1;
+        pOutSqlda->sqln = n;
         aErr = isc_dsql_describe(m_statusVector,
                                  &m_aStatementHandle,
                                  1,