Fix a segfault in the authorizer when it is given a SELECT statement with

no FROM clause.  Ticket #896. (CVS 1953)

FossilOrigin-Name: 205d85d77e8f0c9a1d841129601847235052d59f

diff --git a/manifest b/manifest
index 933e6d825aea8ae32cff1a996bcc31911b4525b5..c3bfc919d4ce41f4af828a3c9259be3af467ad7d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\shandling\sof\squoted\snames\sin\sCREATE\sINDEX.\s\sTicket\s#869.\s(CVS\s1907)
-D 2004-08-28T14:53:34
+C Fix\sa\ssegfault\sin\sthe\sauthorizer\swhen\sit\sis\sgiven\sa\sSELECT\sstatement\swith\r\nno\sFROM\sclause.\s\sTicket\s#896.\s(CVS\s1953)
+D 2004-09-09T13:54:30
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -22,7 +22,7 @@ F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F src/attach.c 026702566f941bf2bb158a0aaa86bfeb65910aa6
-F src/auth.c f73ae6f7260e3409e9b164a2bb9efffc38054081
+F src/auth.c 8d678ab13950801e10fd09781a7c1ed3bfeffb7c
 F src/btree.c 08a05b925b348c05d79b9b062b79e50d565678de
 F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f
 F src/btree_rb.c af40501eedd7b673ffd5e02f3a4702c76596d64a
@@ -69,7 +69,7 @@ F src/where.c ce4968e37382808ec76a47385384ee21ad9e979e
 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
 F test/attach.test ba8261d38da6b6a7d4f78ec543c548c4418582ef
 F test/attach2.test ce61e6185b3cd891cc0e9a4c868fcc65eb92fc55
-F test/auth.test 5c4d95cdaf539c0c236e20ce1f71a93e7dde9185
+F test/auth.test 3bd865e3069af8aa703158ff69cfc5e57b29033b
 F test/bigfile.test ea904b853ce2d703b16c5ce90e2b54951bc1ae81
 F test/bigrow.test 8ab252dba108f12ad64e337b0f2ff31a807ac578
 F test/bind.test 56a57043b42c4664ca705f6050e56717a8a6699a
@@ -191,7 +191,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 022e3f56ac5a29f8449d98630c673edda372d221
-R 6ef9155f1882b2205a41956e5a077bd3
+P b01d566580b151db0e1c95d124f20ea0bc889250
+R 22bca122a9631c078a0735a63e0339be
 U drh
-Z 79491f8c456d81b2c776bd357c8237aa
+Z 7c0af01bb06b95309ddc32f4b16cec60

diff --git a/manifest.uuid b/manifest.uuid
index 4c8b5c10dfed8bf9a83fc2bd1b940cb581daa252..97d5875e006286ec71f5eb3114125fd0ca830a22 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b01d566580b151db0e1c95d124f20ea0bc889250
\ No newline at end of file
+205d85d77e8f0c9a1d841129601847235052d59f
\ No newline at end of file

diff --git a/src/auth.c b/src/auth.c
index 8bc25f7ba83889ce6ccb1e323ce9af3cf350760c..e0451b28a25e5e484d4b49e8272bbd70284254f2 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -14,7 +14,7 @@
 ** systems that do not need this facility may omit it by recompiling
 ** the library with -DSQLITE_OMIT_AUTHORIZATION=1
 **
-** $Id: auth.c,v 1.12.2.1 2004/06/14 11:58:37 drh Exp $
+** $Id: auth.c,v 1.12.2.2 2004/09/09 13:54:30 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -111,6 +111,7 @@ void sqliteAuthRead(
   const char *zCol;     /* Name of the column of the table */
   int iSrc;             /* Index in pTabList->a[] of table being read */
   const char *zDBase;   /* Name of database being accessed */
+  TriggerStack *pStack; /* The stack of current triggers */
 
   if( db->xAuth==0 ) return;
   assert( pExpr->op==TK_COLUMN );
@@ -119,15 +120,14 @@ void sqliteAuthRead(
   }
   if( iSrc>=0 && iSrc<pTabList->nSrc ){
     pTab = pTabList->a[iSrc].pTab;
-  }else{
+  }else if( (pStack = pParse->trigStack)!=0 ){
     /* This must be an attempt to read the NEW or OLD pseudo-tables
     ** of a trigger.
     */
-    TriggerStack *pStack; /* The stack of current triggers */
-    pStack = pParse->trigStack;
-    assert( pStack!=0 );
     assert( pExpr->iTable==pStack->newIdx || pExpr->iTable==pStack->oldIdx );
     pTab = pStack->pTab;
+  }else{
+    return;
   }
   if( pTab==0 ) return;
   if( pExpr->iColumn>=0 ){

diff --git a/test/auth.test b/test/auth.test
index c88415792e735621674c4d7c234a9027b9ce9ef6..deffc74fca1d36179962403974abbb5c8d5bdc9d 100644 (file)
--- a/test/auth.test
+++ b/test/auth.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: auth.test,v 1.12 2003/12/07 00:24:35 drh Exp $
+# $Id: auth.test,v 1.12.2.1 2004/09/09 13:54:31 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -36,6 +36,12 @@ do_test auth-1.1.1 {
 do_test auth-1.1.2 {
   db errorcode
 } {23}
+do_test auth-1.1.3 {
+  # Ticket #896.
+  catchsql {
+    SELECT x;
+  }
+} {1 {no such column: x}}
 do_test auth-1.2 {
   execsql {SELECT name FROM sqlite_master}
 } {}