1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00

Bug fix in the memory leak trace output. (CVS 4283)

FossilOrigin-Name: a1b495c28a092c7eb79ffeeb6a217749acb4c12c
This commit is contained in:
drh
2007-08-24 04:15:00 +00:00
parent 153c62c461
commit d5499d648f
3 changed files with 10 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
C The\swin32\sdriver\scompiles\sbut\sdoes\snot\syet\swork\swell.\s\sMany\sbugs\nfixed.\s(CVS\s4282) C Bug\sfix\sin\sthe\smemory\sleak\strace\soutput.\s(CVS\s4283)
D 2007-08-24T03:51:33 D 2007-08-24T04:15:00
F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -102,7 +102,7 @@ F src/main.c 795ec066ce38908b5c35ca4353bb601d022e2275
F src/malloc.c d4282f50964ab1ca31f504c97b7cf2fdb4d4195d F src/malloc.c d4282f50964ab1ca31f504c97b7cf2fdb4d4195d
F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
F src/mem1.c afe2fbf6d7e8247c6c9f69c1481358b1cad60c08 F src/mem1.c afe2fbf6d7e8247c6c9f69c1481358b1cad60c08
F src/mem2.c dfe802143189d491ae00f2c5aa50ce619d02f5bf F src/mem2.c 1a2ca756a285b5365d667841508cc1f98938b8d8
F src/mutex.c 9cf641f556a4119ef90ed41b82f2d5647f81686e F src/mutex.c 9cf641f556a4119ef90ed41b82f2d5647f81686e
F src/os.c 3b0d37208ea3ec9e1f913fbdeaf88841ed443b9d F src/os.c 3b0d37208ea3ec9e1f913fbdeaf88841ed443b9d
F src/os.h 2bfbbad126a775e4d8c7d59eb4d9585a5fd7dfb5 F src/os.h 2bfbbad126a775e4d8c7d59eb4d9585a5fd7dfb5
@@ -561,7 +561,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 76f1e18ebc25d692f122784e87d202992c4cfed2 P 3a68fcddfa9184e4b310ce0a21312c54b9462ec8
R 72f6a976f09cdaf5e13abeade770ec1c R 8577d385c536daf1df94ce55e3096cab
U drh U drh
Z 8bcbe7ef9d6a537a157463bef713e3c1 Z 81d0ac074a196345faf13b53e0789aed

View File

@@ -1 +1 @@
3a68fcddfa9184e4b310ce0a21312c54b9462ec8 a1b495c28a092c7eb79ffeeb6a217749acb4c12c

View File

@@ -12,7 +12,7 @@
** This file contains the C functions that implement a memory ** This file contains the C functions that implement a memory
** allocation subsystem for use by SQLite. ** allocation subsystem for use by SQLite.
** **
** $Id: mem2.c,v 1.9 2007/08/24 03:51:34 drh Exp $ ** $Id: mem2.c,v 1.10 2007/08/24 04:15:00 drh Exp $
*/ */
/* /*
@@ -447,7 +447,8 @@ void sqlite3_memdebug_dump(const char *zFilename){
for(pHdr=mem.pFirst; pHdr; pHdr=pHdr->pNext){ for(pHdr=mem.pFirst; pHdr; pHdr=pHdr->pNext){
char *z = (char*)pHdr; char *z = (char*)pHdr;
z -= pHdr->nBacktraceSlots*sizeof(void*) + pHdr->nTitle; z -= pHdr->nBacktraceSlots*sizeof(void*) + pHdr->nTitle;
fprintf(out, "**** %d bytes at %p from %s ****\n", pHdr->iSize,&pHdr[1],z); fprintf(out, "**** %d bytes at %p from %s ****\n",
pHdr->iSize, &pHdr[1], pHdr->nTitle ? z : "???");
if( pHdr->nBacktrace ){ if( pHdr->nBacktrace ){
fflush(out); fflush(out);
pBt = (void**)pHdr; pBt = (void**)pHdr;