Index: src/expr.c
==================================================================
--- src/expr.c
+++ src/expr.c
@@ -1509,11 +1509,11 @@
     pNew->nSelectRow = p->nSelectRow;
     pNew->pWith = withDup(db, p->pWith);
 #ifndef SQLITE_OMIT_WINDOWFUNC
     pNew->pWin = 0;
     pNew->pWinDefn = sqlite3WindowListDup(db, p->pWinDefn);
-    if( p->pWin ) gatherSelectWindows(pNew);
+    if( p->pWin && db->mallocFailed==0 ) gatherSelectWindows(pNew);
 #endif
     pNew->selId = p->selId;
     *pp = pNew;
     pp = &pNew->pPrior;
     pNext = pNew;

Index: test/windowfault.test
==================================================================
--- test/windowfault.test
+++ test/windowfault.test
@@ -221,7 +221,29 @@
   faultsim_test_result [list 0 $::L]
 }
 
 catch {db close}
 tvfs delete
+
+reset_db
+do_execsql_test 10.0 {
+  CREATE TABLE t1(a, b, c, d);
+  CREATE TABLE t2(a, b, c, d);
+}
+
+do_faultsim_test 1 -faults oom* -prep {
+} -body {
+  execsql {
+    SELECT row_number() OVER win
+    FROM t1
+    WINDOW win AS (
+      ORDER BY (
+        SELECT percent_rank() OVER win2 FROM t2
+        WINDOW win2 AS (ORDER BY a)
+      )
+    )
+  }
+} -test {
+  faultsim_test_result {0 {}}
+}
 
 finish_test