commit b97759ed11a2bf80265afee2c1c8b431c8c67201
author drh <drh@noemail.net> Tue Jun 29 11:26:59 2004 +0000
committer drh <drh@noemail.net> Tue Jun 29 11:26:59 2004 +0000
tree e968038f3a7b8d54f83c06ddaf4fdca7854308ed
parent fd69dd6b3d137d075a7b57f3eceb1bbce3e6f17b

Add testing for sqlite3_trace() and fix a bug. (CVS 1760)

FossilOrigin-Name: 7a15391079ae9ce5360fa13e8779c8872885e789

src/main.c

diff --git a/src/main.c b/src/main.c
index e4c4006..0bb3496 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.240 2004/06/29 10:53:55 drh Exp $
+** $Id: main.c,v 1.241 2004/06/29 11:26:59 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -981,7 +981,7 @@
       char *tmpSql = sqliteStrNDup(zSql, sParse.zTail - zSql);
       if( tmpSql ){
         db->xTrace(db->pTraceArg, tmpSql);
-        free(tmpSql);
+        sqliteFree(tmpSql);
       }else{
         /* If a memory error occurred during the copy,
         ** trace entire SQL string and fall through to the

src/tclsqlite.c

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 361aa59..ab08ad4 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.90 2004/06/21 06:50:28 danielk1977 Exp $
+** $Id: tclsqlite.c,v 1.91 2004/06/29 11:26:59 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -858,6 +858,7 @@
   case DB_TRACE: {
     if( objc>3 ){
       Tcl_WrongNumArgs(interp, 2, objv, "?CALLBACK?");
+      return TCL_ERROR;
     }else if( objc==2 ){
       if( pDb->zTrace ){
         Tcl_AppendResult(interp, pDb->zTrace, 0);