Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Improvement to the hexdb interpreter built into the CLI and into the TCL test harness: Round the "size" up to the next multiple of the "pagesize". |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
9ec92939cb2d2c96ae15bc496feed233 |
| User & Date: | drh 2019-07-17 15:05:16 |
Context
|
2019-07-17
| ||
| 16:18 | Fix an incorrect assert() in balance_nonroot(). (check-in: 59c9e73f user: drh tags: trunk) | |
| 15:05 | Improvement to the hexdb interpreter built into the CLI and into the TCL test harness: Round the "size" up to the next multiple of the "pagesize". (check-in: 9ec92939 user: drh tags: trunk) | |
| 14:34 | When processing a BETWEEN or CASE expression, avoid transforming a node of the original expression into a TK_REGISTER node. Instead, take a copy and use it instead. Fix for [1be72aab9]. (check-in: 7ef7b23c user: dan tags: trunk) | |
Changes
Changes to src/shell.c.in.
3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 |
}
*pnData = 0;
nLine++;
if( fgets(zLine, sizeof(zLine), in)==0 ) goto readHexDb_error;
rc = sscanf(zLine, "| size %d pagesize %d", &n, &pgsz);
if( rc!=2 ) goto readHexDb_error;
if( n<0 ) goto readHexDb_error;
a = sqlite3_malloc( n ? n : 1 );
if( a==0 ){
utf8_printf(stderr, "Out of memory!\n");
goto readHexDb_error;
}
memset(a, 0, n);
if( pgsz<512 || pgsz>65536 || (pgsz & (pgsz-1))!=0 ){
|
> > |
3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 |
} *pnData = 0; nLine++; if( fgets(zLine, sizeof(zLine), in)==0 ) goto readHexDb_error; rc = sscanf(zLine, "| size %d pagesize %d", &n, &pgsz); if( rc!=2 ) goto readHexDb_error; if( n<0 ) goto readHexDb_error; if( pgsz<512 || pgsz>65536 || (pgsz&(pgsz-1))!=0 ) goto readHexDb_error; n = (n+pgsz-1)&~(pgsz-1); /* Round n up to the next multiple of pgsz */ a = sqlite3_malloc( n ? n : 1 ); if( a==0 ){ utf8_printf(stderr, "Out of memory!\n"); goto readHexDb_error; } memset(a, 0, n); if( pgsz<512 || pgsz>65536 || (pgsz & (pgsz-1))!=0 ){ |
Changes to src/test1.c.
7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 |
for(iNext=i; zIn[iNext] && zIn[iNext]!='\n'; iNext++){}
if( zIn[iNext]=='\n' ) iNext++;
while( zIn[i]==' ' || zIn[i]=='\t' ){ i++; }
if( a==0 ){
int pgsz;
rc = sscanf(zIn+i, "| size %d pagesize %d", &n, &pgsz);
if( rc!=2 ) continue;
if( n<512 ){
Tcl_AppendResult(interp, "bad 'size' field", (void*)0);
return TCL_ERROR;
}
a = malloc( n );
if( a==0 ){
Tcl_AppendResult(interp, "out of memory", (void*)0);
|
> > > > > |
7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 |
for(iNext=i; zIn[iNext] && zIn[iNext]!='\n'; iNext++){}
if( zIn[iNext]=='\n' ) iNext++;
while( zIn[i]==' ' || zIn[i]=='\t' ){ i++; }
if( a==0 ){
int pgsz;
rc = sscanf(zIn+i, "| size %d pagesize %d", &n, &pgsz);
if( rc!=2 ) continue;
if( pgsz<512 || pgsz>65536 || (pgsz&(pgsz-1))!=0 ){
Tcl_AppendResult(interp, "bad 'pagesize' field", (void*)0);
return TCL_ERROR;
}
n = (n+pgsz-1)&~(pgsz-1); /* Round n up to the next multiple of pgsz */
if( n<512 ){
Tcl_AppendResult(interp, "bad 'size' field", (void*)0);
return TCL_ERROR;
}
a = malloc( n );
if( a==0 ){
Tcl_AppendResult(interp, "out of memory", (void*)0);
|