From f41dcf9f4ca75b8964994c9bdd7c1461ee4922bb Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Tue, 22 Nov 2016 00:12:23 +0800 Subject: [PATCH] KYLIN-2121 fix infinite SQLMoreResults calls by Excel/PowerBI --- odbc/Driver/KO_FETCH.CPP | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/odbc/Driver/KO_FETCH.CPP b/odbc/Driver/KO_FETCH.CPP index 880ed10..2153f97 100644 --- a/odbc/Driver/KO_FETCH.CPP +++ b/odbc/Driver/KO_FETCH.CPP @@ -699,7 +699,13 @@ RETCODE SQL_API SQLMoreResults ( HSTMT pStmt ) __ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "SQLMoreResults called" ) ); pODBCStmt odbcStmt = ( pODBCStmt )pStmt; - if ( odbcStmt -> IRD . RowDesc != NULL ) + + // check if stmt been released already + if ( ! odbcStmt -> Prepared ) + { + return SQL_NO_DATA; + } + else if ( odbcStmt -> IRD . RowDesc != NULL ) { // ------- THIS CASE SHOULD NOT OCCUR ---------- // check if position is currently unknown -- 2.10.0