Fix an OOM problem in where.c. (CVS 6060)

FossilOrigin-Name: d2105f617eeb04c8177546c45bf6c63e72757f91

manifest

@@ -1,5 +1,5 @@
-C Make\ssure\snOverflow\sis\salways\scleared\swhen\sa\spage\sis\sreleased.\s(CVS\s6059)
-D 2008-12-23T15:58:06
+C Fix\san\sOOM\sproblem\sin\swhere.c.\s(CVS\s6060)
+D 2008-12-23T16:23:05
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 77635d0909c2067cee03889a1e04ce910d8fb809
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -207,7 +207,7 @@ F src/vdbeblob.c b0dcebfafedcf9c0addc7901ad98f6f986c08935
 F src/vdbemem.c f9c859ac17e2e05a0f249868ce4f191f69edd31d
 F src/vtab.c e39e011d7443a8d574b1b9cde207a35522e6df43
 F src/walker.c 488c2660e13224ff70c0c82761118efb547f8f0d
-F src/where.c 50e47032adc8d16dc9d47223e961b662e28294f8
+F src/where.c 3f4e8020d605b06139b877a9714a10cc3ba63906
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 597662c5d777a122f9a3df0047ea5c5bd383a911
@@ -684,7 +684,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P d77a702358deddfa9987147999d06a235e730fa9
-R d2518415d28d52ef5fbe9e2da3c0e115
+P 8d0f724477422db05ed46e58ce40a720107384f0
+R c726708670ccf95f167692db119dc409
 U drh
-Z 2111806a9f47235f3c6df6db59fb1319
+Z c22e3c6f94cff34311c193678421dc1d

manifest.uuid

@@ -1 +1 @@
-8d0f724477422db05ed46e58ce40a720107384f0
+d2105f617eeb04c8177546c45bf6c63e72757f91

src/where.c

@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.341 2008/12/23 13:35:23 drh Exp $
+** $Id: where.c,v 1.342 2008/12/23 16:23:05 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -3020,6 +3020,7 @@ WhereInfo *sqlite3WhereBegin(
     }
   }
   WHERETRACE(("*** Optimizer Finished ***\n"));
+  if( db->mallocFailed ) goto whereBeginError;
 
   /* If the total query only selects a single row, then the ORDER BY
   ** clause is irrelevant.