Catch an IO error code that was being ignored in OP_RowData. (CVS 3688)

FossilOrigin-Name: 760ebf8076b9cedb614bdc88c72d871c30cc7b94

diff --git a/manifest b/manifest
index 363349a143362f7f178124d321a20abf93eed904..1beb96bb69ea04c739aadd49ff9c87b6bd574da2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhanced\stemp-file\ssecurity\sunder\sunix.\s\sThere\sare\sno\sknown\sattacks\sagainst\nprior\sversions\s-\sthis\scheck-in\sis\sjust\san\sadded\sprecaution.\s(CVS\s3687)
-D 2007-03-15T01:16:48
+C Catch\san\sIO\serror\scode\sthat\swas\sbeing\signored\sin\sOP_RowData.\s(CVS\s3688)
+D 2007-03-15T12:05:36
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -122,7 +122,7 @@ F src/update.c 876b3142b8db9ce6ddf8374a2ced65e576acabc7
 F src/utf.c 67ecb1032bc0b42c105e88d65ef9d9f626eb0e1f
 F src/util.c 91d4cb189476906639ae611927d939691d1365f6
 F src/vacuum.c 327c6ffa38935163db7c1e256ff5f788e901b318
-F src/vdbe.c 596199e4be890af66e0fe69473f1c74c2e998e06
+F src/vdbe.c 19e244e554e5df3f49d4e15233527753fadbcc4d
 F src/vdbe.h 0025259af1939fb264a545816c69e4b5b8d52691
 F src/vdbeInt.h 13ba07121cf534d5b80130d2f5eb0a4937a36bba
 F src/vdbeapi.c 2d1e6843af8705a1172e54a418d2a3d5febd1dd7
@@ -436,7 +436,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P a8d6d935fbe32a759a55c1ef90adda7fe534acc1
-R 0a7b2373b4bb02987641c1eeb0b09c82
-U drh
-Z a6809282c4d71a0260c725dbd90ff825
+P 5af61402f65bddc4040a20470f267c9404cba631
+R 6cd3a8e09af220e173fcb00ca76f0725
+U danielk1977
+Z 1aff0a673a648ebfe30344b08f0f95d7

diff --git a/manifest.uuid b/manifest.uuid
index daeffbacb8632f0f39134c96d79a8f39d5cf186e..a6ced44bf8987474a78f4bdc515b35f410c4795a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5af61402f65bddc4040a20470f267c9404cba631
\ No newline at end of file
+760ebf8076b9cedb614bdc88c72d871c30cc7b94
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index d8992d0ac6f5d8aa10673da3bc4ed5764fd8a9de..dd94e83e306f367824940d3ec0158114a0b6deed 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.590 2007/03/01 00:29:14 drh Exp $
+** $Id: vdbe.c,v 1.591 2007/03/15 12:05:36 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -3504,9 +3504,9 @@ case OP_RowData: {
       pTos->z = z;
     }
     if( pC->isIndex ){
-      sqlite3BtreeKey(pCrsr, 0, n, pTos->z);
+      rc = sqlite3BtreeKey(pCrsr, 0, n, pTos->z);
     }else{
-      sqlite3BtreeData(pCrsr, 0, n, pTos->z);
+      rc = sqlite3BtreeData(pCrsr, 0, n, pTos->z);
     }
   }else if( pC->pseudoTable ){
     pTos->n = pC->nData;