summaryrefslogtreecommitdiff
path: root/ext/pdo_sqlite/sqlite/src/callback.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/pdo_sqlite/sqlite/src/callback.c')
-rw-r--r--ext/pdo_sqlite/sqlite/src/callback.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/pdo_sqlite/sqlite/src/callback.c b/ext/pdo_sqlite/sqlite/src/callback.c
index 9fa621752f..2103c3f711 100644
--- a/ext/pdo_sqlite/sqlite/src/callback.c
+++ b/ext/pdo_sqlite/sqlite/src/callback.c
@@ -147,7 +147,7 @@ int sqlite3CheckCollSeq(Parse *pParse, CollSeq *pColl){
** the collation sequence name. A pointer to this string is stored in
** each collation sequence structure.
*/
-static CollSeq * findCollSeqEntry(
+static CollSeq *findCollSeqEntry(
sqlite3 *db,
const char *zName,
int nName,
@@ -286,10 +286,9 @@ FuncDef *sqlite3FindFunction(
** new entry to the hash table and return it.
*/
if( createFlag && bestmatch<6 &&
- (pBest = sqliteMalloc(sizeof(*pBest)+nName+1)) ){
+ (pBest = sqliteMalloc(sizeof(*pBest)+nName)) ){
pBest->nArg = nArg;
pBest->pNext = pFirst;
- pBest->zName = (char*)&pBest[1];
pBest->iPrefEnc = enc;
memcpy(pBest->zName, zName, nName);
pBest->zName[nName] = 0;