diff options
| author | danielk1977 <danielk1977@noemail.net> | 2004-05-27 10:30:52 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2004-05-27 10:30:52 +0000 |
| commit | f93bbbea471def025db1036630b735bd3b2d4177 (patch) | |
| tree | b5ae21ea013553b4e1d5dd7c6b29a49d6447038a /src/test1.c | |
| parent | c572ef7fcd5a400d78317cd8a77ee684b0136c0b (diff) | |
| download | sqlite-f93bbbea471def025db1036630b735bd3b2d4177.tar.gz sqlite-f93bbbea471def025db1036630b735bd3b2d4177.zip | |
A few more bugfixes. Test cases pass now. (CVS 1472)
FossilOrigin-Name: c9e3015faffb650d8dbf1f7f95a7057a36361bac
Diffstat (limited to 'src/test1.c')
| -rw-r--r-- | src/test1.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/test1.c b/src/test1.c index 095e5b276..c3ec5ded1 100644 --- a/src/test1.c +++ b/src/test1.c @@ -13,7 +13,7 @@ ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** -** $Id: test1.c,v 1.62 2004/05/27 09:28:43 danielk1977 Exp $ +** $Id: test1.c,v 1.63 2004/05/27 10:31:10 danielk1977 Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -1585,6 +1585,7 @@ static int test_stmt_utf8( sqlite3_stmt *pStmt; int col; const char *(*xFunc)(sqlite3_stmt*, int) = clientData; + const char *zRet; if( objc!=3 ){ Tcl_AppendResult(interp, "wrong # args: should be \"", @@ -1594,7 +1595,10 @@ static int test_stmt_utf8( if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[2], &col) ) return TCL_ERROR; - Tcl_SetResult(interp, (char *)xFunc(pStmt, col), 0); + zRet = xFunc(pStmt, col); + if( zRet ){ + Tcl_SetResult(interp, (char *)zRet, 0); + } return TCL_OK; } @@ -1627,8 +1631,10 @@ static int test_stmt_utf16( if( Tcl_GetIntFromObj(interp, objv[2], &col) ) return TCL_ERROR; zName16 = xFunc(pStmt, col); - pRet = Tcl_NewByteArrayObj(zName16, sqlite3utf16ByteLen(zName16, -1)+2); - Tcl_SetObjResult(interp, pRet); + if( zName16 ){ + pRet = Tcl_NewByteArrayObj(zName16, sqlite3utf16ByteLen(zName16, -1)+2); + Tcl_SetObjResult(interp, pRet); + } return TCL_OK; } |