From 4b2f45be3426f18efbe251d39352e11e256b93e9 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 28 Jan 2020 16:55:32 +0000 Subject: [PATCH] Fix a 4 byte OOB read in test_multiplex.c. FossilOrigin-Name: 912148913c11d98e48119a2c1fa7a0e52f318af36e7e2491d968ffde286c949f --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/test_multiplex.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index b4f40aaa47..cf93b0cc89 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\schange\sfor\scompatibility\swith\sthe\ss390\sarchitecture. -D 2020-01-28T15:02:23.155 +C Fix\sa\s4\sbyte\sOOB\sread\sin\stest_multiplex.c. +D 2020-01-28T16:55:32.945 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -570,7 +570,7 @@ F src/test_journal.c a0b9709b2f12b1ec819eea8a1176f283bca6d688a6d4a502bd6fd79786f F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd F src/test_malloc.c dec0aa821b230773aeb3dd11d652c1193f7cedb18a20b25659bc672288115242 F src/test_md5.c 7268e1e8c399d4a5e181b64ac20e1e6f3bc4dd9fc87abac02db145a3d951fa8c -F src/test_multiplex.c e054459f7633f3ff8ce1245da724f9a8be189e4e +F src/test_multiplex.c e5fac104a0eebf935e6732cda6abce79ea0b4b10949518d5dac7b0293173a40f F src/test_multiplex.h 5436d03f2d0501d04f3ed50a75819e190495b635 F src/test_mutex.c 7f4337ba23ee6b1d2ec81c189653608cb069926a F src/test_onefile.c f31e52e891c5fef6709b9fcef54ce660648a34172423a9cbdf4cbce3ba0049f4 @@ -1857,7 +1857,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 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6 -R a9668429122bc65557ad9003c632d2ea -U drh -Z 4ecf0af80de5faa351ede71e45a4f9b0 +P 04885763c4cd00cbca26d048f2b19316bfc93e8edebeceaa171ebfc6c563d53e +R ccb36e16e1c74a951841058837b1c319 +U dan +Z 9b9a621d5ad2b7401767a9771b41836a diff --git a/manifest.uuid b/manifest.uuid index bb3cc48fe4..f17016b83a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -04885763c4cd00cbca26d048f2b19316bfc93e8edebeceaa171ebfc6c563d53e \ No newline at end of file +912148913c11d98e48119a2c1fa7a0e52f318af36e7e2491d968ffde286c949f \ No newline at end of file diff --git a/src/test_multiplex.c b/src/test_multiplex.c index ed8c9f7fa7..56e78c35f7 100644 --- a/src/test_multiplex.c +++ b/src/test_multiplex.c @@ -530,7 +530,7 @@ static int multiplexOpen( pGroup->szChunk += 65536; } } - pGroup->flags = flags; + pGroup->flags = (flags & ~SQLITE_OPEN_URI); rc = multiplexSubFilename(pGroup, 1); if( rc==SQLITE_OK ){ pSubOpen = multiplexSubOpen(pGroup, 0, &rc, pOutFlags, 0);