Fix a buffer-overrun that could occur after a malloc() failure. (CVS 2948)

FossilOrigin-Name: 662522218f967a8fb07427a9abd53334bb1400f7

diff --git a/manifest b/manifest
index ef9a3439926d95ad3a657353aebf124f68d5f582..b940c5b053bfbe48d265b2c106b10c73b603df3e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rollback\sany\sopen\swrite-transaction\swhen\sa\sshared-cache\sconnection\sis\sclosed.\s(CVS\s2947)
-D 2006-01-15T11:39:18
+C Fix\sa\sbuffer-overrun\sthat\scould\soccur\safter\sa\smalloc()\sfailure.\s(CVS\s2948)
+D 2006-01-15T13:13:57
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -91,7 +91,7 @@ F src/vdbe.c bf64026224ade859b32e6c01fcf292fbf069cb95
 F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
 F src/vdbeInt.h 5451cf71f229e366ac543607c0a17f36e5737ea9
 F src/vdbeapi.c afd3837cea0dec93dcb4724d073c84fa0da68e23
-F src/vdbeaux.c 1d765d671ae31a067b2b064c3f193690f91eea62
+F src/vdbeaux.c bfad18ca5d0372a34147ed98ac268b75ccb6858d
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c dd08a0eea4868ac4a2d91fdec32424308b1db772
 F src/where.c 9fd58a8f5525d036a088c92bb14e2885c2243bc8
@@ -341,7 +341,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P ad8f12cad1fcd9c54478abe20050f9a953035506
-R 954aa80dd6874104e30f75bce2182119
+P 1944d92b530d3bbcd31561063660de03d668af23
+R 2fd19f54530324dc3561ef0dc5fb5936
 U danielk1977
-Z 837b481c27f9c4453e777b73d583ce2e
+Z baf4b690ddb89093405c83bb5d1f469d

diff --git a/manifest.uuid b/manifest.uuid
index 609fa6ea09d3b667ff96876166c52024764ad01b..a3b280305f9ceb522abddabce8a1f74a504bde35 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1944d92b530d3bbcd31561063660de03d668af23
\ No newline at end of file
+662522218f967a8fb07427a9abd53334bb1400f7
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 2bdda2e47810fdd6513384451b54f700f467e644..dfe80ecb8a0c44943d6c25dab7ef00e22a58d859 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -102,7 +102,7 @@ int sqlite3VdbeAddOp(Vdbe *p, int op, int p1, int p2){
   p->nOp++;
   assert( p->magic==VDBE_MAGIC_INIT );
   resizeOpArray(p, i+1);
-  if( p->aOp==0 || p->nOp<=i ){
+  if( p->aOp==0 || p->nOpAlloc<=i ){
     return 0;
   }
   pOp = &p->aOp[i];