aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2012-01-02 15:45:12 +0000
committerdrh <drh@noemail.net>2012-01-02 15:45:12 +0000
commit5dc2bcda7e49ff18c7b2204579f166aad088289e (patch)
tree7e40df1f4876f507f34deb3a80bb238b1f73a24c /src
parentaa584af08837c6d8cca9f112777632b95d30c74f (diff)
downloadsqlite-5dc2bcda7e49ff18c7b2204579f166aad088289e.tar.gz
sqlite-5dc2bcda7e49ff18c7b2204579f166aad088289e.zip
Make sure large negative arguments to PRAGMA cache_size do not cause
32-bit signed integer overflow. Also correct a requirements mark. FossilOrigin-Name: 17c30634a71051158f8d37fd51b3c2a125ad8bd2
Diffstat (limited to 'src')
-rw-r--r--src/main.c2
-rw-r--r--src/pcache.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 7da925c2e..524b71026 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,7 +49,7 @@ const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
*/
int sqlite3_libversion_number(void){ return SQLITE_VERSION_NUMBER; }
-/* IMPLEMENTATION-OF: R-54823-41343 The sqlite3_threadsafe() function returns
+/* IMPLEMENTATION-OF: R-20790-14025 The sqlite3_threadsafe() function returns
** zero if and only if SQLite was compiled with mutexing code omitted due to
** the SQLITE_THREADSAFE compile-time option being set to 0.
*/
diff --git a/src/pcache.c b/src/pcache.c
index 0c3e9ee0a..482a188be 100644
--- a/src/pcache.c
+++ b/src/pcache.c
@@ -205,7 +205,7 @@ static int numberOfCachePages(PCache *p){
if( p->szCache>=0 ){
return p->szCache;
}else{
- return (-1024*p->szCache)/(p->szPage+p->szExtra);
+ return (int)((-1024*(i64)p->szCache)/(p->szPage+p->szExtra));
}
}