diff --git a/manifest b/manifest index 0ef21d9b64..4b7b8ab598 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\sunnecessary\scalls\sto\ssqlite3GetCollSeq()\sfor\sa\ssmall\sperformance\sgain. -D 2017-07-06T02:49:26.430 +C Small\ssize\sreduction\sin\sfindCollSeqEntry(). +D 2017-07-06T03:06:20.347 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a @@ -395,7 +395,7 @@ F src/btree.c 00579ff9c2831d6f98cc993f8f2a34c0ff996e89b3cd2f27928f75796bc3a58a F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610 F src/build.c 74108007d286232fb4290464ee5452fa860c26215f8caa0e6c7cbf69a6fafe8f -F src/callback.c bd998420bf59f4b2a2a91aaac012d6225fe22ef1c96d89b77ed73454b39fca08 +F src/callback.c 846e4b0ba5d5480135d5a68bfeec8039ba3c1f909732deb1277bbd59b6dd2614 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 928954802b1397d9fb1378c7eb702c94b4735bbab1d5793e21b6a77734f56a1b F src/date.c cc42a41c7422389860d40419a5e3bce5eaf6e7835c3ba2677751dc653550a5c7 @@ -1628,7 +1628,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 4da663d9863004d8cef58259a043fdcf4f466f80d3714cf58321a52485be8766 -R f4f83b4872dfb399b015b0f0e432a06a +P 503ba172e4c32e288abf006fc5cb53fd2b0313c4ee4c526c2d9c4c21b7178f2d +R dc18259234fe9a82f1b59607b548e9cc U drh -Z 4ba842650b935d4f0f8e4df94a86f4d5 +Z 22e54b9b3cff037761f13c1ae71d4b81 diff --git a/manifest.uuid b/manifest.uuid index 93bf5daeb7..6cc7f7b8f8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -503ba172e4c32e288abf006fc5cb53fd2b0313c4ee4c526c2d9c4c21b7178f2d \ No newline at end of file +55ecd30304517acd23f89b3450fd6a5e18ac2f79aa24a4ff693f8d71a49f7837 \ No newline at end of file diff --git a/src/callback.c b/src/callback.c index d5341f873c..187f36b5fb 100644 --- a/src/callback.c +++ b/src/callback.c @@ -157,8 +157,8 @@ static CollSeq *findCollSeqEntry( pColl = sqlite3HashFind(&db->aCollSeq, zName); if( 0==pColl && create ){ - int nName = sqlite3Strlen30(zName); - pColl = sqlite3DbMallocZero(db, 3*sizeof(*pColl) + nName + 1); + int nName = sqlite3Strlen30(zName) + 1; + pColl = sqlite3DbMallocZero(db, 3*sizeof(*pColl) + nName); if( pColl ){ CollSeq *pDel = 0; pColl[0].zName = (char*)&pColl[3]; @@ -168,7 +168,6 @@ static CollSeq *findCollSeqEntry( pColl[2].zName = (char*)&pColl[3]; pColl[2].enc = SQLITE_UTF16BE; memcpy(pColl[0].zName, zName, nName); - pColl[0].zName[nName] = 0; pDel = sqlite3HashInsert(&db->aCollSeq, pColl[0].zName, pColl); /* If a malloc() failure occurred in sqlite3HashInsert(), it will