diff options
| author | drh <drh@noemail.net> | 2011-06-21 01:29:16 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2011-06-21 01:29:16 +0000 |
| commit | 34ffcfff0207a6b41e8b8bc3c5e4c1c7bd6a32ae (patch) | |
| tree | 832dc6bbf38cac3893ec5c03f6dca22b78839167 /src/tclsqlite.c | |
| parent | 467eb01caa841f93c1d6c25f0fc192f052343dbe (diff) | |
| parent | 3c22c604344462ab2cd3fa0be9a4ce4e101eb0b2 (diff) | |
| download | sqlite-34ffcfff0207a6b41e8b8bc3c5e4c1c7bd6a32ae.tar.gz sqlite-34ffcfff0207a6b41e8b8bc3c5e4c1c7bd6a32ae.zip | |
Merge the latest trunk changes into the sessions branch.
FossilOrigin-Name: f3d148e0d10e16cd744ec88a2961fd617368c5ed
Diffstat (limited to 'src/tclsqlite.c')
| -rw-r--r-- | src/tclsqlite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 1bda78b30..8894b4f69 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -805,7 +805,7 @@ static void tclSqlFunc(sqlite3_context *context, int argc, sqlite3_value**argv){ case SQLITE_INTEGER: { sqlite_int64 v = sqlite3_value_int64(pIn); if( v>=-2147483647 && v<=2147483647 ){ - pVal = Tcl_NewIntObj(v); + pVal = Tcl_NewIntObj((int)v); }else{ pVal = Tcl_NewWideIntObj(v); } @@ -1485,7 +1485,7 @@ static Tcl_Obj *dbEvalColumnValue(DbEvalContext *p, int iCol){ case SQLITE_INTEGER: { sqlite_int64 v = sqlite3_column_int64(pStmt, iCol); if( v>=-2147483647 && v<=2147483647 ){ - return Tcl_NewIntObj(v); + return Tcl_NewIntObj((int)v); }else{ return Tcl_NewWideIntObj(v); } @@ -2452,7 +2452,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ } if( zNull && len>0 ){ pDb->zNull = Tcl_Alloc( len + 1 ); - strncpy(pDb->zNull, zNull, len); + memcpy(pDb->zNull, zNull, len); pDb->zNull[len] = '\0'; }else{ pDb->zNull = 0; |