/ Check-in [b74885e0]
Login

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

Overview
Comment:Make the minimum allocate size for RowSet objects large enough to accommodate 8-byte pointers. (CVS 5985)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b74885e0856c46412f7cf4dca4cafb740cb9a28b
User & Date: drh 2008-12-05 23:40:23
Context
2008-12-06
14:34
Mark the hash table enlargement in pcache1.c as a benign-failure malloc. (CVS 5986) check-in: 5c0fe63a user: drh tags: trunk
2008-12-05
23:40
Make the minimum allocate size for RowSet objects large enough to accommodate 8-byte pointers. (CVS 5985) check-in: b74885e0 user: drh tags: trunk
22:40
Fix integrity check so that it always reports memory allocation errors that it encounters. (CVS 5984) check-in: 2a3f5ce1 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbemem.c.

    11     11   *************************************************************************
    12     12   **
    13     13   ** This file contains code use to manipulate "Mem" structure.  A "Mem"
    14     14   ** stores a single value in the VDBE.  Mem is an opaque structure visible
    15     15   ** only within the VDBE.  Interface routines refer to a Mem using the
    16     16   ** name sqlite_value
    17     17   **
    18         -** $Id: vdbemem.c,v 1.128 2008/12/04 22:17:56 drh Exp $
           18  +** $Id: vdbemem.c,v 1.129 2008/12/05 23:40:23 drh Exp $
    19     19   */
    20     20   #include "sqliteInt.h"
    21     21   #include <ctype.h>
    22     22   #include "vdbeInt.h"
    23     23   
    24     24   /*
    25     25   ** Call sqlite3VdbeMemExpandBlob() on the supplied value (type Mem*)
................................................................................
   504    504   void sqlite3VdbeMemSetRowSet(Mem *pMem){
   505    505     sqlite3 *db = pMem->db;
   506    506     assert( db!=0 );
   507    507     if( pMem->flags & MEM_RowSet ){
   508    508       sqlite3RowSetClear(pMem->u.pRowSet);
   509    509     }else{
   510    510       sqlite3VdbeMemRelease(pMem);
   511         -    pMem->zMalloc = sqlite3DbMallocRaw(db, 32);
          511  +    pMem->zMalloc = sqlite3DbMallocRaw(db, 64);
   512    512     }
   513    513     if( db->mallocFailed ){
   514    514       pMem->flags = MEM_Null;
   515    515     }else{
   516    516       assert( pMem->zMalloc );
   517    517       pMem->u.pRowSet = sqlite3RowSetInit(db, pMem->zMalloc, 
   518    518                                          sqlite3DbMallocSize(db, pMem->zMalloc));