From: drh <drh@noemail.net>
Date: Thu, 16 Feb 2017 17:18:07 +0000 (+0000)
Subject: Change two MallocZero() calls into MallocRaw() to avoid unnecessary memset().
X-Git-Tag: version-3.18.0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c258dc1cc40a09cbfb51857fe208db60b234d64;p=thirdparty%2Fsqlite.git

Change two MallocZero() calls into MallocRaw() to avoid unnecessary memset().

FossilOrigin-Name: ff5e733cbffd73faa4046e0f1c7f24bb6e131738
---

diff --git a/manifest b/manifest
index 2f0acb041e..e0da0536b9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scomment\son\sa\sfield\sof\sthe\sExprList\sobject.\s\sNo\schanges\sto\scode.
-D 2017-02-16T16:26:53.932
+C Change\stwo\sMallocZero()\scalls\sinto\sMallocRaw()\sto\savoid\sunnecessary\smemset().
+D 2017-02-16T17:18:07.363
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
@@ -347,7 +347,7 @@ F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
 F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 0d9d5549d42e79ce4d82ff1db1e6c81e36d2f67c
-F src/expr.c 38bd92fcbd86b3904bfa29e477412e374b7df5a2
+F src/expr.c 8a29e9b72d4b642189999c41782cd6c5bc43512f
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
 F src/func.c c67273e1ec08abbdcc14c189892a3ff6eeece86b
@@ -357,7 +357,7 @@ F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3ed64afc49c0a2221e397b9f65d231ffbef506fe
-F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
+F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
 F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
 F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0
 F src/malloc.c d0a1474236486165bcb349af82e2a6560178bf7b
@@ -1556,7 +1556,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 7e14044c65f64322769bcad4640a5896be0a1687
-R 1b3160298650a3391d35f7b330db72f9
+P bb8e264227175fc93f1c86a0083f8ad6c4ce2dc7
+R 99427a1cfe699c929367ef60ee07c16f
 U drh
-Z 62831885c60053730e2b44cb5ef10954
+Z 3888dc5073b69fac4d8570651367948c
diff --git a/manifest.uuid b/manifest.uuid
index 878e0d699a..21b82efc27 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bb8e264227175fc93f1c86a0083f8ad6c4ce2dc7
\ No newline at end of file
+ff5e733cbffd73faa4046e0f1c7f24bb6e131738
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 505e56a272..2bf76eb0d7 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2367,7 +2367,7 @@ static char *exprINAffinity(Parse *pParse, Expr *pExpr){
   char *zRet;
 
   assert( pExpr->op==TK_IN );
-  zRet = sqlite3DbMallocZero(pParse->db, nVal+1);
+  zRet = sqlite3DbMallocRaw(pParse->db, nVal+1);
   if( zRet ){
     int i;
     for(i=0; i<nVal; i++){
diff --git a/src/legacy.c b/src/legacy.c
index bd34512d31..df8e2780fb 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -73,7 +73,7 @@ int sqlite3_exec(
           (SQLITE_DONE==rc && !callbackIsInit
                            && db->flags&SQLITE_NullCallback)) ){
         if( !callbackIsInit ){
-          azCols = sqlite3DbMallocZero(db, 2*nCol*sizeof(const char*) + 1);
+          azCols = sqlite3DbMallocRaw(db, (2*nCol+1)*sizeof(const char*));
           if( azCols==0 ){
             goto exec_out;
           }
@@ -94,6 +94,7 @@ int sqlite3_exec(
               goto exec_out;
             }
           }
+          azVals[i] = 0;
         }
         if( xCallback(pArg, nCol, azVals, azCols) ){
           /* EVIDENCE-OF: R-38229-40159 If the callback function to