Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
backport fix for _SQLAllocDesc
  • Loading branch information
freddy77 committed Apr 19, 2007
1 parent acb5fec commit 801f078
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
@@ -1,3 +1,6 @@
Thu Apr 19 10:36:12 CET 2007 Frediano Ziglio <freddy77_A_gmail_D_com>
* src/odbc/odbc.c: backport fix for _SQLAllocDesc

Wed Mar 02 11:38:22 CET 2007 Frediano Ziglio <freddy77_A_gmail_D_com>
* win32/dev-cpp/FreeTDS.dev win32/dev-cpp/Makefile.win:
* win32/msvc6/libTDS.dsp:
Expand Down
23 changes: 10 additions & 13 deletions src/odbc/odbc.c
Expand Up @@ -60,12 +60,12 @@
#include <dmalloc.h>
#endif

TDS_RCSID(var, "$Id: odbc.c,v 1.402.2.4 2007-02-02 16:23:30 freddy77 Exp $");
TDS_RCSID(var, "$Id: odbc.c,v 1.402.2.5 2007-04-19 08:37:05 freddy77 Exp $");

static SQLRETURN SQL_API _SQLAllocConnect(SQLHENV henv, SQLHDBC FAR * phdbc);
static SQLRETURN SQL_API _SQLAllocEnv(SQLHENV FAR * phenv);
static SQLRETURN SQL_API _SQLAllocStmt(SQLHDBC hdbc, SQLHSTMT FAR * phstmt);
static SQLRETURN SQL_API _SQLAllocDesc(SQLHDBC hdbc, SQLHSTMT FAR * phstmt);
static SQLRETURN SQL_API _SQLAllocDesc(SQLHDBC hdbc, SQLHDESC FAR * phstmt);
static SQLRETURN SQL_API _SQLFreeConnect(SQLHDBC hdbc);
static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption, int force);
Expand Down Expand Up @@ -1125,30 +1125,27 @@ SQLAllocEnv(SQLHENV FAR * phenv)
}

static SQLRETURN SQL_API
_SQLAllocDesc(SQLHDBC hdbc, SQLHSTMT FAR * phstmt)
_SQLAllocDesc(SQLHDBC hdbc, SQLHDESC FAR * phdesc)
{
TDS_DESC *desc = NULL;
int i;

INIT_HDBC;

for (i = 0; i < TDS_MAX_APP_DESC; ++i) {
if (dbc->uad[i] == NULL) {
dbc->uad[i] = desc_alloc(dbc, DESC_ARD, SQL_DESC_ALLOC_USER);
if (dbc->uad[i] == NULL) {
TDS_DESC *desc = desc_alloc(dbc, DESC_ARD, SQL_DESC_ALLOC_USER);
if (desc == NULL) {
odbc_errs_add(&dbc->errs, "HY001", NULL);
ODBC_RETURN(dbc, SQL_ERROR);
}
desc = dbc->uad[i];
dbc->uad[i] = desc;
*phdesc = (SQLHDESC) desc;
ODBC_RETURN_(dbc);
}
}

if (i == TDS_MAX_APP_DESC && desc == NULL) {
odbc_errs_add(&dbc->errs, "HY014", NULL);
ODBC_RETURN(dbc, SQL_ERROR);
}
*phstmt = (SQLHDESC) desc;
ODBC_RETURN_(dbc);
odbc_errs_add(&dbc->errs, "HY014", NULL);
ODBC_RETURN(dbc, SQL_ERROR);
}

static SQLRETURN SQL_API
Expand Down

0 comments on commit 801f078

Please sign in to comment.