From: drh Date: Thu, 11 Aug 2016 13:51:05 +0000 (+0000) Subject: Fix a 1 byte buffer overwrite in the "sqldiff --rbu" command. X-Git-Tag: version-3.14.1~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83a3d8f8618d3e48f9bf5ef6b89d97b5b9a528d1;p=thirdparty%2Fsqlite.git Fix a 1 byte buffer overwrite in the "sqldiff --rbu" command. FossilOrigin-Name: 1adb22f51a00f43dfc348c8743ee2038f8de0e16 --- diff --git a/manifest b/manifest index a9b9cff28a..840978deab 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Increase\sthe\sversion\snumber\sto\s3.14.1. -D 2016-08-11T13:08:14.990 +C Fix\sa\s1\sbyte\sbuffer\soverwrite\sin\sthe\s"sqldiff\s--rbu"\scommand. +D 2016-08-11T13:51:05.236 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a @@ -1476,7 +1476,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c -F tool/sqldiff.c 4478f0d30230de6adde90bdb0bfe60f68c5ab782 +F tool/sqldiff.c c965d49bf2677db06103854b47e105484b5b1b84 F tool/srcck1.c 371de5363b70154012955544f86fdee8f6e5326f F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d @@ -1509,7 +1509,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 03dceaea15aa357097a4615ef6044be36d505044 -R 96f17aa9cd3b846a46d32dcc18639935 +P 34aed3a318a413fd180604365546c1f530d1c60c +Q +ab83d7077da80ddbcf399d0797d79e964dc64f0e +R 038a1531f4509514c454aa51ae40913b U drh -Z 0fb46f62de514f587e9ef72a87419537 +Z 2500914b998ba90668de28956c656257 diff --git a/manifest.uuid b/manifest.uuid index d6d9c8d954..07a6d14388 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -34aed3a318a413fd180604365546c1f530d1c60c \ No newline at end of file +1adb22f51a00f43dfc348c8743ee2038f8de0e16 \ No newline at end of file diff --git a/tool/sqldiff.c b/tool/sqldiff.c index e92e8aab25..b1363bb341 100644 --- a/tool/sqldiff.c +++ b/tool/sqldiff.c @@ -1302,7 +1302,7 @@ static void rbudiff_one_table(const char *zTab, FILE *out){ char *zOtaControl; int nOtaControl = sqlite3_column_bytes(pStmt, nCol); - zOtaControl = (char*)sqlite3_malloc(nOtaControl); + zOtaControl = (char*)sqlite3_malloc(nOtaControl+1); memcpy(zOtaControl, sqlite3_column_text(pStmt, nCol), nOtaControl+1); for(i=0; i