198544 2019-06-04 14:43:45 -0700 Fix miscellaneous build warnings 2019-06-04 20:14:27 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro bugs-noreply commit-queue don.olmstead mcatanzaro oldest_to_newest 1541747 0 mcatanzaro 2019-06-04 14:43:45 -0700 [2321/4597] Building CXX object Source...sources/UnifiedSource-15db4ad9-2.cpp.o In file included from DerivedSources/JavaScriptCore/unified-sources/UnifiedSource-15db4ad9-2.cpp:2: ../../Source/JavaScriptCore/wasm/WasmInstance.cpp: In constructor ‘JSC::Wasm::Instance::Instance(JSC::Wasm::Context*, WTF::Ref<JSC::Wasm::Module>&&, JSC::EntryFrame**, void**, JSC::Wasm::Instance::StoreTopCallFrameCallback&&)’: ../../Source/JavaScriptCore/wasm/WasmInstance.cpp:58:68: warning: ‘void* memset(void*, int, size_t)’ clearing an object of non-trivial type ‘union JSC::Wasm::Instance::GlobalValue’; use assignment instead [-Wclass-memaccess] 58 | memset(m_globals.get(), 0, globalMemoryByteSize(m_module.get())); | ^ In file included from ../../Source/JavaScriptCore/wasm/WasmInstance.cpp:27, from DerivedSources/JavaScriptCore/unified-sources/UnifiedSource-15db4ad9-2.cpp:2: ../../Source/JavaScriptCore/wasm/WasmInstance.h:157:11: note: ‘union JSC::Wasm::Instance::GlobalValue’ declared here 157 | union GlobalValue { | ^~~~~~~~~~~ [3455/4592] Building CXX object Source...sources/UnifiedSource-5037b3e8-2.cpp.o In file included from DerivedSources/ForwardingHeaders/wtf/StdLibExtras.h:32, from DerivedSources/ForwardingHeaders/wtf/FastMalloc.h:25, from ../../Source/WebCore/config.h:50, from ../../Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp:26, from DerivedSources/WebCore/unified-sources/UnifiedSource-5037b3e8-2.cpp:1: ../../Source/WebCore/contentextensions/DFABytecodeCompiler.cpp: In member function ‘void WebCore::ContentExtensions::DFABytecodeCompiler::compile()’: ../../Source/WebCore/contentextensions/DFABytecodeCompiler.cpp:464:36: warning: comparison of integer expressions of different signedness: ‘uint32_t’ {aka ‘unsigned int’} and ‘int’ [-Wsign-compare] 464 | RELEASE_ASSERT(destination < std::numeric_limits<int32_t>::max()); | ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DerivedSources/ForwardingHeaders/wtf/Assertions.h:333:11: note: in definition of macro ‘ASSERT’ 333 | if (!(assertion)) { \ | ^~~~~~~~~ ../../Source/WebCore/contentextensions/DFABytecodeCompiler.cpp:464:9: note: in expansion of macro ‘RELEASE_ASSERT’ 464 | RELEASE_ASSERT(destination < std::numeric_limits<int32_t>::max()); | ^~~~~~~~~~~~~~ [3572/4592] Building CXX object Source...sources/UnifiedSource-84c9f43f-1.cpp.o In file included from DerivedSources/ForwardingHeaders/wtf/StdLibExtras.h:32, from DerivedSources/ForwardingHeaders/wtf/FastMalloc.h:25, from ../../Source/WebCore/config.h:50, from ../../Source/WebCore/inspector/CommandLineAPIHost.cpp:31, from DerivedSources/WebCore/unified-sources/UnifiedSource-84c9f43f-1.cpp:1: ../../Source/WebCore/inspector/InspectorCanvas.cpp: In member function ‘int WebCore::InspectorCanvas::indexForData(WebCore::InspectorCanvas::DuplicateDataVariant)’: ../../Source/WebCore/inspector/InspectorCanvas.cpp:435:22: warning: comparison of integer expressions of different signedness: ‘size_t’ {aka ‘long unsigned int’} and ‘int’ [-Wsign-compare] 435 | ASSERT(index < std::numeric_limits<int>::max()); | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DerivedSources/ForwardingHeaders/wtf/Assertions.h:333:11: note: in definition of macro ‘ASSERT’ 333 | if (!(assertion)) { \ | ^~~~~~~~~ ../../Source/WebCore/inspector/InspectorCanvas.cpp:529:18: warning: comparison of integer expressions of different signedness: ‘size_t’ {aka ‘long unsigned int’} and ‘int’ [-Wsign-compare] 529 | ASSERT(index < std::numeric_limits<int>::max()); | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DerivedSources/ForwardingHeaders/wtf/Assertions.h:333:11: note: in definition of macro ‘ASSERT’ 333 | if (!(assertion)) { \ | ^~~~~~~~~ [3711/4592] Building CXX object Source...sources/UnifiedSource-42f7b70e-4.cpp.o In file included from DerivedSources/WebCore/unified-sources/UnifiedSource-42f7b70e-4.cpp:1: ../../Source/WebCore/xml/XSLStyleSheetLibxslt.cpp: In member function ‘bool WebCore::XSLStyleSheet::parseString(const WTF::String&)’: ../../Source/WebCore/xml/XSLStyleSheetLibxslt.cpp:148:66: warning: comparison of integer expressions of different signedness: ‘unsigned int’ and ‘int’ [-Wsign-compare] 148 | if (unsignedSize.hasOverflowed() || unsignedSize.unsafeGet() > std::numeric_limits<int>::max()) | ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [4108/4592] Building CXX object Source...sources/UnifiedSource-72468c22-7.cpp.o In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-72468c22-7.cpp:1: ../../Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp: In function ‘WTF::Optional<std::array<unsigned char, 8> > WebKit::NetworkCache::readOrMakeSalt(const WTF::String&)’: ../../Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp:186:19: warning: comparison of integer expressions of different signedness: ‘long int’ and ‘std::array<unsigned char, 8>::size_type’ {aka ‘long unsigned int’} [-Wsign-compare] 186 | if (bytesRead != salt.size()) { | ~~~~~~~~~~^~~~~~~~~~~~~~ ../../Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp:191:60: warning: comparison of integer expressions of different signedness: ‘ssize_t’ {aka ‘long int’} and ‘std::array<unsigned char, 8>::size_type’ {aka ‘long unsigned int’} [-Wsign-compare] 191 | bool success = write(fd, salt.data(), salt.size()) == salt.size(); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ [4434/4592] Building CXX object Tools/...dle.dir/gtk/PlatformUtilitiesGtk.cpp.o In file included from ../DependenciesGTK/Root/include/gtk-3.0/gtk/gtk.h:100, from ../../Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp:29: ../DependenciesGTK/Root/include/gtk-3.0/gtk/gtkfilechooserbutton.h:66:8: warning: unnecessary parentheses in declaration of ‘__gtk_reserved1’ [-Wparentheses] 66 | void (*__gtk_reserved1); | ^ ../DependenciesGTK/Root/include/gtk-3.0/gtk/gtkfilechooserbutton.h:67:8: warning: unnecessary parentheses in declaration of ‘__gtk_reserved2’ [-Wparentheses] 67 | void (*__gtk_reserved2); | ^ ../DependenciesGTK/Root/include/gtk-3.0/gtk/gtkfilechooserbutton.h:68:8: warning: unnecessary parentheses in declaration of ‘__gtk_reserved3’ [-Wparentheses] 68 | void (*__gtk_reserved3); | ^ ../DependenciesGTK/Root/include/gtk-3.0/gtk/gtkfilechooserbutton.h:69:8: warning: unnecessary parentheses in declaration of ‘__gtk_reserved4’ [-Wparentheses] 69 | void (*__gtk_reserved4); | ^ In file included from ../DependenciesGTK/Root/include/gtk-3.0/gtk/gtk.h:271, from ../../Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp:29: ../DependenciesGTK/Root/include/gtk-3.0/gtk/deprecated/gtkstatusicon.h:74:8: warning: unnecessary parentheses in declaration of ‘__gtk_reserved1’ [-Wparentheses] 74 | void (*__gtk_reserved1); | ^ ../DependenciesGTK/Root/include/gtk-3.0/gtk/deprecated/gtkstatusicon.h:75:8: warning: unnecessary parentheses in declaration of ‘__gtk_reserved2’ [-Wparentheses] 75 | void (*__gtk_reserved2); | ^ ../DependenciesGTK/Root/include/gtk-3.0/gtk/deprecated/gtkstatusicon.h:76:8: warning: unnecessary parentheses in declaration of ‘__gtk_reserved3’ [-Wparentheses] 76 | void (*__gtk_reserved3); | ^ ../DependenciesGTK/Root/include/gtk-3.0/gtk/deprecated/gtkstatusicon.h:77:8: warning: unnecessary parentheses in declaration of ‘__gtk_reserved4’ [-Wparentheses] 77 | void (*__gtk_reserved4); | ^ 1541749 1 371340 mcatanzaro 2019-06-04 14:50:39 -0700 Created attachment 371340 Patch 1541758 2 371340 don.olmstead 2019-06-04 15:30:11 -0700 Comment on attachment 371340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371340&action=review r=me with nits > Tools/TestWebKitAPI/PlatformGTK.cmake:110 > +set(TestJSC_SYSTEM_INCLUDE_DIRECTORIES > + ${GLIB_INCLUDE_DIRS} > + ${GTK3_INCLUDE_DIRS} > +) > + > set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES > ${CMAKE_BINARY_DIR} > ${TESTWEBKITAPI_DIR} > - ${GLIB_INCLUDE_DIRS} > - ${GTK3_INCLUDE_DIRS} > ${THIRDPARTY_DIR}/gtest/include This was copy pasted in PlatformWPE.cmake. this need updating as well? 1541846 3 mcatanzaro 2019-06-04 19:44:21 -0700 PlatformWPE.cmake has: set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR} ${TESTWEBKITAPI_DIR} ${THIRDPARTY_DIR}/gtest/include ${FORWARDING_HEADERS_DIR} ${FORWARDING_HEADERS_DIR}/JavaScriptCore ${FORWARDING_HEADERS_DIR}/JavaScriptCore/glib ${DERIVED_SOURCES_JAVASCRIPCOREWPE_DIR} ) No system includes there. Looks good. Well, it's surely a bug that it includes ${GLIB_LIBRARIES} and ${GLIB_GMODULE_LIBRARIES} in TestJSC_LIBRARIES but not ${GLIB_INCLUDE_DIRS}, but I'm not brave enough to look at that. 1541867 4 371340 commit-queue 2019-06-04 20:14:26 -0700 Comment on attachment 371340 Patch Clearing flags on attachment: 371340 Committed r246095: <https://trac.webkit.org/changeset/246095> 1541868 5 commit-queue 2019-06-04 20:14:27 -0700 All reviewed patches have been landed. Closing bug. 371340 2019-06-04 14:50:39 -0700 2019-06-04 20:14:26 -0700 Patch bug-198544-20190604165038.patch text/plain 8482 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz YzBjOTE4N2EwMGQ5NGUwMzQ2YzhiN2ZmOTQ0MWIxNzNlZDMxZmE4Li4xNDkyYWQ2Mjc1N2I0ZWM2 ZjQwNTU4NzZkZjc4YWM5NTFhZGYxNmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxOS0wNi0wNCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln YWxpYS5jb20+CisKKyAgICAgICAgRml4IG1pc2NlbGxhbmVvdXMgYnVpbGQgd2FybmluZ3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODU0NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbGVuY2UgLVdj bGFzcy1tZW1hY2Nlc3Mgd2FybmluZyBpbiB0aGlzIGRhbmdlcm91cyBjb2RlLgorCisgICAgICAg ICogd2FzbS9XYXNtSW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpXYXNtOjpJbnN0YW5jZTo6 SW5zdGFuY2UpOgorCiAyMDE5LTA2LTAzICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4K IAogICAgICAgICBGaW5pc2ggY2xlYW51cCBvZiBTdHJpbmc6Om51bWJlciBmb3IgZmxvYXRpbmcg cG9pbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCAyZWYxNWUyN2Q2ZTQwY2U4MGQxN2E5ZmJkNWU0NDJjY2Y3NWMz MDI0Li5lNTBjN2U2ZGVhNjdkMDMzZmVkZDQ4MDhlODhhZTI4N2UzMjcyNjYyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDYtMDQgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFu emFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBtaXNjZWxsYW5lb3VzIGJ1aWxkIHdhcm5p bmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg1 NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYXJl ZnVsbHkgc2lsZW5jZSAtV3NpZ24tY29tcGFyZSB3YXJuaW5ncy4KKworICAgICAgICAqIGNvbnRl bnRleHRlbnNpb25zL0RGQUJ5dGVjb2RlQ29tcGlsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q29udGVudEV4dGVuc2lvbnM6OkRGQUJ5dGVjb2RlQ29tcGlsZXI6OmNvbXBpbGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDYW52YXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQ2FudmFzOjppbmRleEZvckRhdGEpOgorICAgICAgICAqIHhtbC9YU0xTdHlsZVNoZWV0 TGlieHNsdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYU0xTdHlsZVNoZWV0OjpwYXJzZVN0cmlu Zyk6CisKIDIwMTktMDYtMDMgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgog CiAgICAgICAgIFtOaWNvc2lhXSBEaXNhYmxlIGFzeW5jIHNjcm9sbGluZyB1bnRpbCBpbXBsZW1l bnRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZwppbmRleCAzNjM4YTA2ODJlZDAxOGZhYmFhYmI1Yzc1YjQwMzAyZDU3ZTJkMGU2 Li43ODQ2OGRiYjQwZmQ0ZGU2MTgxMGQwYjhiYjMwNzg4YWJiYzIwY2M4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDE5LTA2LTA0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9A aWdhbGlhLmNvbT4KKworICAgICAgICBGaXggbWlzY2VsbGFuZW91cyBidWlsZCB3YXJuaW5ncwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4NTQ0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2FyZWZ1bGx5 IHNpbGVuY2UgLVdzaWduLWNvbXBhcmUgd2FybmluZ3MuCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a0NhY2hlOjpyZWFkT3JNYWtlU2FsdCk6CisKIDIwMTktMDYtMDMgIERhcmluIEFkbGVyICA8ZGFy aW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpbmlzaCBjbGVhbnVwIG9mIFN0cmluZzo6bnVtYmVy IGZvciBmbG9hdGluZyBwb2ludApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dh c20vV2FzbUluc3RhbmNlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21JbnN0 YW5jZS5jcHAKaW5kZXggYTVlMGZjZDgzZDViMjNkMzk1ZGNiZTk3NmM0ZDZkNThhMmVjZWJkMS4u MzcwNTk5NjhlMGI3ODU0ZDI3MzM2ZjE5MzdlYzI1OGEzNzBiNDk2NiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUluc3RhbmNlLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvd2FzbS9XYXNtSW5zdGFuY2UuY3BwCkBAIC01NSw3ICs1NSw3IEBAIEluc3Rh bmNlOjpJbnN0YW5jZShDb250ZXh0KiBjb250ZXh0LCBSZWY8TW9kdWxlPiYmIG1vZHVsZSwgRW50 cnlGcmFtZSoqIHBvaW50ZXJUCiB7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fbnVt SW1wb3J0RnVuY3Rpb25zOyArK2kpCiAgICAgICAgIG5ldyAoaW1wb3J0RnVuY3Rpb25JbmZvKGkp KSBJbXBvcnRGdW5jdGlvbkluZm8oKTsKLSAgICBtZW1zZXQobV9nbG9iYWxzLmdldCgpLCAwLCBn bG9iYWxNZW1vcnlCeXRlU2l6ZShtX21vZHVsZS5nZXQoKSkpOworICAgIG1lbXNldChzdGF0aWNf Y2FzdDx2b2lkKj4obV9nbG9iYWxzLmdldCgpKSwgMCwgZ2xvYmFsTWVtb3J5Qnl0ZVNpemUobV9t b2R1bGUuZ2V0KCkpKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9tb2R1bGUtPm1v ZHVsZUluZm9ybWF0aW9uKCkuZ2xvYmFscy5zaXplKCk7ICsraSkgewogICAgICAgICBpZiAobV9t b2R1bGUuZ2V0KCkubW9kdWxlSW5mb3JtYXRpb24oKS5nbG9iYWxzW2ldLnR5cGUgPT0gQW55cmVm KQogICAgICAgICAgICAgbV9nbG9iYWxzVG9NYXJrLnNldChpKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0RGQUJ5dGVjb2RlQ29tcGlsZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvREZBQnl0ZWNvZGVDb21waWxlci5jcHAKaW5k ZXggYzk2MTA1MWMwOTJjNTViZDEzNjMyYTRjOWRjY2E0YWY2ZDVmYjZhOC4uMmIwNGIyMmIwMWUx MTRlYjZhOTM5YWEwZWFhMmM1MzIwOTVjZmQwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y29udGVudGV4dGVuc2lvbnMvREZBQnl0ZWNvZGVDb21waWxlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY29udGVudGV4dGVuc2lvbnMvREZBQnl0ZWNvZGVDb21waWxlci5jcHAKQEAgLTQ2MSw3 ICs0NjEsNyBAQCB2b2lkIERGQUJ5dGVjb2RlQ29tcGlsZXI6OmNvbXBpbGUoKQogICAgIC8vIExp bmsuCiAgICAgZm9yIChjb25zdCBhdXRvJiBsaW5rUmVjb3JkIDogbV9saW5rUmVjb3Jkcykgewog ICAgICAgICB1aW50MzJfdCBkZXN0aW5hdGlvbiA9IG1fbm9kZVN0YXJ0T2Zmc2V0c1tsaW5rUmVj b3JkLmRlc3RpbmF0aW9uTm9kZUluZGV4XTsKLSAgICAgICAgUkVMRUFTRV9BU1NFUlQoZGVzdGlu YXRpb24gPCBzdGQ6Om51bWVyaWNfbGltaXRzPGludDMyX3Q+OjptYXgoKSk7CisgICAgICAgIFJF TEVBU0VfQVNTRVJUKGRlc3RpbmF0aW9uIDwgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KHN0ZDo6bnVt ZXJpY19saW1pdHM8aW50MzJfdD46Om1heCgpKSk7CiAgICAgICAgIGludDMyX3QgZGlzdGFuY2Ug PSBkZXN0aW5hdGlvbiAtIGxpbmtSZWNvcmQuaW5zdHJ1Y3Rpb25Mb2NhdGlvbjsKICAgICAgICAg QVNTRVJUKGFicyhkaXN0YW5jZSkgPD0gYWJzKGxpbmtSZWNvcmQubG9uZ2VzdFBvc3NpYmxlSnVt cCkpOwogICAgICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDYW52YXMuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZh cy5jcHAKaW5kZXggODc4Mjc1MzU1NTFiMTM4NjQyYTRjM2NiYmU1OTI0Mjg5MDFmNjQ1Mi4uNGIy MmQ1ZDI3OTZlOTg1NmY1NWQ2OWYwMGMxNWYwMjFlYWUzMjc4ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhcy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhcy5jcHAKQEAgLTQzMiw3ICs0MzIsNyBAQCBpbnQg SW5zcGVjdG9yQ2FudmFzOjppbmRleEZvckRhdGEoRHVwbGljYXRlRGF0YVZhcmlhbnQgZGF0YSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0pOwogICAgIGlmIChpbmRleCAhPSBub3RGb3Vu ZCkgewotICAgICAgICBBU1NFUlQoaW5kZXggPCBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1h eCgpKTsKKyAgICAgICAgQVNTRVJUKGluZGV4IDwgc3RhdGljX2Nhc3Q8c2l6ZV90PihzdGQ6Om51 bWVyaWNfbGltaXRzPGludD46Om1heCgpKSk7CiAgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxp bnQ+KGluZGV4KTsKICAgICB9CiAKQEAgLTUyNiw3ICs1MjYsNyBAQCBpbnQgSW5zcGVjdG9yQ2Fu dmFzOjppbmRleEZvckRhdGEoRHVwbGljYXRlRGF0YVZhcmlhbnQgZGF0YSkKICAgICAgICAgaW5k ZXggPSBtX2luZGV4ZWREdXBsaWNhdGVEYXRhLnNpemUoKSAtIDE7CiAgICAgfQogCi0gICAgQVNT RVJUKGluZGV4IDwgc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKSk7CisgICAgQVNTRVJU KGluZGV4IDwgc3RhdGljX2Nhc3Q8c2l6ZV90PihzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1h eCgpKSk7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGludD4oaW5kZXgpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMU3R5bGVTaGVldExpYnhzbHQuY3BwIGIvU291cmNl L1dlYkNvcmUveG1sL1hTTFN0eWxlU2hlZXRMaWJ4c2x0LmNwcAppbmRleCA2Njk4ODc4YTk1ODNi MDA5ZmEwMTgyZmVmZDQxYTE4N2ZlODk0MTc2Li5lYzJjNmFlMDQ1OWEwNjkyNTZhNjYyZjcyYzg3 MjY3ZmVhMWE0NWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMU3R5bGVTaGVl dExpYnhzbHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YU0xTdHlsZVNoZWV0TGlieHNs dC5jcHAKQEAgLTE0NSw3ICsxNDUsNyBAQCBib29sIFhTTFN0eWxlU2hlZXQ6OnBhcnNlU3RyaW5n KGNvbnN0IFN0cmluZyYgc3RyaW5nKQogICAgIGNvbnN0IGNoYXIqIGJ1ZmZlciA9IHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgY2hhcio+KHVwY29udmVydGVkQ2hhcmFjdGVycy5nZXQoKSk7CiAgICAg Q2hlY2tlZDx1bnNpZ25lZCwgUmVjb3JkT3ZlcmZsb3c+IHVuc2lnbmVkU2l6ZSA9IHN0cmluZy5s ZW5ndGgoKTsKICAgICB1bnNpZ25lZFNpemUgKj0gc2l6ZW9mKFVDaGFyKTsKLSAgICBpZiAodW5z aWduZWRTaXplLmhhc092ZXJmbG93ZWQoKSB8fCB1bnNpZ25lZFNpemUudW5zYWZlR2V0KCkgPiBz dGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1heCgpKQorICAgIGlmICh1bnNpZ25lZFNpemUuaGFz T3ZlcmZsb3dlZCgpIHx8IHVuc2lnbmVkU2l6ZS51bnNhZmVHZXQoKSA+IHN0YXRpY19jYXN0PHVu c2lnbmVkPihzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1heCgpKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgaW50IHNpemUgPSBzdGF0aWNfY2FzdDxpbnQ+KHVuc2lnbmVkU2l6ZS51 bnNhZmVHZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZURhdGEuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVEYXRhLmNwcAppbmRleCBhZTBjNjZkYWMzZTU2N2MzMDU0ZDJiZmVm ZTkwOGE4MWNmMTRiMjlmLi4yNGE1ZTRlMGIzMTk3MGQ5MTA4OWI2NmE0ZTIxYWM4ZjJmZTliZTBm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtD YWNoZURhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlRGF0YS5jcHAKQEAgLTE4MywxMiArMTgzLDEyIEBAIE9wdGlvbmFsPFNhbHQ+IHJl YWRPck1ha2VTYWx0KGNvbnN0IFN0cmluZyYgcGF0aCkKICAgICBTYWx0IHNhbHQ7CiAgICAgYXV0 byBieXRlc1JlYWQgPSByZWFkKGZkLCBzYWx0LmRhdGEoKSwgc2FsdC5zaXplKCkpOwogICAgIGNs b3NlKGZkKTsKLSAgICBpZiAoYnl0ZXNSZWFkICE9IHNhbHQuc2l6ZSgpKSB7CisgICAgaWYgKGJ5 dGVzUmVhZCAhPSBzdGF0aWNfY2FzdDxzc2l6ZV90PihzYWx0LnNpemUoKSkpIHsKICAgICAgICAg c2FsdCA9IG1ha2VTYWx0KCk7CiAKICAgICAgICAgdW5saW5rKGNwYXRoLmRhdGEoKSk7CiAgICAg ICAgIGZkID0gb3BlbihjcGF0aC5kYXRhKCksIE9fV1JPTkxZIHwgT19DUkVBVCB8IE9fVFJVTkMs IFNfSVJVU1IgfCBTX0lXVVNSKTsKLSAgICAgICAgYm9vbCBzdWNjZXNzID0gd3JpdGUoZmQsIHNh bHQuZGF0YSgpLCBzYWx0LnNpemUoKSkgPT0gc2FsdC5zaXplKCk7CisgICAgICAgIGJvb2wgc3Vj Y2VzcyA9IHdyaXRlKGZkLCBzYWx0LmRhdGEoKSwgc2FsdC5zaXplKCkpID09IHN0YXRpY19jYXN0 PHNzaXplX3Q+KHNhbHQuc2l6ZSgpKTsKICAgICAgICAgY2xvc2UoZmQpOwogICAgICAgICBpZiAo IXN1Y2Nlc3MpCiAgICAgICAgICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGQ3YTZlM2Q4N2ZlNjQ3NzE1ZmQwMmNlZTE2 MTAxMTdlODRhYjE3MTIuLjQ2NDU0OWNiYzFmZjdjMGVmMGM2Y2IyMTBhZDkzZWY4NWMwNTZhODkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOS0wNi0wNCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGln YWxpYS5jb20+CisKKyAgICAgICAgRml4IG1pc2NlbGxhbmVvdXMgYnVpbGQgd2FybmluZ3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODU0NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gY29udmVy dGluZyB0byBQUklWQVRFIGluY2x1ZGUgZGlyZWN0b3JpZXMsIHdlIGFjY2lkZW50YWxseSBkcm9w cGVkIFNZU1RFTSBoZXJlLiBUaGUKKyAgICAgICAgbmFtaW5nIGNvbnZlbnRpb24gdXNlZCBoZXJl IGlzIGEgYml0IGNvbmZ1c2luZzogdGhlICpfU1lTVEVNX0lOQ0xVREVfRElSRUNUT1JJRVMgYWN0 dWFsbHkKKyAgICAgICAgdXNlcyBib3RoIFNZU1RFTSBhbmQgUFJJVkFURS4gV2Ugc2hvdWxkIHBy b2JhYmx5IGNsYXJpZnkgdGhpcy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvUGxhdGZvcm1H VEsuY21ha2U6CisKIDIwMTktMDYtMDMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgog CiAgICAgICAgIEZpbmlzaCBjbGVhbnVwIG9mIFN0cmluZzo6bnVtYmVyIGZvciBmbG9hdGluZyBw b2ludApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybUdUSy5jbWFrZSBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggODIxZjM2MzdiNGYy MDBjYTY3MjkyMmMxZDkxZGU5ODRkODU0NjhjOC4uOWIzMWQ1MDdmNzA1N2NmN2M5ZTQ2M2IxMmMx Y2U4ZmI0YWU1ZjEwNyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybUdU Sy5jbWFrZQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC05 OSwxMSArOTksMTQgQEAgc2V0KFRlc3RKU0NfU09VUkNFUwogICAgIFRlc3RzL0phdmFTY3JpcHRD b3JlL2dsaWIvVGVzdEpTQy5jcHAKICkKIAorc2V0KFRlc3RKU0NfU1lTVEVNX0lOQ0xVREVfRElS RUNUT1JJRVMKKyAgICAke0dMSUJfSU5DTFVERV9ESVJTfQorICAgICR7R1RLM19JTkNMVURFX0RJ UlN9CispCisKIHNldChUZXN0SlNDX1BSSVZBVEVfSU5DTFVERV9ESVJFQ1RPUklFUwogICAgICR7 Q01BS0VfQklOQVJZX0RJUn0KICAgICAke1RFU1RXRUJLSVRBUElfRElSfQotICAgICR7R0xJQl9J TkNMVURFX0RJUlN9Ci0gICAgJHtHVEszX0lOQ0xVREVfRElSU30KICAgICAke1RISVJEUEFSVFlf RElSfS9ndGVzdC9pbmNsdWRlCiAgICAgJHtKYXZhU2NyaXB0Q29yZV9QUklWQVRFX0ZSQU1FV09S S19IRUFERVJTX0RJUn0KICAgICAke0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9Cg==