aboutsummaryrefslogtreecommitdiff
path: root/src/test_malloc.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2015-07-24 14:17:17 +0000
committerdan <dan@noemail.net>2015-07-24 14:17:17 +0000
commit03bc525a51bc6eec1409aa59ba09d8711eac405e (patch)
tree676292ffc7d0a00ff5d1e3b423a398ce5dffd307 /src/test_malloc.c
parentf6972c376425c8a548efac5c8c6f06d5e1c39109 (diff)
downloadsqlite-03bc525a51bc6eec1409aa59ba09d8711eac405e.tar.gz
sqlite-03bc525a51bc6eec1409aa59ba09d8711eac405e.zip
Modify a few test scripts to avoid leaving the sqlite3Config structure in a non-default state.
FossilOrigin-Name: 562687d9f56bf4bb0f5f07f97cbbb7649c81faf8
Diffstat (limited to 'src/test_malloc.c')
-rw-r--r--src/test_malloc.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/test_malloc.c b/src/test_malloc.c
index 94a228292..ed46e7a8d 100644
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -939,7 +939,7 @@ static int test_config_pagecache(
Tcl_Obj *CONST objv[]
){
int sz, N, rc;
- Tcl_Obj *pResult;
+ Tcl_Obj *pRes;
static char *buf = 0;
if( objc!=3 ){
Tcl_WrongNumArgs(interp, 1, objv, "SIZE N");
@@ -948,17 +948,20 @@ static int test_config_pagecache(
if( Tcl_GetIntFromObj(interp, objv[1], &sz) ) return TCL_ERROR;
if( Tcl_GetIntFromObj(interp, objv[2], &N) ) return TCL_ERROR;
free(buf);
+ buf = 0;
+
+ /* Set the return value */
+ pRes = Tcl_NewObj();
+ Tcl_ListObjAppendElement(0, pRes, Tcl_NewIntObj(sqlite3GlobalConfig.szPage));
+ Tcl_ListObjAppendElement(0, pRes, Tcl_NewIntObj(sqlite3GlobalConfig.nPage));
+ Tcl_SetObjResult(interp, pRes);
+
if( sz<0 ){
- buf = 0;
rc = sqlite3_config(SQLITE_CONFIG_PAGECACHE, 0, 0, 0);
}else{
buf = malloc( sz*N );
rc = sqlite3_config(SQLITE_CONFIG_PAGECACHE, buf, sz, N);
}
- pResult = Tcl_NewObj();
- Tcl_ListObjAppendElement(0, pResult, Tcl_NewIntObj(rc));
- Tcl_ListObjAppendElement(0, pResult, Tcl_NewIntObj(N));
- Tcl_SetObjResult(interp, pResult);
return TCL_OK;
}