SQLite: Check-in [3765aaf7]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	In valueFromExpr() only generate a OOM fault if there have been no prior faults.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA3-256:	3765aaf712998af5ffb6bc680a0c1419f2b5deb47ecbc1835ba5879127c4dbe3
User & Date:	drh 2017-12-13 23:47:55
Original Comment:	In valueFromExpr() only generate a OOM fault if there have been now prior faults.

Context

2017-12-15
12:22		In the LEMON parser generator, provide reduce actions with access to the lookahead token. (check-in: 42af190f user: drh tags: trunk)
2017-12-14
14:50		Bring in the latest trunk changes. (check-in: 75d85177 user: drh tags: appendvfs)
13:55		Merge latest trunk changes into this branch. (check-in: 803156cb user: dan tags: sqlar-shell-support)
2017-12-13
23:47		In valueFromExpr() only generate a OOM fault if there have been no prior faults. (check-in: 3765aaf7 user: drh tags: trunk)
22:42		Add support for the 'lsm1.c' target in the MSVC makefile. (check-in: 6de21dea user: mistachkin tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbemem.c.

  1416   1416     }
  1417   1417   #endif
  1418   1418   
  1419   1419     *ppVal = pVal;
  1420   1420     return rc;
  1421   1421   
  1422   1422   no_mem:
  1423         -  sqlite3OomFault(db);
         1423  +#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
         1424  +  if( pCtx==0 || pCtx->pParse->nErr==0 )
         1425  +#endif
         1426  +    sqlite3OomFault(db);
  1424   1427     sqlite3DbFree(db, zVal);
  1425   1428     assert( *ppVal==0 );
  1426   1429   #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
  1427   1430     if( pCtx==0 ) sqlite3ValueFree(pVal);
  1428   1431   #else
  1429   1432     assert( pCtx==0 ); sqlite3ValueFree(pVal);
  1430   1433   #endif