Add a OOM term to a single assert() statement.

FossilOrigin-Name: 217fc3ebd423e050508d6af97e0664f301824ef9a997ed2d302c006a41227917

diff --git a/manifest b/manifest
index 7173617ca01e7c63782c0b989318ff23b5953ad5..4f61cf9bfca45652a4adc01977420d40d17bcb07 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimization:\s\savoid\sunnecessary\scalls\sto\scomputeLimitRegisters().
-D 2022-07-26T01:20:18.198
+C Add\sa\sOOM\sterm\sto\sa\ssingle\sassert()\sstatement.
+D 2022-07-26T10:16:25.603
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -646,7 +646,7 @@ F src/vdbe.c 1266f3a4744224253dd74f0080014be8056b062c6f2f6a81e229fa0d306d4102
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
 F src/vdbeapi.c d68267db6e6641994e17c70670c40fd67ceb2352e42188815ed8c05d4d6502cb
-F src/vdbeaux.c f14f30892ee8491f7903cf4ccd7bd0b7ab6f1eddf7dda4a0e03725fcd5ae05e1
+F src/vdbeaux.c 8584f4a20997fd918f0d957ab4f73d7411159772297c5020c188973bdc41dbf0
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 5ebf05c0182addedb1607ade848e1c83cef40981df94d1abfab0c59288c6064f
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -1981,8 +1981,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P db8230e80ed894fc2801cdbb53c2cd9de00192d7f4d8328c29cc214e2e0adde9
-R ff9bb5a29a45c7eaa1b390df1d36ecd7
+P f48bd8f85d86fd93329dda7ba57f468854a732b89e4126e9c5beec3495d24b31
+R e7b7ace3206c3ff792140e3157349b46
 U drh
-Z 3b35c17a3beaeddc52e4b88d9f02979e
+Z f1efcdf9820c3825f4f57a8fb233e014
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 65ce96a9c40a59001960f591dd0082ee6685dadb..28819b56af7080b75904c570e4a987be4f574a21 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f48bd8f85d86fd93329dda7ba57f468854a732b89e4126e9c5beec3495d24b31
\ No newline at end of file
+217fc3ebd423e050508d6af97e0664f301824ef9a997ed2d302c006a41227917
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index dfee43d05cedd1165ec04389b3d4d8d460d220e7..8ab7978fa164f97a1250a1b54353e6b2e1f72464 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1141,7 +1141,7 @@ void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){
   sqlite3VdbeGetOp(p,addr)->p1 = val;
 }
 void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){
-  assert( addr>=0 );
+  assert( addr>=0 || p->db->mallocFailed );
   sqlite3VdbeGetOp(p,addr)->p2 = val;
 }
 void sqlite3VdbeChangeP3(Vdbe *p, int addr, int val){