/ Check-in [03b5e458]
Login

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

Overview
Comment:Avoid passing a null pointer to sqlite3SetString in sqlite3RunParser. Fix for #3155. (CVS 5183)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 03b5e4581a075179c85e8c16b16fd24c151294d3
User & Date: danielk1977 2008-06-02 13:00:33
Context
2008-06-03
07:34
Ensure that vacuum3.test closes all opened database connections. Fix for #3157. (CVS 5184) check-in: 654e3b3d user: danielk1977 tags: trunk
2008-06-02
13:00
Avoid passing a null pointer to sqlite3SetString in sqlite3RunParser. Fix for #3155. (CVS 5183) check-in: 03b5e458 user: danielk1977 tags: trunk
2008-05-30
15:59
Fix typos in comments in vdbe.c. (CVS 5182) check-in: 06135694 user: shane tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/tokenize.c.

    11     11   *************************************************************************
    12     12   ** An tokenizer for SQL
    13     13   **
    14     14   ** This file contains C code that splits an SQL input string up into
    15     15   ** individual tokens and sends those tokens one-by-one over to the
    16     16   ** parser for analysis.
    17     17   **
    18         -** $Id: tokenize.c,v 1.142 2008/04/28 18:46:43 drh Exp $
           18  +** $Id: tokenize.c,v 1.143 2008/06/02 13:00:33 danielk1977 Exp $
    19     19   */
    20     20   #include "sqliteInt.h"
    21     21   #include <ctype.h>
    22     22   #include <stdlib.h>
    23     23   
    24     24   /*
    25     25   ** The charMap() macro maps alphabetic characters into their
................................................................................
   416    416         break;
   417    417       }
   418    418       switch( tokenType ){
   419    419         case TK_SPACE:
   420    420         case TK_COMMENT: {
   421    421           if( db->u1.isInterrupted ){
   422    422             pParse->rc = SQLITE_INTERRUPT;
   423         -          sqlite3SetString(pzErrMsg, "interrupt", (char*)0);
          423  +          if( pzErrMsg ){
          424  +            sqlite3SetString(pzErrMsg, "interrupt", (char*)0);
          425  +          }
   424    426             goto abort_parse;
   425    427           }
   426    428           break;
   427    429         }
   428    430         case TK_ILLEGAL: {
   429    431           if( pzErrMsg ){
   430    432             sqlite3_free(*pzErrMsg);