From: shane <shane@noemail.net>
Date: Fri, 10 Oct 2008 13:35:57 +0000 (+0000)
Subject: Re-factored memory allocation failure handling in the sqlite3LimitWhere() function... 
X-Git-Tag: version-3.6.10~386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b235db9c7b480513814377a3a237bbcb1430032a;p=thirdparty%2Fsqlite.git

Re-factored memory allocation failure handling in the sqlite3LimitWhere() function based on failures in the mallocJ.test script. (CVS 5791)

FossilOrigin-Name: 43507bbefbf79e8db8fe31319ad621d48247983f
---

diff --git a/manifest b/manifest
index 001659bc90..1f24da0407 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\smallocJ.test\sto\stest\sallocation\sfailure\shandling\sof\sthe\snew\sLIMIT/OFFSET\ssupport\sfor\sUPDATE/DELETE.\s(CVS\s5790)
-D 2008-10-10T13:34:30
+C Re-factored\smemory\sallocation\sfailure\shandling\sin\sthe\ssqlite3LimitWhere()\sfunction\sbased\son\sfailures\sin\sthe\smallocJ.test\sscript.\s(CVS\s5791)
+D 2008-10-10T13:35:58
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 7fc26e087207e7a4a7723583dbd7997477af3b13
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,7 +106,7 @@ F src/build.c 8714bd809583bbe07bf22d0e1808a3fc31abe330
 F src/callback.c 7a40fd44da3eb89e7f6eff30aa6f940c45d73a97
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
 F src/date.c 1b1fc801df40aae891bff8b03f65313df192d677
-F src/delete.c 24d4f58280bb0717c3eee8ff613d1b3200f101e3
+F src/delete.c f72c98c5770c94f1a8b7bbdf7aeb49503a4927a4
 F src/expr.c 0ceafeff3a4e0f460d6a7695a675ae12391e313d
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
 F src/func.c 8431b40a7843d1024145684d303c55b4ee087bbe
@@ -645,7 +645,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P d9f5e15ca00d4d54dc395926e4c9171f1d24982a
-R dfa4b7b9e1553fcd1e404a370d8e4d74
+P 5375b348b12a4ae149472c84d6f05a78a5542a21
+R 49f64e7755b925909a2d8b6b2b92d853
 U shane
-Z ffe92c254732044ed662adfc03c644f0
+Z ba6b812faf4f8b8fc8236a25b1811c24
diff --git a/manifest.uuid b/manifest.uuid
index b2a5249dd8..131ce234d4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5375b348b12a4ae149472c84d6f05a78a5542a21
\ No newline at end of file
+43507bbefbf79e8db8fe31319ad621d48247983f
\ No newline at end of file
diff --git a/src/delete.c b/src/delete.c
index 0669e2dcd7..82cc1336c0 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** in order to generate code for DELETE FROM statements.
 **
-** $Id: delete.c,v 1.179 2008/10/10 04:34:16 shane Exp $
+** $Id: delete.c,v 1.180 2008/10/10 13:35:58 shane Exp $
 */
 #include "sqliteInt.h"
 
@@ -150,36 +150,39 @@ Expr *sqlite3LimitWhere(
   **   DELETE FROM table_a WHERE col1=1 ORDER BY col2 LIMIT 1 OFFSET 1
   ** becomes:
   **   DELETE FROM table_a WHERE rowid IN ( 
-  **     DELETE rowid FROM table_a WHERE col1=1 ORDER BY col2 LIMIT 1 OFFSET 1
+  **     SELECT rowid FROM table_a WHERE col1=1 ORDER BY col2 LIMIT 1 OFFSET 1
   **   );
   */
+
   pSelectRowid = sqlite3Expr(pParse->db, TK_ROW, 0, 0, 0);
-  if( pSelectRowid == 0 ) goto limit_where_cleanup;
+  if( pSelectRowid == 0 ) return 0;
   pEList = sqlite3ExprListAppend(pParse, 0, pSelectRowid, 0);
-  if( pEList == 0 ) goto limit_where_cleanup;
+  if( pEList == 0 ) return 0;
+
   /* duplicate the FROM clause as it is needed by both the DELETE/UPDATE tree
-  ** and the DELETE tree. */
+  ** and the SELECT subtree. */
   pSelectSrc = sqlite3SrcListDup(pParse->db, pSrc);
-  if( pSelectSrc == 0 ) goto limit_where_cleanup;
-  /* generate the DELETE expression tree. */
+  if( pSelectSrc == 0 ) {
+    sqlite3ExprListDelete(pParse->db, pEList);
+    return 0;
+  }
+
+  /* generate the SELECT expression tree. */
   pSelect = sqlite3SelectNew(pParse,pEList,pSelectSrc,pWhere,0,0,pOrderBy,0,pLimit,pOffset);
-  if( pSelect == 0 ) goto limit_where_cleanup;
-  /* generate the WHERE rowid IN ( select ) expression */
+  if( pSelect == 0 ) return 0;
+
   pWhereRowid = sqlite3Expr(pParse->db, TK_ROW, 0, 0, 0);
   if( pWhereRowid == 0 ) goto limit_where_cleanup;
   pInClause = sqlite3PExpr(pParse, TK_IN, pWhereRowid, 0, 0);
   if( pInClause == 0 ) goto limit_where_cleanup;
+
   pInClause->pSelect = pSelect;
   sqlite3ExprSetHeight(pParse, pInClause);
   return pInClause;
 
-limit_where_cleanup:
   /* something went wrong. clean up anything allocated. */
-  sqlite3SrcListDelete(pParse->db, pSelectSrc);
-  sqlite3ExprListDelete(pParse->db, pEList);
-  sqlite3ExprDelete(pParse->db, pSelectRowid);
-  sqlite3ExprDelete(pParse->db, pInClause);
-  sqlite3ExprDelete(pParse->db, pWhereRowid);
+limit_where_cleanup:
+  sqlite3SelectDelete(pParse->db, pSelect);
   return 0;
 }
 #endif /* defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) && !defined(SQLITE_OMIT_SUBQUERY) */