From e435975093dcde5e14bbe102c79e5a325672e9d7 Mon Sep 17 00:00:00 2001
From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 3 Nov 2008 09:39:45 +0000
Subject: [PATCH] Modify an assert() statement to fix #3473. No other code
 changes. (CVS 5856)

FossilOrigin-Name: aca6b260c0dd1a1515b70f3567a0653b6bcdeea2
---
 manifest         | 14 +++++++-------
 manifest.uuid    |  2 +-
 src/vdbeaux.c    |  4 ++--
 test/malloc.test |  8 +++++++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 881ed3d9de..ae0f2dfd13 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sreported\son\sthe\smailing\slist\striggered\sby\sthe\spattern\s"SELECT\s<col>,\s(SELECT\s...\sFROM\stbl\sWHERE\srowid\s>\s<col>)\sFROM\s...".\s(CVS\s5855)
-D 2008-11-03T09:06:06
+C Modify\san\sassert()\sstatement\sto\sfix\s#3473.\sNo\sother\scode\schanges.\s(CVS\s5856)
+D 2008-11-03T09:39:45
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in da817da72422f9b876602c225fcd17d6ca4182f7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -194,7 +194,7 @@ F src/vdbe.c e3629776ef4a49f997b271fbd83e54b6104d5607
 F src/vdbe.h 03516f28bf5aca00a53c4dccd6c313f96adb94f6
 F src/vdbeInt.h a20f479ec3bf41c61b0c2bd5176a9bad6b2a07ef
 F src/vdbeapi.c 6798c70cf176d23594ec557db88190ca8c7fa860
-F src/vdbeaux.c 16498c4d9fbf35510e67ddc253428ad077293df1
+F src/vdbeaux.c eb95136983edf82148cbfaa4cd7e61f2cc9e08e0
 F src/vdbeblob.c b0dcebfafedcf9c0addc7901ad98f6f986c08935
 F src/vdbefifo.c 20fda2a7c4c0bcee1b90eb7e545fefcdbf2e1de7
 F src/vdbemem.c c0e9d9947db8968762c7621369f821bb181c1c86
@@ -410,7 +410,7 @@ F test/lock4.test 09d97d52cae18fadfe631552af9880dac6b3ae90
 F test/lock5.test 904c20aec51d5dbff0a3aec6a4d35c5ae0257449
 F test/lookaside.test e69f822f13745f1d5c445c6e30e30f059f30c8e5
 F test/main.test 187a9a1b5248ed74a83838c581c15ec6023b555b
-F test/malloc.test 2fa351108503f0da80e9183a8157fbd943c5d533
+F test/malloc.test 248fc5e0be632d8db1d771ed5413a93c47212c5a
 F test/malloc3.test 4bc57f850b212f706f3e1b37c4eced1d5a727cd1
 F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
 F test/malloc5.test c8d0f7673337e8a29afa558735ae937a0d629751
@@ -653,7 +653,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c73d915923e393f72e1c0897526a20527db2e03c
-R 81b77b0f0b421033be987682a8d0b4be
+P 6c918c4eb9362ebfdbe0486515679102b2862970
+R 11bd9c69353728d156cb2dc9d152508e
 U danielk1977
-Z 86fef2c70c68267aff5116fbaf03ae0a
+Z f1b9543c8bb76418daec73052774fa00
diff --git a/manifest.uuid b/manifest.uuid
index 7687b4fe5e..ee80b1ec6a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c918c4eb9362ebfdbe0486515679102b2862970
\ No newline at end of file
+aca6b260c0dd1a1515b70f3567a0653b6bcdeea2
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 54ea740554..328aed782e 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;
diff --git a/test/malloc.test b/test/malloc.test
index 0b5677030a..835a3842b9 100644
--- a/test/malloc.test
+++ b/test/malloc.test
@@ -16,7 +16,7 @@
 # to see what happens in the library if a malloc were to really fail
 # due to an out-of-memory situation.
 #
-# $Id: malloc.test,v 1.68 2008/10/06 05:32:19 danielk1977 Exp $
+# $Id: malloc.test,v 1.69 2008/11/03 09:39:45 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -671,6 +671,12 @@ do_malloc_test 28 -sqlprep {
   SELECT * FROM v1;
 }
 
+do_malloc_test 29 -sqlprep {
+  CREATE TABLE t1(a TEXT, b TEXT);
+} -sqlbody {
+  INSERT INTO t1 VALUES(1, -234);
+}
+
 # Ensure that no file descriptors were leaked.
 do_test malloc-99.X {
   catch {db close}