diff options
| author | stephan <stephan@noemail.net> | 2025-02-26 03:32:52 +0000 |
|---|---|---|
| committer | stephan <stephan@noemail.net> | 2025-02-26 03:32:52 +0000 |
| commit | 69eaadbee3dc5912aba995288bfb20eeeb1222e6 (patch) | |
| tree | 57dc2e0367a821171ea93add79f965300084042e /src/vdbeapi.c | |
| parent | d2f7dfa6190f529f7e543380b6663074e9078207 (diff) | |
| parent | d804893762174d23017921ddbf233fa90ae5015f (diff) | |
| download | sqlite-69eaadbee3dc5912aba995288bfb20eeeb1222e6.tar.gz sqlite-69eaadbee3dc5912aba995288bfb20eeeb1222e6.zip | |
Merge trunk into the sahpool-digest branch.
FossilOrigin-Name: fc1eeb7d1f2880907b0fe71a8c572dd7cd74a5d65ec0177332976ad2f8c2b216
Diffstat (limited to 'src/vdbeapi.c')
| -rw-r--r-- | src/vdbeapi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 0dc09d501..31880d85b 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -2233,7 +2233,9 @@ int sqlite3_preupdate_old(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ Column *pCol = &p->pTab->aCol[iIdx]; if( pCol->iDflt>0 ){ if( p->apDflt==0 ){ - int nByte = sizeof(sqlite3_value*)*p->pTab->nCol; + int nByte; + assert( sizeof(sqlite3_value*)*UMXV(p->pTab->nCol) < 0x7fffffff ); + nByte = sizeof(sqlite3_value*)*p->pTab->nCol; p->apDflt = (sqlite3_value**)sqlite3DbMallocZero(db, nByte); if( p->apDflt==0 ) goto preupdate_old_out; } @@ -2383,7 +2385,8 @@ int sqlite3_preupdate_new(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ */ assert( p->op==SQLITE_UPDATE ); if( !p->aNew ){ - p->aNew = (Mem *)sqlite3DbMallocZero(db, sizeof(Mem) * p->pCsr->nField); + assert( sizeof(Mem)*UMXV(p->pCsr->nField) < 0x7fffffff ); + p->aNew = (Mem *)sqlite3DbMallocZero(db, sizeof(Mem)*p->pCsr->nField); if( !p->aNew ){ rc = SQLITE_NOMEM; goto preupdate_new_out; |