77bd1e
Subject: [PATCH]  Do not allow CREATE TABLE or CREATE VIEW of an object with a name
77bd1e
 that looks like a shadow table name.
77bd1e
77bd1e
diff --git a/src/build.c b/src/build.c
77bd1e
index 3412670..f273394 100644
77bd1e
--- a/src/build.c
77bd1e
+++ b/src/build.c
77bd1e
@@ -814,6 +814,22 @@ int sqlite3WritableSchema(sqlite3 *db){
77bd1e
   return (db->flags&(SQLITE_WriteSchema|SQLITE_Defensive))==SQLITE_WriteSchema;
77bd1e
 }
77bd1e
 
77bd1e
+/*
77bd1e
+** Return TRUE if shadow tables should be read-only in the current
77bd1e
+** context.
77bd1e
+*/
77bd1e
+int sqlite3ReadOnlyShadowTables(sqlite3 *db){
77bd1e
+#ifndef SQLITE_OMIT_VIRTUALTABLE
77bd1e
+  if( (db->flags & SQLITE_Defensive)!=0
77bd1e
+   && db->pVtabCtx==0
77bd1e
+   && db->nVdbeExec==0
77bd1e
+  ){
77bd1e
+    return 1;
77bd1e
+  }
77bd1e
+#endif
77bd1e
+  return 0;
77bd1e
+}
77bd1e
+
77bd1e
 /*
77bd1e
 ** This routine is used to check if the UTF-8 string zName is a legal
77bd1e
 ** unqualified name for a new schema object (table, index, view or
77bd1e
@@ -822,9 +838,10 @@ int sqlite3WritableSchema(sqlite3 *db){
77bd1e
 ** is reserved for internal use.
77bd1e
 */
77bd1e
 int sqlite3CheckObjectName(Parse *pParse, const char *zName){
77bd1e
-  if( !pParse->db->init.busy && pParse->nested==0 
77bd1e
+  if(( !pParse->db->init.busy && pParse->nested==0 
77bd1e
           && sqlite3WritableSchema(pParse->db)==0
77bd1e
-          && 0==sqlite3StrNICmp(zName, "sqlite_", 7) ){
77bd1e
+          && 0==sqlite3StrNICmp(zName, "sqlite_", 7) ) ||
77bd1e
+          (sqlite3ReadOnlyShadowTables(pParse->db) && sqlite3ShadowTableName(pParse->db, zName))){
77bd1e
     sqlite3ErrorMsg(pParse, "object name reserved for internal use: %s", zName);
77bd1e
     return SQLITE_ERROR;
77bd1e
   }
77bd1e
@@ -1929,7 +1946,7 @@ int sqlite3IsShadowTableOf(sqlite3 *db, Table *pTab, const char *zName){
77bd1e
 ** zName is temporarily modified while this routine is running, but is
77bd1e
 ** restored to its original value prior to this routine returning.
77bd1e
 */
77bd1e
-static int isShadowTableName(sqlite3 *db, char *zName){
77bd1e
+int sqlite3ShadowTableName(sqlite3 *db, const char *zName){
77bd1e
   char *zTail;                  /* Pointer to the last "_" in zName */
77bd1e
   Table *pTab;                  /* Table that zName is a shadow of */
77bd1e
 
77bd1e
@@ -1942,8 +1959,6 @@ static int isShadowTableName(sqlite3 *db, char *zName){
77bd1e
   if( !IsVirtual(pTab) ) return 0;
77bd1e
   return sqlite3IsShadowTableOf(db, pTab, zName);
77bd1e
 }
77bd1e
-#else
77bd1e
-# define isShadowTableName(x,y) 0
77bd1e
 #endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
77bd1e
 
77bd1e
 /*
77bd1e
@@ -1985,7 +2000,7 @@ void sqlite3EndTable(
77bd1e
   p = pParse->pNewTable;
77bd1e
   if( p==0 ) return;
77bd1e
 
77bd1e
-  if( pSelect==0 && isShadowTableName(db, p->zName) ){
77bd1e
+  if( pSelect==0 && sqlite3ShadowTableName(db, p->zName) ){
77bd1e
     p->tabFlags |= TF_Shadow;
77bd1e
   }
77bd1e
 
77bd1e
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
77bd1e
index 60b2ebd..e5ba8a0 100644
77bd1e
--- a/src/sqliteInt.h
77bd1e
+++ b/src/sqliteInt.h
77bd1e
@@ -4408,6 +4408,11 @@ void sqlite3AutoLoadExtensions(sqlite3*);
77bd1e
    );
77bd1e
 #  define sqlite3VtabInSync(db) ((db)->nVTrans>0 && (db)->aVTrans==0)
77bd1e
 #endif
77bd1e
+#ifndef SQLITE_OMIT_VIRTUALTABLE
77bd1e
+  int sqlite3ShadowTableName(sqlite3 *db, const char *zName);
77bd1e
+#else
77bd1e
+# define sqlite3ShadowTableName(A,B) 0
77bd1e
+#endif
77bd1e
 #ifndef SQLITE_OMIT_VIRTUALTABLE
77bd1e
   int sqlite3IsShadowTableOf(sqlite3*,Table*,const char*);
77bd1e
 #else
77bd1e
diff --git a/test/altertab.test b/test/altertab.test
77bd1e
index 891b081..0705abc 100644
77bd1e
--- a/test/altertab.test
77bd1e
+++ b/test/altertab.test
77bd1e
@@ -547,13 +547,29 @@ ifcapable fts3 {
77bd1e
   } {1 {table y1_segments may not be modified}}
77bd1e
 
77bd1e
   do_catchsql_test 16.20 {
77bd1e
-    ALTER TABLE y1_segments RENAME TO abc;
77bd1e
-  } {1 {table y1_segments may not be altered}}
77bd1e
-
77bd1e
-  do_catchsql_test 16.21 {
77bd1e
     DROP TABLE y1_segments;
77bd1e
   } {1 {table y1_segments may not be dropped}}
77bd1e
 
77bd1e
+  do_catchsql_test 16.20 {
77bd1e
+    ALTER TABLE y1_segments RENAME TO abc;
77bd1e
+  } {1 {table y1_segments may not be altered}}
77bd1e
+  sqlite3_db_config db DEFENSIVE 0
77bd1e
+  do_catchsql_test 16.22 {
77bd1e
+    ALTER TABLE y1_segments RENAME TO abc;
77bd1e
+  } {0 {}}
77bd1e
+  sqlite3_db_config db DEFENSIVE 1
77bd1e
+  do_catchsql_test 16.23 {
77bd1e
+    CREATE TABLE y1_segments AS SELECT * FROM abc;
77bd1e
+  } {1 {object name reserved for internal use: y1_segments}}
77bd1e
+  do_catchsql_test 16.24 {
77bd1e
+    CREATE VIEW y1_segments AS SELECT * FROM abc;
77bd1e
+  } {1 {object name reserved for internal use: y1_segments}}
77bd1e
+  sqlite3_db_config db DEFENSIVE 0
77bd1e
+  do_catchsql_test 16.25 {
77bd1e
+    ALTER TABLE abc RENAME TO y1_segments;
77bd1e
+  } {0 {}}
77bd1e
+  sqlite3_db_config db DEFENSIVE 1
77bd1e
+
77bd1e
   do_execsql_test 16.30 {
77bd1e
     ALTER TABLE y1 RENAME TO z1;
77bd1e
   }