1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00

Sync the latest trunk changes, and in particular the STAT4 IS NOT NULL fix.

FossilOrigin-Name: b006792695d23980e1923b21915d5c1138ecf29d
This commit is contained in:
drh
2014-02-11 04:30:29 +00:00
36 changed files with 1104 additions and 686 deletions

View File

@ -2547,7 +2547,8 @@ static int sessionBindValue(
int i, /* Parameter number to bind to */
sqlite3_value *pVal /* Value to bind */
){
if( (pVal->type==SQLITE_TEXT || pVal->type==SQLITE_BLOB) && pVal->z==0 ){
int eType = sqlite3_value_type(pVal);
if( (eType==SQLITE_TEXT || eType==SQLITE_BLOB) && pVal->z==0 ){
/* This condition occurs when an earlier OOM in a call to
** sqlite3_value_text() or sqlite3_value_blob() (perhaps from within
** a conflict-hanler) has zeroed the pVal->z pointer. Return NOMEM. */