aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordanielk1977 <danielk1977@noemail.net>2008-11-03 09:39:45 +0000
committerdanielk1977 <danielk1977@noemail.net>2008-11-03 09:39:45 +0000
commite435975093dcde5e14bbe102c79e5a325672e9d7 (patch)
tree28bb88bd573b6f2b4cab28e31091425da54ac8de /src
parent3072c5ea11634ad57d577352f46cea375057d5ce (diff)
downloadsqlite-e435975093dcde5e14bbe102c79e5a325672e9d7.tar.gz
sqlite-e435975093dcde5e14bbe102c79e5a325672e9d7.zip
Modify an assert() statement to fix #3473. No other code changes. (CVS 5856)
FossilOrigin-Name: aca6b260c0dd1a1515b70f3567a0653b6bcdeea2
Diffstat (limited to 'src')
-rw-r--r--src/vdbeaux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 54ea74055..328aed782 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
** to version 2.8.7, all this code was combined into the vdbe.c source file.
** But that file was getting too big so this subroutines were split out.
**
-** $Id: vdbeaux.c,v 1.413 2008/10/31 10:53:23 danielk1977 Exp $
+** $Id: vdbeaux.c,v 1.414 2008/11/03 09:39:45 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -1969,7 +1969,7 @@ u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){
if( flags&MEM_Real ){
return 7;
}
- assert( flags&(MEM_Str|MEM_Blob) );
+ assert( pMem->db->mallocFailed || flags&(MEM_Str|MEM_Blob) );
n = pMem->n;
if( flags & MEM_Zero ){
n += pMem->u.i;