Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a memory allocation problem in os_test.c (CVS 1782) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
ed511c2ea9581933ca504ce4b43d8635 |
| User & Date: | danielk1977 2004-06-30 12:42:59 |
Context
|
2004-06-30
| ||
| 12:49 | Have the debug version of sqliteRealloc() return partially uninitialised memory in the same way as the non-debug version can. (CVS 1783) (check-in: e78b0ff3 user: danielk1977 tags: trunk) | |
| 12:42 | Fix a memory allocation problem in os_test.c (CVS 1782) (check-in: ed511c2e user: danielk1977 tags: trunk) | |
| 11:54 | Coverage improvements for malloc and vdbemem.c (CVS 1781) (check-in: a98dd004 user: danielk1977 tags: trunk) | |
Changes
Changes to src/os_test.c.
155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
** Load block 'blk' into the cache of pFile.
*/
static int cacheBlock(OsTestFile *pFile, int blk){
if( blk>=pFile->nBlk ){
int n = ((pFile->nBlk * 2) + 100 + blk);
pFile->apBlk = (u8 **)sqliteRealloc(pFile->apBlk, n * sizeof(u8*));
if( !pFile->apBlk ) return SQLITE_NOMEM;
pFile->nBlk = n;
}
if( !pFile->apBlk[blk] ){
off_t filesize;
int rc;
|
> |
155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 |
** Load block 'blk' into the cache of pFile.
*/
static int cacheBlock(OsTestFile *pFile, int blk){
if( blk>=pFile->nBlk ){
int n = ((pFile->nBlk * 2) + 100 + blk);
pFile->apBlk = (u8 **)sqliteRealloc(pFile->apBlk, n * sizeof(u8*));
if( !pFile->apBlk ) return SQLITE_NOMEM;
memset(&pFile->apBlk[pFile->nBlk], 0, (n - pFile->nBlk)*sizeof(u8*));
pFile->nBlk = n;
}
if( !pFile->apBlk[blk] ){
off_t filesize;
int rc;
|
Changes to src/tclsqlite.c.
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
....
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
|
** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** A TCL Interface to SQLite ** ** $Id: tclsqlite.c,v 1.94 2004/06/30 11:54:07 danielk1977 Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ #include "sqliteInt.h" #include "tcl.h" #include <stdlib.h> #include <string.h> ................................................................................ /* If compiled with SQLITE_TEST turned on, then register the "md5sum" ** SQL function. */ #ifdef SQLITE_TEST { extern void Md5_Register(sqlite*); int mallocfail = sqlite3_iMallocFail; sqlite3_iMallocFail = 0; Md5_Register(p->db); sqlite3_iMallocFail = mallocfail; } #endif p->interp = interp; return TCL_OK; } /* |
|
>
>
>
>
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
....
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
|
** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** A TCL Interface to SQLite ** ** $Id: tclsqlite.c,v 1.95 2004/06/30 12:42:59 danielk1977 Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ #include "sqliteInt.h" #include "tcl.h" #include <stdlib.h> #include <string.h> ................................................................................ /* If compiled with SQLITE_TEST turned on, then register the "md5sum" ** SQL function. */ #ifdef SQLITE_TEST { extern void Md5_Register(sqlite*); #ifdef SQLITE_DEBUG int mallocfail = sqlite3_iMallocFail; sqlite3_iMallocFail = 0; #endif Md5_Register(p->db); #ifdef SQLITE_DEBUG sqlite3_iMallocFail = mallocfail; #endif } #endif p->interp = interp; return TCL_OK; } /* |