diff options
author | drh <drh@noemail.net> | 2008-03-18 00:07:10 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2008-03-18 00:07:10 +0000 |
commit | 5efaf070991267cf9c8b4b7e5b3ed1e512d50d41 (patch) | |
tree | ec05016771424a599c25f6036830b1f7746edd99 /src/test_malloc.c | |
parent | 0e8ebe51689d6fbb2595d521c639e73b387764c5 (diff) | |
download | sqlite-5efaf070991267cf9c8b4b7e5b3ed1e512d50d41.tar.gz sqlite-5efaf070991267cf9c8b4b7e5b3ed1e512d50d41.zip |
Add the ability to simulate out-of-memory errors when using the default
memory allocator, mem1.c. Fix a bug that this enhancement revealed. (CVS 4875)
FossilOrigin-Name: d55a5e1c11ef90534abd2e5f18d06dd4739ade70
Diffstat (limited to 'src/test_malloc.c')
-rw-r--r-- | src/test_malloc.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/test_malloc.c b/src/test_malloc.c index 86a32059f..38708009a 100644 --- a/src/test_malloc.c +++ b/src/test_malloc.c @@ -13,7 +13,7 @@ ** This file contains code used to implement test interfaces to the ** memory allocation subsystem. ** -** $Id: test_malloc.c,v 1.15 2008/02/19 15:15:16 drh Exp $ +** $Id: test_malloc.c,v 1.16 2008/03/18 00:07:11 drh Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -463,18 +463,14 @@ static int test_memdebug_pending( int objc, Tcl_Obj *CONST objv[] ){ + int nPending; if( objc!=1 ){ Tcl_WrongNumArgs(interp, 1, objv, ""); return TCL_ERROR; } - -#if defined(SQLITE_MEMDEBUG) || defined(SQLITE_POW2_MEMORY_SIZE) - { - int nPending = sqlite3_test_control(SQLITE_TESTCTRL_FAULT_PENDING, - SQLITE_FAULTINJECTOR_MALLOC); - Tcl_SetObjResult(interp, Tcl_NewIntObj(nPending)); - } -#endif + nPending = sqlite3_test_control(SQLITE_TESTCTRL_FAULT_PENDING, + SQLITE_FAULTINJECTOR_MALLOC); + Tcl_SetObjResult(interp, Tcl_NewIntObj(nPending)); return TCL_OK; } |