Simplification to the grammar rules for window functions. Fix a memory

leak that can follow an OOM while parsing a comma-separated list of
window definitions.

FossilOrigin-Name: a568f9c9db594f3b194c6e870305c9d6f2392ce6bc8ac00e9688883e97560fff

diff --git a/manifest b/manifest
index 16d44b2759113ce25fe4584ac396180a75f684da..fe17540e273498b97038bdf144e30d1131f1df47 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Throw\san\serror\sif\sthe\ssecond\sargument\spassed\sto\snth_value()\sis\snot\sa\spositive\ninteger.
-D 2018-07-09T13:31:18.482
+C Simplification\sto\sthe\sgrammar\srules\sfor\swindow\sfunctions.\s\sFix\sa\smemory\nleak\sthat\scan\sfollow\san\sOOM\swhile\sparsing\sa\scomma-separated\slist\sof\nwindow\sdefinitions.
+D 2018-07-09T16:24:00.700
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -484,7 +484,7 @@ F src/os_win.c ac29c25cde4cfb4adacc59cdec4aa45698ca0e29164ea127859585ccd9faa354
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 1bb6a57fa0465296a4d6109a1a64610a0e7adde1f3acf3ef539a9d972908ce8f
 F src/pager.h c571b064df842ec8f2e90855dead9acf4cbe0d1b2c05afe0ef0d0145f7fd0388
-F src/parse.y 5bd226187d991bc2fccd3c0f36de40b2230b397903893028b4e9e39811b027b2
+F src/parse.y a7e0fb377d6ef98245cd4adc0b19f5d9216b65a090f29d1974c4feec95b1810b
 F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd
 F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
 F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
@@ -1745,7 +1745,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fe8aaf0c806413965f50a03e34b5fdfaaa8b09dc0af73f41e830f7b664bd1ced
-R 36a1b3786e652c733a23427414a09e4c
-U dan
-Z fa36ac2705a3a1bf25d5a3791daaa70e
+P 1a06e57a0b4279fa580c7ff4f152645f005794aaf86eeabf694637b7da11f763
+R 68b331bbe992415b47d75f345acd25ff
+U drh
+Z 9b6563bb4ca3160cec686f0fd2ef1fbc

diff --git a/manifest.uuid b/manifest.uuid
index 0803b15bf123e0b60c45e739c778816443e93790..9cc1b0d9e18baa70bc33defa5e972ae963a5f933 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a06e57a0b4279fa580c7ff4f152645f005794aaf86eeabf694637b7da11f763
\ No newline at end of file
+a568f9c9db594f3b194c6e870305c9d6f2392ce6bc8ac00e9688883e97560fff
\ No newline at end of file

diff --git a/src/parse.y b/src/parse.y
index 714c0b501234f5c27e3a5199cbbc74bd4c2c1508..0cfba1b3e69e601e42aa0a08195289cbf2494096 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -1605,17 +1605,18 @@ wqlist(A) ::= wqlist(A) COMMA nm(X) eidlist_opt(Y) AS LP select(Z) RP. {
 //
 %ifndef SQLITE_OMIT_WINDOWFUNC
 %type windowdefn_list {Window*}
-%destructor windowdefn_list {sqlite3WindowDelete(pParse->db, $$);}
+%destructor windowdefn_list {sqlite3WindowListDelete(pParse->db, $$);}
 windowdefn_list(A) ::= windowdefn(Z). { A = Z; }
 windowdefn_list(A) ::= windowdefn_list(Y) COMMA windowdefn(Z). {
-  if( Z ) Z->pNextWin = Y;
+  assert( Z!=0 );
+  Z->pNextWin = Y;
   A = Z;
 }
 
 %type windowdefn {Window*}
 %destructor windowdefn {sqlite3WindowDelete(pParse->db, $$);}
 windowdefn(A) ::= nm(X) AS window(Y). {
-  if( Y ){
+  if( ALWAYS(Y) ){
     Y->zName = sqlite3DbStrNDup(pParse->db, X.z, X.n);
   }
   A = Y;
@@ -1627,10 +1628,6 @@ windowdefn(A) ::= nm(X) AS window(Y). {
 %type frame_opt {Window*}
 %destructor frame_opt {sqlite3WindowDelete(pParse->db, $$);}
 
-%type window_or_nm {Window*}
-%destructor window_or_nm {
-sqlite3WindowDelete(pParse->db, $$);}
-
 %type part_opt {ExprList*}
 %destructor part_opt {sqlite3ExprListDelete(pParse->db, $$);}
 
@@ -1646,17 +1643,9 @@ sqlite3WindowDelete(pParse->db, $$);}
 %type frame_bound_e {struct FrameBound}
 %destructor frame_bound_e {sqlite3ExprDelete(pParse->db, $$.pExpr);}
 
-window_or_nm(A) ::= window(Z). {A = Z;}
-window_or_nm(A) ::= nm(Z). {
-  A = (Window*)sqlite3DbMallocZero(pParse->db, sizeof(Window));
-  if( A ){
-    A->zName = sqlite3DbStrNDup(pParse->db, Z.z, Z.n);
-  }
-}
-
 window(A) ::= LP part_opt(X) orderby_opt(Y) frame_opt(Z) RP. {
   A = Z;
-  if( A ){
+  if( ALWAYS(A) ){
     A->pPartition = X;
     A->pOrderBy = Y;
   }
@@ -1689,19 +1678,28 @@ frame_bound(A) ::= CURRENT ROW.         { A.eType = TK_CURRENT  ; A.pExpr = 0; }
 frame_bound(A) ::= expr(X) FOLLOWING.   { A.eType = TK_FOLLOWING; A.pExpr = X; }
 
 %type windowdefn_opt {Window*}
-%destructor windowdefn_opt {sqlite3WindowDelete(pParse->db, $$);}
+%destructor windowdefn_opt {sqlite3WindowListDelete(pParse->db, $$);}
 windowdefn_opt(A) ::= . { A = 0; }
 windowdefn_opt(A) ::= WINDOW windowdefn_list(B). { A = B; }
 
 %type over_opt {Window*}
 %destructor over_opt {sqlite3WindowDelete(pParse->db, $$);}
 over_opt(A) ::= . { A = 0; }
-over_opt(A) ::= filter_opt(W) OVER window_or_nm(Z). {
+over_opt(A) ::= filter_opt(W) OVER window(Z). {
   A = Z;
-  if( A ) A->pFilter = W;
+  assert( A!=0 );
+  A->pFilter = W;
+}
+over_opt(A) ::= filter_opt(W) OVER nm(Z). {
+  A = (Window*)sqlite3DbMallocZero(pParse->db, sizeof(Window));
+  if( A ){
+    A->zName = sqlite3DbStrNDup(pParse->db, Z.z, Z.n);
+    A->pFilter = W;
+  }else{
+    sqlite3ExprDelete(pParse->db, W);
+  }
 }
 
 filter_opt(A) ::= .                            { A = 0; }
 filter_opt(A) ::= FILTER LP WHERE expr(X) RP.  { A = X; }
 %endif // SQLITE_OMIT_WINDOWFUNC
-