diff --git a/manifest b/manifest index e0d90caf8e..94d43a58ec 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\sin\sthe\s"showdb"\sutility\sthat\sprevents\sit\sfrom\scorrectly\ndecoding\scells\swith\sno\scontent\sbeyond\sthe\srecord\sheader. -D 2017-03-16T13:14:03.665 +C Fix\san\suninitialized\svariable\sreference\sin\sthe\stext\sgenerator\s\nfor\s"PRAGMA\svdbe_trace=ON"\soutput.\nProblem\sdiscovered\sby\sOSS-Fuzz. +D 2017-03-16T13:30:58.522 F Makefile.in 9605f4c49eace601d5c12c85dd6e037cc613a6d823e857614ba26b42f1285db0 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a @@ -467,7 +467,7 @@ F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6 F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569 -F src/vdbe.c f520378e510fd36bbf289921798dbc8f2b3dc30d +F src/vdbe.c 0e6e5e01aaa57f6d1784b7d6b6a352153e9d2c2ff395c67ca59aef54b8268cf6 F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860 @@ -1565,7 +1565,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 6e59e903e4e956617bddef0b94e5cae02d724ac8145940b57ab5b0f628759736 -R e2b1419a7c2797d673769ba867cc93d0 +P eb7680a1c047b2a33d6a0c9733fafaee11272377c627af10bbd541b6b7ed952b +R 698ee80038f5639a9fb93e688b92867d U drh -Z 979d31964af3fe7c6823fdbe1eb4300f +Z 1c91cacf813bcc1311ca42c9e29c59cd diff --git a/manifest.uuid b/manifest.uuid index 8782dfa202..5411cb37d9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eb7680a1c047b2a33d6a0c9733fafaee11272377c627af10bbd541b6b7ed952b \ No newline at end of file +e3d487162d1596ce125644f754ed9531ef4412f31f6837c3e31b7542b90602fe \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 5901ba0eb5..20bf09e3a4 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -403,9 +403,7 @@ void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf){ }else{ c = 's'; } - - sqlite3_snprintf(100, zCsr, "%c", c); - zCsr += sqlite3Strlen30(zCsr); + *(zCsr++) = c; sqlite3_snprintf(100, zCsr, "%d[", pMem->n); zCsr += sqlite3Strlen30(zCsr); for(i=0; i<16 && in; i++){ @@ -417,9 +415,7 @@ void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf){ if( z<32 || z>126 ) *zCsr++ = '.'; else *zCsr++ = z; } - - sqlite3_snprintf(100, zCsr, "]%s", encnames[pMem->enc]); - zCsr += sqlite3Strlen30(zCsr); + *(zCsr++) = ']'; if( f & MEM_Zero ){ sqlite3_snprintf(100, zCsr,"+%dz",pMem->u.nZero); zCsr += sqlite3Strlen30(zCsr);