aboutsummaryrefslogtreecommitdiff
path: root/src/callback.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2008-07-08 14:52:07 +0000
committerdrh <drh@noemail.net>2008-07-08 14:52:07 +0000
commit0a687d123ea074085cb8a526ec0b32841f1c8045 (patch)
tree8e959cde858802c5afd40f247da610da2ba4b996 /src/callback.c
parent35af9ba095fcc4dfb899959c552156c49133c9a0 (diff)
downloadsqlite-0a687d123ea074085cb8a526ec0b32841f1c8045.tar.gz
sqlite-0a687d123ea074085cb8a526ec0b32841f1c8045.zip
Improved enforcement of the SQLITE_LIMIT_LENGTH limit. (CVS 5368)
FossilOrigin-Name: ee93150878436ce6e992ea8a1d348fb58b03b5e2
Diffstat (limited to 'src/callback.c')
-rw-r--r--src/callback.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/callback.c b/src/callback.c
index 1a8198b06..09f6841d9 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -13,7 +13,7 @@
** This file contains functions used to access the internal hash tables
** of user defined functions and collation sequences.
**
-** $Id: callback.c,v 1.24 2008/06/23 16:53:47 danielk1977 Exp $
+** $Id: callback.c,v 1.25 2008/07/08 14:52:10 drh Exp $
*/
#include "sqliteInt.h"
@@ -25,7 +25,7 @@
*/
static void callCollNeeded(sqlite3 *db, const char *zName, int nName){
assert( !db->xCollNeeded || !db->xCollNeeded16 );
- if( nName<0 ) nName = strlen(zName);
+ if( nName<0 ) nName = sqlite3Strlen(db, zName);
if( db->xCollNeeded ){
char *zExternal = sqlite3DbStrNDup(db, zName, nName);
if( !zExternal ) return;
@@ -158,7 +158,7 @@ static CollSeq *findCollSeqEntry(
int create
){
CollSeq *pColl;
- if( nName<0 ) nName = strlen(zName);
+ if( nName<0 ) nName = sqlite3Strlen(db, zName);
pColl = sqlite3HashFind(&db->aCollSeq, zName, nName);
if( 0==pColl && create ){