From: drh <drh@noemail.net>
Date: Thu, 3 Nov 2005 14:29:55 +0000 (+0000)
Subject: sqlite3_column_int() and similar routines return 0 or 0.0 on an
X-Git-Tag: version-3.6.10~3401
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c01be744bc8e19fa9d74375eba2aab345b296210;p=thirdparty%2Fsqlite.git

sqlite3_column_int() and similar routines return 0 or 0.0 on an
out-of-memory condition, not some mysterious error code. (CVS 2759)

FossilOrigin-Name: 7780f5e9d504926f11bd0662c03c88c76fb1d416
---

diff --git a/manifest b/manifest
index daeef912e8..72b79237d8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prohibit\sparameters\sin\sCHECK\sconstraint\sexpressions.\s(CVS\s2758)
-D 2005-11-03T12:33:28
+C sqlite3_column_int()\sand\ssimilar\sroutines\sreturn\s0\sor\s0.0\son\san\nout-of-memory\scondition,\snot\ssome\smysterious\serror\scode.\s(CVS\s2759)
+D 2005-11-03T14:29:55
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -87,7 +87,7 @@ F src/vdbeInt.h 6eba0b967dc4fc4d5dea6e3bcc66e70a44981cc9
 F src/vdbeapi.c 85bbe1d0243a89655433d60711b4bd71979b59cd
 F src/vdbeaux.c eb1ce3a40d37a1a7e92749e0ef72e3224fa5e55f
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
-F src/vdbemem.c 555539999fca277c63acf428dbda830d3c10a05c
+F src/vdbemem.c fdd5dbca7395df0776dc8c83b45d22c4aba21d1c
 F src/where.c 5252bf20257fb8630959ae7a145fc20076f30543
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
@@ -316,7 +316,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P be83bfee0211396a0038ffb125897199bea9a73f
-R 4d17f4acde875d29ca58ee461243d0d2
+P bb94ef64b227839a0ef4156985e2f5a061a78e2c
+R d764f727b04686e2af798ae9ccbcdf15
 U drh
-Z c247ae4a6dfe28117dcdf756befb48cf
+Z 6e4bc42bd67b219bb703d08d5d61a498
diff --git a/manifest.uuid b/manifest.uuid
index 50bbaf74ce..1bed2abe78 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bb94ef64b227839a0ef4156985e2f5a061a78e2c
\ No newline at end of file
+7780f5e9d504926f11bd0662c03c88c76fb1d416
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index 7f40af63ad..ba8cf56302 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -254,7 +254,7 @@ i64 sqlite3VdbeIntValue(Mem *pMem){
     i64 value;
     if( sqlite3VdbeChangeEncoding(pMem, SQLITE_UTF8)
        || sqlite3VdbeMemNulTerminate(pMem) ){
-      return SQLITE_NOMEM;
+      return 0;
     }
     assert( pMem->z );
     sqlite3atoi64(pMem->z, &value);
@@ -289,7 +289,7 @@ double sqlite3VdbeRealValue(Mem *pMem){
     double val = 0.0;
     if( sqlite3VdbeChangeEncoding(pMem, SQLITE_UTF8)
        || sqlite3VdbeMemNulTerminate(pMem) ){
-      return SQLITE_NOMEM;
+      return 0.0;
     }
     assert( pMem->z );
     sqlite3AtoF(pMem->z, &val);