Index: src/build.c
==================================================================
--- src/build.c
+++ src/build.c
@@ -3800,11 +3800,11 @@
 /*
 ** Add the list of function arguments to the SrcList entry for a
 ** table-valued-function.
 */
 void sqlite3SrcListFuncArgs(Parse *pParse, SrcList *p, ExprList *pList){
-  if( p && ALWAYS(p->nSrc>0) ){
+  if( p && ALWAYS(p->nSrc>0) && pList ){
     struct SrcList_item *pItem = &p->a[p->nSrc-1];
     assert( pItem->fg.notIndexed==0 );
     assert( pItem->fg.isIndexedBy==0 );
     assert( pItem->fg.isTabFunc==0 );
     pItem->u1.pFuncArg = pList;

Index: src/resolve.c
==================================================================
--- src/resolve.c
+++ src/resolve.c
@@ -1449,13 +1449,15 @@
 */
 int sqlite3ResolveExprListNames( 
   NameContext *pNC,       /* Namespace to resolve expressions in. */
   ExprList *pList         /* The expression list to be analyzed. */
 ){
-  int i;
-  for(i=0; i<pList->nExpr; i++){
-    if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort;
+  if( pList ){
+    int i;
+    for(i=0; i<pList->nExpr; i++){
+      if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort;
+    }
   }
   return WRC_Continue;
 }
 
 /*

Index: test/tabfunc01.test
==================================================================
--- test/tabfunc01.test
+++ test/tabfunc01.test
@@ -58,7 +58,12 @@
 do_execsql_test tabfunc01-2.1 {
   CREATE TABLE t1(x);
   INSERT INTO t1(x) VALUES(2),(3);
   SELECT *, '|' FROM t1, generate_series(1,x) ORDER BY 1, 2
 } {2 1 | 2 2 | 3 1 | 3 2 | 3 3 |}
+
+do_execsql_test tabfunc01-2.2 {
+  SELECT * FROM generate_series() LIMIT 5;
+} {0 1 2 3 4}
+
 
 finish_test