Remove another instance of strcpy() from FTS5, to mollify OpenBSD.

FossilOrigin-Name: 35e6248abb4435a8b26d270092b856beff867406

diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index ebc0db751fbb9efe6b2e6435da5424d739092e42..c2a37171ec01a03c0940a4dd6a1dd5b87eea9221 100644 (file)
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -2252,15 +2252,17 @@ static int fts5CreateTokenizer(
 ){
   Fts5Global *pGlobal = (Fts5Global*)pApi;
   Fts5TokenizerModule *pNew;
+  int nName;                      /* Size of zName and its \0 terminator */
   int nByte;                      /* Bytes of space to allocate */
   int rc = SQLITE_OK;
 
-  nByte = sizeof(Fts5TokenizerModule) + strlen(zName) + 1;
+  nName = (int)strlen(zName) + 1;
+  nByte = sizeof(Fts5TokenizerModule) + nName;
   pNew = (Fts5TokenizerModule*)sqlite3_malloc(nByte);
   if( pNew ){
     memset(pNew, 0, nByte);
     pNew->zName = (char*)&pNew[1];
-    strcpy(pNew->zName, zName);
+    memcpy(pNew->zName, zName, nName);
     pNew->pUserData = pUserData;
     pNew->x = *pTokenizer;
     pNew->xDestroy = xDestroy;

diff --git a/manifest b/manifest
index ce65d77a54148266fa4d17b0c246d0ae9aee9033..2e4d2de99b44db6fd6385e6d8a699df0c90aab3f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\suse\sof\sstrcpy()\sin\sFTS5\ssince\sOpenBSD\shates\sstrcpy().
-D 2015-10-10T15:11:49.700
+C Remove\sanother\sinstance\sof\sstrcpy()\sfrom\sFTS5,\sto\smollify\sOpenBSD.
+D 2015-10-10T15:57:20.187
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -113,7 +113,7 @@ F ext/fts5/fts5_config.c 57ee5fe71578cb494574fc0e6e51acb9a22a8695
 F ext/fts5/fts5_expr.c 1df899afed24c9c6195eea1780dcc56fcd1d1139
 F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246
 F ext/fts5/fts5_index.c e03217c37f344f79673be385de6b03f732291000
-F ext/fts5/fts5_main.c 833150368303efe236def0f03ee17d3d4f1c1d4b
+F ext/fts5/fts5_main.c 36fa4fe8b80ba5d596fa6afb910d195f148fd9d2
 F ext/fts5/fts5_storage.c df061a5caf9e50fbbd43113009b5b248362f4995
 F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd
 F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
@@ -1390,7 +1390,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9ddef84d432813f3ece8012047d08441caa3315d
-R e5629b6e9c75c27b580d6b996849f5e2
+P bc24a5bbfd95df3518611b221de69b73776111bc
+R 35f43270ac91020433e35fde493807ce
 U drh
-Z b54cdc21ac2ceff0ade7c4edde93839a
+Z 62a6607ac126b7b5aac408948416878c

diff --git a/manifest.uuid b/manifest.uuid
index 09e4694b0d3e27119153f6a29ff96614ed638cc7..99f29c9a8d3ff26c04dda62732143d2835e794c7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bc24a5bbfd95df3518611b221de69b73776111bc
\ No newline at end of file
+35e6248abb4435a8b26d270092b856beff867406
\ No newline at end of file