diff options
| author | drh <drh@noemail.net> | 2009-02-03 13:19:12 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2009-02-03 13:19:12 +0000 |
| commit | 2333606e9c62943f63b1b53e634b97f5367909ce (patch) | |
| tree | 119ec67467a485d8f782c95a361ce0a5c14e5ad7 /src/func.c | |
| parent | 478000cf5cece578f3347d6f5395b81e569bfd84 (diff) | |
| download | sqlite-2333606e9c62943f63b1b53e634b97f5367909ce.tar.gz sqlite-2333606e9c62943f63b1b53e634b97f5367909ce.zip | |
Fix a problem in check-in (6226) which could cause an assertion fault
following a malloc failure. The prior check-in was for ticket #3624. (CVS 6235)
FossilOrigin-Name: 1ffe44e9d6b49346a75850a977953de12c127069
Diffstat (limited to 'src/func.c')
| -rw-r--r-- | src/func.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/func.c b/src/func.c index d366112a8..e5542b3b0 100644 --- a/src/func.c +++ b/src/func.c @@ -16,7 +16,7 @@ ** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: func.c,v 1.219 2009/02/03 13:10:54 drh Exp $ +** $Id: func.c,v 1.220 2009/02/03 13:19:12 drh Exp $ */ #include "sqliteInt.h" #include <stdlib.h> @@ -843,7 +843,8 @@ static void replaceFunc( assert( zStr==sqlite3_value_text(argv[0]) ); /* No encoding change */ zPattern = sqlite3_value_text(argv[1]); if( zPattern==0 ){ - assert( sqlite3_value_type(argv[1])==SQLITE_NULL ); + assert( sqlite3_value_type(argv[1])==SQLITE_NULL + || sqlite3_context_db_handle(context)->mallocFailed ); return; } if( zPattern[0]==0 ){ |