/ Check-in [15d215d6]
Login

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

Overview
Comment:Back out part of the change in [23ea2b700fd6d28d] since TH3 reveals some problems in OOM situations.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 15d215d62df72c1bf1e605629692ee40d96546a6
User & Date: drh 2009-11-16 21:28:45
Context
2009-11-16
22:54
Fix a reference to freed memory that can occur following an OOM error in where.c. check-in: 929b6047 user: drh tags: trunk
21:28
Back out part of the change in [23ea2b700fd6d28d] since TH3 reveals some problems in OOM situations. check-in: 15d215d6 user: drh tags: trunk
15:11
Use the sqlite3CtypeMap to improve the speed and reduce the size of the logic in the tokenizer that recognizes identifiers. check-in: 1c9243b0 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbeaux.c.

  2782   2782     int rc = 0;
  2783   2783     const unsigned char *aKey1 = (const unsigned char *)pKey1;
  2784   2784     KeyInfo *pKeyInfo;
  2785   2785     Mem mem1;
  2786   2786   
  2787   2787     pKeyInfo = pPKey2->pKeyInfo;
  2788   2788     mem1.enc = pKeyInfo->enc;
  2789         -  mem1.db = 0;
         2789  +  mem1.db = pKeyInfo->db;
  2790   2790     /* mem1.flags = 0;  // Will be initialized by sqlite3VdbeSerialGet() */
  2791   2791     VVA_ONLY( mem1.zMalloc = 0; ) /* Only needed by assert() statements */
  2792   2792   
  2793   2793     /* Compilers may complain that mem1.u.i is potentially uninitialized.
  2794   2794     ** We could initialize it, as shown here, to silence those complaints.
  2795   2795     ** But in fact, mem1.u.i will never actually be used initialized, and doing 
  2796   2796     ** the unnecessary initialization has a measurable negative performance