database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Fix a segfault that can occur when attempting to insert into

Browse Source 
a corrupt database file.  Need a test case. (CVS 6212)

FossilOrigin-Name: 68957cf0c4bae0c6cf450b4de1d6bc1bc64b232c
This commit is contained in:
drh
2009-01-28 20:21:17 +00:00
parent 6acb2cf665
commit 20abac2f87
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.561 2009/01/20 17:06:27 danielk1977 Exp $
** $Id: btree.c,v 1.562 2009/01/28 20:21:17 drh Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -4663,7 +4663,9 @@ static int fillInCell(
nSrc = nData;
nData = 0;
}else{
/* TBD: Perhaps raise SQLITE_CORRUPT if nKey is larger than 31 bits? */
if( nKey>0x7fffffff || pKey==0 ){
return SQLITE_CORRUPT;
}
nPayload += (int)nKey;
pSrc = pKey;
nSrc = (int)nKey;
@@ -5585,7 +5587,10 @@ static int balance_nonroot(BtCursor *pCur){
j--;
sqlite3BtreeParseCellPtr(pNew, apCell[j], &info);
pCell = pTemp;
fillInCell(pParent, pCell, 0, info.nKey, 0, 0, 0, &sz);
rc = fillInCell(pParent, pCell, 0, info.nKey, 0, 0, 0, &sz);
if( rc!=SQLITE_OK ){
goto balance_cleanup;
}
pTemp = 0;
}else{
pCell -= 4;