MonetDB: Dec2011 - ODBC: SQLGetData must be called with non-NULL...

[Sjoerd Mullender]

Changeset: a7c66cb264b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7c66cb264b8
Modified Files:
        clients/odbc/driver/ODBCConvert.c
        clients/odbc/driver/SQLGetData.c
Branch: Dec2011
Log Message:

ODBC: SQLGetData must be called with non-NULL TargetValuePtr.
This means that ODBCFetch is always called with non-NULL ptr argument.


diffs (27 lines):

diff --git a/clients/odbc/driver/ODBCConvert.c 
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -1009,6 +1009,8 @@ ODBCFetch(ODBCStmt *stmt,
        TIMESTAMP_STRUCT tsval;
        double fval = 0;
 
+       assert(ptr != NULL);
+
        ird = stmt->ImplRowDescr;
        ard = stmt->ApplRowDescr;
 
diff --git a/clients/odbc/driver/SQLGetData.c b/clients/odbc/driver/SQLGetData.c
--- a/clients/odbc/driver/SQLGetData.c
+++ b/clients/odbc/driver/SQLGetData.c
@@ -94,6 +94,11 @@ SQLGetData(SQLHSTMT StatementHandle,
                addStmtError(stmt, "07009", NULL, 0);
                return SQL_ERROR;
        }
+       if (TargetValuePtr == NULL) {
+               /* Invalid use of null pointer */
+               addStmtError(stmt, "HY009", NULL, 0);
+               return SQL_ERROR;
+       }
 
        if (Col_or_Param_Num != stmt->currentCol)
                stmt->retrieved = 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list