From c12075b3b272d0034a2cd7c76237ed5952d52e62 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 2 Dec 2009 20:25:57 +0000 Subject: [PATCH] Change an error message in FTS3 to avoid using an uninitialized variable. FossilOrigin-Name: 620a8a2b38f5f2ad3db304b2bc88360285c174db --- ext/fts3/fts3_tokenizer.c | 2 +- manifest | 24 +++++++++++++++++------- manifest.uuid | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ext/fts3/fts3_tokenizer.c b/ext/fts3/fts3_tokenizer.c index 75d0b1c920..4846675266 100644 --- a/ext/fts3/fts3_tokenizer.c +++ b/ext/fts3/fts3_tokenizer.c @@ -208,7 +208,7 @@ int sqlite3Fts3InitTokenizer( rc = m->xCreate(iArg, aArg, ppTok); assert( rc!=SQLITE_OK || *ppTok ); if( rc!=SQLITE_OK ){ - *pzErr = sqlite3_mprintf("unknown tokenizer: %s", z); + *pzErr = sqlite3_mprintf("unknown tokenizer"); }else{ (*ppTok)->pModule = m; } diff --git a/manifest b/manifest index b7a050f9b4..e8b71b9c45 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,8 @@ -C Fix\san\suninitialized\svalue\sread\sin\ssqlite3async.c. -D 2009-12-02T18:16:56 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Change\san\serror\smessage\sin\sFTS3\sto\savoid\susing\san\suninitialized\svariable. +D 2009-12-02T20:25:57 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -65,7 +68,7 @@ F ext/fts3/fts3_hash.h 39524725425078bf9e814e9569c74a8e5a21b9fb F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295 F ext/fts3/fts3_porter.c 4248815484f9c7e9d4f3c72c1149464485c08abe F ext/fts3/fts3_snippet.c 84ba2fad73aa12628f1950aed74babbf3975e73a -F ext/fts3/fts3_tokenizer.c 36f78d1a43a29b0feaec1ced6da9e56b9c653d1f +F ext/fts3/fts3_tokenizer.c 17335e980994e112c5d332d5bc391f9089350761 F ext/fts3/fts3_tokenizer.h 7ff73caa3327589bf6550f60d93ebdd1f6a0fb5c F ext/fts3/fts3_tokenizer1.c 0a5bcc579f35de5d24a9345d7908dc25ae403ee7 F ext/fts3/fts3_write.c 5d3849443746f41ea4af96dac08d79f2bf75f204 @@ -775,7 +778,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 6a2e0725c20520aa90abb2bc04037ee7acebb930 -R 166ec7739206882740b8be9f04ffbce5 -U dan -Z e19f4a38e8e35a8d02222ea6c00daf7a +P 1cf2136c39239a6fea6ac2a555f55865dd517d93 +R 0f4546d90604cf92dd5fde0d50285661 +U drh +Z 1284cd277d437cb9872d01d8f52cb230 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFLFs1YoxKgR168RlERAsr4AJ0Wqgh8Ks34kpZXxxzkvIRC3waMbQCfRmhw +h0NT+TCC5NLKQEBPsOETtWk= +=ql9X +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 51404e62bc..dc709b1919 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1cf2136c39239a6fea6ac2a555f55865dd517d93 \ No newline at end of file +620a8a2b38f5f2ad3db304b2bc88360285c174db \ No newline at end of file