Changes to memory allocator usage tracking to delay the onset of integer

overflow.

FossilOrigin-Name: 4e33a0eaf83922926f8d5ee988a20439a09bc795

diff --git a/manifest b/manifest
index 86ed937da2c1cb7f7c6ee577e248d3e4db15c23f..edb5d1fb40072f22b2a06ff5d17ee485e090cd5f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sdo\sfull\stable\sscans\sof\sunordered\sindices.
-D 2011-04-15T14:46:27.121
+C Changes\sto\smemory\sallocator\susage\stracking\sto\sdelay\sthe\sonset\sof\sinteger\noverflow.
+D 2011-04-15T16:39:52.779
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -144,7 +144,7 @@ F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
 F src/main.c a8571665d43ff18f89a49d47a281605ce5ea825e
-F src/malloc.c 788f2ed928786dfe305b6783d551d6b1a9080976
+F src/malloc.c d9cdb1fccae9a6b7f40bbfc781bc378e7405f9c9
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@@ -929,7 +929,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8775f159c129e1ee36a1a13c362184713376bd40
-R 56a1fc5d79220b9ac204635c2f04710a
+P a8761a9128de945aa4b6196df5ffe64115d66b61
+R 2fa8b4a986eeacdbbe17a46e5b0c10d7
 U drh
-Z c31a330ffc1f1aa0cbae8e2f0b00bdea
+Z f0ea562c57300e5a2ab554fa5ecd70be

diff --git a/manifest.uuid b/manifest.uuid
index 6833caae559fa019c3cea348a3a52788799e6f3e..d538b1b6ef6fd43d50b7e5a7988a0d8d47b96166 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a8761a9128de945aa4b6196df5ffe64115d66b61
\ No newline at end of file
+4e33a0eaf83922926f8d5ee988a20439a09bc795
\ No newline at end of file

diff --git a/src/malloc.c b/src/malloc.c
index 50fdf524c5242f728c37cf782975204e3a881089..623d7e855a93c6982c28f192541e5dc1e2d62180 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -266,7 +266,7 @@ static int mallocWithAlarm(int n, void **pp){
   sqlite3StatusSet(SQLITE_STATUS_MALLOC_SIZE, n);
   if( mem0.alarmCallback!=0 ){
     int nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
-    if( nUsed+nFull >= mem0.alarmThreshold ){
+    if( nUsed >= mem0.alarmThreshold - nFull ){
       mem0.nearlyFull = 1;
       sqlite3MallocAlarm(nFull);
     }else{
@@ -507,7 +507,7 @@ void sqlite3DbFree(sqlite3 *db, void *p){
 ** Change the size of an existing memory allocation
 */
 void *sqlite3Realloc(void *pOld, int nBytes){
-  int nOld, nNew;
+  int nOld, nNew, nDiff;;
   void *pNew;
   if( pOld==0 ){
     return sqlite3Malloc(nBytes); /* IMP: R-28354-25769 */
@@ -530,8 +530,9 @@ void *sqlite3Realloc(void *pOld, int nBytes){
   }else if( sqlite3GlobalConfig.bMemstat ){
     sqlite3_mutex_enter(mem0.mutex);
     sqlite3StatusSet(SQLITE_STATUS_MALLOC_SIZE, nBytes);
-    if( sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED)+nNew-nOld >= 
-          mem0.alarmThreshold ){
+    nDiff = nNew - nOld;
+    if( sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED) >= 
+          mem0.alarmThreshold-nDiff ){
       sqlite3MallocAlarm(nNew-nOld);
     }
     assert( sqlite3MemdebugHasType(pOld, MEMTYPE_HEAP) );
@@ -543,7 +544,7 @@ void *sqlite3Realloc(void *pOld, int nBytes){
     }
     if( pNew ){
       nNew = sqlite3MallocSize(pNew);
-      sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nNew-nOld);
+      sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nDiff);
     }
     sqlite3_mutex_leave(mem0.mutex);
   }else{