From: dan Date: Sat, 17 Dec 2016 08:18:05 +0000 (+0000) Subject: Fix a problem in the shell tools readfile() command causing blobs to be X-Git-Tag: version-3.16.0~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11da002c0209be4cd0e07cefdef0e869e174f2e0;p=thirdparty%2Fsqlite.git Fix a problem in the shell tools readfile() command causing blobs to be truncated at the first embedded 0x00 byte in release builds, or an assert() to fail in a debug build. FossilOrigin-Name: 8dedd6ad44bd1d103dced9d1350188cb2327128d --- diff --git a/manifest b/manifest index 8fda08169a..3f3cdc35e5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\s".lint\sfkey-indexes"\scommand\sto\sthe\scommand-line\sshell. -D 2016-12-16T18:43:49.329 +C Fix\sa\sproblem\sin\sthe\sshell\stools\sreadfile()\scommand\scausing\sblobs\sto\sbe\s\ntruncated\sat\sthe\sfirst\sembedded\s0x00\sbyte\sin\srelease\sbuilds,\sor\san\sassert()\sto\nfail\sin\sa\sdebug\sbuild. +D 2016-12-17T08:18:05.241 F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -389,7 +389,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/select.c e4c687333c5fa33b1ce05c37bfbea6e09d3dbee9 -F src/shell.c 9be556ad9c7cf429d0acc48e386960d290c4df75 +F src/shell.c 95fc9f4cbdfda44f3328ea23d69fb1905a974a90 F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae @@ -1094,7 +1094,8 @@ F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b F test/shell3.test 9b95ba643eaa228376f06a898fb410ee9b6e57c1 F test/shell4.test 89ad573879a745974ff2df20ff97c5d6ffffbd5d F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9 -F test/shell6.test 806472f6ffdd31d632e27dbe8515c0c45f68f3ec +F test/shell6.test 87b47bf2f5c47a4e44f07dd119ea88ae303a8247 +F test/shell7.test 07751911b294698e0c5df67bcbd29e7d2f0f2907 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce @@ -1537,8 +1538,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 d66ec5cfb67c6c8134fb642e0c2f72113fe1b7fd 1268dc77712d85de0b62332c88b22f7489f4e87f -R 687c3d19b933c4e396bfa9c657e5c87e -T +closed 1268dc77712d85de0b62332c88b22f7489f4e87f -U drh -Z fa4bf48b88eaf725bf36396e1a6dc597 +P 94689e3bdac2eabbcf1a51d741c2604ed4bd8a40 +R b4ced5d015604f5a5058a9f967dfbb21 +U dan +Z aab7365a5b426408e7c16bc3f1fbf9d3 diff --git a/manifest.uuid b/manifest.uuid index 78caff5224..04a638bfe5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -94689e3bdac2eabbcf1a51d741c2604ed4bd8a40 \ No newline at end of file +8dedd6ad44bd1d103dced9d1350188cb2327128d \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index c4c1eed3de..d7e6084c4b 100644 --- a/src/shell.c +++ b/src/shell.c @@ -2280,14 +2280,22 @@ void session_help(ShellState *p){ /* Forward reference */ static int process_input(ShellState *p, FILE *in); - /* -** Read the content of a file into memory obtained from sqlite3_malloc64(). -** The caller is responsible for freeing the memory. +** Read the content of file zName into memory obtained from sqlite3_malloc64() +** and return a pointer to the buffer. The caller is responsible for freeing +** the memory. +** +** If parameter pnByte is not NULL, (*pnByte) is set to the number of bytes +** read. +** +** For convenience, a nul-terminator byte is always appended to the data read +** from the file before the buffer is returned. This byte is not included in +** the final value of (*pnByte), if applicable. ** -** NULL is returned if any error is encountered. +** NULL is returned if any error is encountered. The final value of *pnByte +** is undefined in this case. */ -static char *readFile(const char *zName){ +static char *readFile(const char *zName, int *pnByte){ FILE *in = fopen(zName, "rb"); long nIn; size_t nRead; @@ -2305,6 +2313,7 @@ static char *readFile(const char *zName){ return 0; } pBuf[nIn] = 0; + if( pnByte ) *pnByte = nIn; return pBuf; } @@ -2320,12 +2329,13 @@ static void readfileFunc( ){ const char *zName; void *pBuf; + int nBuf; UNUSED_PARAMETER(argc); zName = (const char*)sqlite3_value_text(argv[0]); if( zName==0 ) return; - pBuf = readFile(zName); - if( pBuf ) sqlite3_result_blob(context, pBuf, -1, sqlite3_free); + pBuf = readFile(zName, &nBuf); + if( pBuf ) sqlite3_result_blob(context, pBuf, nBuf, sqlite3_free); } /* @@ -3665,7 +3675,7 @@ static int do_meta_command(char *zLine, ShellState *p){ if( nArg!=2 ){ raw_printf(stderr, "Usage: .check GLOB-PATTERN\n"); rc = 2; - }else if( (zRes = readFile("testcase-out.txt"))==0 ){ + }else if( (zRes = readFile("testcase-out.txt", 0))==0 ){ raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n"); rc = 2; }else if( testcase_glob(azArg[1],zRes)==0 ){ diff --git a/test/shell6.test b/test/shell6.test index 6d3fdd24a3..028ac5efe9 100644 --- a/test/shell6.test +++ b/test/shell6.test @@ -9,6 +9,8 @@ # #*********************************************************************** # +# Test the shell tool ".lint fkey-indexes" command. +# set testdir [file dirname $argv0] source $testdir/tester.tcl diff --git a/test/shell7.test b/test/shell7.test new file mode 100644 index 0000000000..a062885140 --- /dev/null +++ b/test/shell7.test @@ -0,0 +1,54 @@ +# 2016 December 17 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# Test the readfile() function built into the shell tool. Specifically, +# that it does not truncate the blob read at the first embedded 0x00 +# byte. +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +set testprefix shell7 +set CLI [test_find_cli] + + +do_execsql_test 1.0 { + CREATE TABLE f1(tn INTEGER PRIMARY KEY, x BLOB); + CREATE TABLE f2(tn INTEGER PRIMARY KEY, x BLOB); + + INSERT INTO f1 VALUES(1, X'01020304'); + INSERT INTO f1 VALUES(2, X'01000304'); + INSERT INTO f1 VALUES(3, randomblob(200)); +} + +foreach {tn l x} [db eval { SELECT tn, length(x) AS l, x FROM f1 }] { + forcedelete shell7_test.bin + set fd [open shell7_test.bin w] + fconfigure $fd -encoding binary + fconfigure $fd -translation binary + puts -nonewline $fd $x + close $fd + + do_test 1.$tn.1 { file size shell7_test.bin } $l + do_test 1.$tn.2 { + catchcmd test.db "INSERT INTO f2 VALUES($tn, readfile('shell7_test.bin'));" + } {0 {}} + + do_execsql_test 1.$tn.3 { + SELECT (SELECT x FROM f1 WHERE tn=1)==(SELECT x FROM f2 WHERE tn=1) + } {1} +} + + + +finish_test + +