database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

In setQuotedToken(), only make a malloced copy if the argument contains one or more " characters. (CVS 4941)

Browse Source 
FossilOrigin-Name: b266924b8975b69bdb9ab45cf462e41436f89cc2
This commit is contained in:
danielk1977
2008-03-31 17:41:18 +00:00
parent fe3f4e8a4a
commit a686bfcfa5
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/select.c
View File

@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements in SQLite.
**
** $Id: select.c,v 1.422 2008/03/27 17:59:02 danielk1977 Exp $
** $Id: select.c,v 1.423 2008/03/31 17:41:18 danielk1977 Exp $
*/
#include "sqliteInt.h"
@@ -205,12 +205,30 @@ static void setToken(Token *p, const char *z){
** {a"bc} -> {"a""bc"}
*/
static void setQuotedToken(Parse *pParse, Token *p, const char *z){
p->z = (u8 *)sqlite3MPrintf(0, "\"%w\"", z);
p->dyn = 1;
if( p->z ){
p->n = strlen((char *)p->z);
/* Check if the string contains any " characters. If it does, then
** this function will malloc space to create a quoted version of
** the string in. Otherwise, save a call to sqlite3MPrintf() by
** just copying the pointer to the string.
*/
const char *z2 = z;
while( *z2 ){
if( *z2=='"' ) break;
z2++;
}
if( *z2 ){
/* String contains " characters - copy and quote the string. */
p->z = (u8 *)sqlite3MPrintf(pParse->db, "\"%w\"", z);
if( p->z ){
p->n = strlen((char *)p->z);
p->dyn = 1;
}
}else{
pParse->db->mallocFailed = 1;
/* String contains no " characters - copy the pointer. */
p->z = (u8*)z;
p->n = (z2 - z);
p->dyn = 0;
}
}