235281 2022-01-16 13:59:51 -0800 REGRESSION (r286603): rx::ProgramMtl::getSpecializedShader() leaks MTLFunctionConstantValues object due early return when an error occurs in ANGLE_TRY() macro 2022-01-18 16:08:44 -0800 1 1 1 Unclassified WebKit ANGLE Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=235282 InRadar P2 Normal --- 220896 229128 1 ddkilzer ddkilzer darin dino ews-watchlist geofflang gman jonahr kbr kkinnunen kondapallykalyan kpiddington webkit-bug-importer oldest_to_newest 1831334 0 ddkilzer 2022-01-16 13:59:51 -0800 rx::angle::Result ProgramMtl::getSpecializedShader() leaks MTLFunctionConstantValues object due early return when an error occurs in ANGLE_TRY() macro. The early return occurs before the object is autoreleased: // Create Metal shader object ANGLE_MTL_OBJC_SCOPE { ANGLE_TRY(CreateMslShader(context, translatedMslInfo->metalLibrary, SHADER_ENTRY_NAME, funcConstants, &shaderVariant->metalShader)); [funcConstants ANGLE_MTL_AUTORELEASE]; } Found by clang static analyzer. Regressed with this commit: Roll ANGLE to include upstreamed Metal backend <https://bugs.webkit.org/show_bug.cgi?id=220896> <rdar://problem/73539682> <https://commits.webkit.org/r286603> 1831335 1 webkit-bug-importer 2022-01-16 14:00:20 -0800 <rdar://problem/87656387> 1831341 2 ddkilzer 2022-01-16 14:18:20 -0800 (In reply to David Kilzer (:ddkilzer) from comment #0) > Regressed with this commit: > > Roll ANGLE to include upstreamed Metal backend > <https://bugs.webkit.org/show_bug.cgi?id=220896> > <rdar://problem/73539682> > <https://commits.webkit.org/r286603> Huh, that commit actually reverted some changes I made in r281160 to fix this leak earlier! [Metal ANGLE] Fix over-autorelease of rx::DisplayMtl::getMetalDeviceMatchingAttribute() and various Objective-C leak s <https://webkit.org/b/229128> <rdar://problem/81964007> <https://commits.webkit.org/r281160> 1831342 3 449288 ddkilzer 2022-01-16 14:22:00 -0800 Created attachment 449288 Patch v1 1831344 4 ews-watchlist 2022-01-16 14:23:18 -0800 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1831356 5 449288 darin 2022-01-16 15:43:35 -0800 Comment on attachment 449288 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=449288&action=review We can all agree that autorelease is the worst > Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ProgramMtl.mm:643 > + [funcConstants.get() setConstantValue:&emulateDiscard I don’t think this .get() is needed, same for the 5 more below, unless mtl::AutoObjCObj is different from RetainPtr in this respect. 1831526 6 449341 ddkilzer 2022-01-17 10:23:18 -0800 Created attachment 449341 Patch for landing 1831527 7 449288 ddkilzer 2022-01-17 10:24:19 -0800 Comment on attachment 449288 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=449288&action=review >> Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ProgramMtl.mm:643 >> + [funcConstants.get() setConstantValue:&emulateDiscard > > I don’t think this .get() is needed, same for the 5 more below, unless mtl::AutoObjCObj is different from RetainPtr in this respect. Yes! Will remove and land a follow-up fix for Bug 235278. 1831590 8 ews-feeder 2022-01-17 16:57:21 -0800 Committed r288105 (246119@main): <https://commits.webkit.org/246119@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449341. 1831878 9 kbr 2022-01-18 16:08:44 -0800 David, Darin - FYI Kyle, myself and several other colleagues are actively working on resolving divergence between WebKit's copy of ANGLE, and upstream ANGLE. Filed: Upstream fix for MTLFunctionConstantValues leak in rx::ProgramMtl::getSpecializedShader() https://bugs.chromium.org/p/angleproject/issues/detail?id=6920 449288 2022-01-16 14:22:00 -0800 2022-01-16 17:24:52 -0800 Patch v1 bug-235281-20220116142200.patch text/plain 4660 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggMzc3MzJkNmQ1YzBlMGNmZWI1ZTEyMzk0ODJiN2EzNzU3MmQyYWVhYS4uY2U4ZGFkZTJjN2U4 OTY4NGVhMzMzMThjZmE3YjBlOGFlYjFlZTEzYiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTE2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NjYwMyk6IHJ4OjpQcm9ncmFtTXRs OjpnZXRTcGVjaWFsaXplZFNoYWRlcigpIGxlYWtzIE1UTEZ1bmN0aW9uQ29uc3RhbnRWYWx1ZXMg b2JqZWN0IGR1ZSBlYXJseSByZXR1cm4gd2hlbiBhbiBlcnJvciBvY2N1cnMgaW4gQU5HTEVfVFJZ KCkgbWFjcm8KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIzNTI4MT4KKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzg3NjU2Mzg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dyYW1N dGwubW06CisgICAgICAgIChyeDo6UHJvZ3JhbU10bDo6Z2V0U3BlY2lhbGl6ZWRTaGFkZXIpOgor ICAgICAgICAtIFVzZSBtdGw6OkF1dG9PYmpDT2JqPD4gdG8gcmVsZWFzZSBNVExGdW5jdGlvbkNv bnN0YW50VmFsdWVzCisgICAgICAgICAgb2JqZWN0IG9uIGVhcmx5IHJldHVybi4KKwogMjAyMi0w MS0xNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JF U1NJT04gKHIyODY2MDMpOiBMZWFrIG9mIHRocmVlIE5TTXV0YWJsZURpY3Rpb25hcnkgb2JqZWN0 cyBlYWNoIHRpbWUgcng6OkRpc3BsYXlNdGw6OmdldE1ldGFsRGV2aWNlTWF0Y2hpbmdBdHRyaWJ1 dGUoKSBpcyBjYWxsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLm1tIGIvU291cmNlL1RoaXJkUGFydHkv QU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dyYW1NdGwubW0KaW5kZXggZTNi ZGI0YWNlMmFkOWI1MjkwM2M1MjdiNzA1ZWUwNmVjMzNiYTE2OS4uNWJlM2YwZjUxNzczZTVlM2Zm YjRmY2FjNjBkMzdhY2NhNGI1MjVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dyYW1NdGwubW0KKysrIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dyYW1NdGwu bW0KQEAgLTU4OSw3ICs1ODksNyBAQCBhbmdsZTo6UmVzdWx0IFByb2dyYW1NdGw6OmdldFNwZWNp YWxpemVkU2hhZGVyKENvbnRleHRNdGwgKmNvbnRleHQsCiAKICAgICBtdGw6OlRyYW5zbGF0ZWRT aGFkZXJJbmZvICp0cmFuc2xhdGVkTXNsSW5mbyA9ICZtTXNsU2hhZGVyVHJhbnNsYXRlSW5mb1tz aGFkZXJUeXBlXTsKICAgICBQcm9ncmFtU2hhZGVyT2JqVmFyaWFudE10bCAqc2hhZGVyVmFyaWFu dDsKLSAgICBNVExGdW5jdGlvbkNvbnN0YW50VmFsdWVzICpmdW5jQ29uc3RhbnRzID0gbmlsOwor ICAgIG10bDo6QXV0b09iakNPYmo8TVRMRnVuY3Rpb25Db25zdGFudFZhbHVlcz4gZnVuY0NvbnN0 YW50czsKIAogICAgIGlmIChzaGFkZXJUeXBlID09IGdsOjpTaGFkZXJUeXBlOjpWZXJ0ZXgpCiAg ICAgewpAQCAtNjM5LDEwICs2MzksMTAgQEAgYW5nbGU6OlJlc3VsdCBQcm9ncmFtTXRsOjpnZXRT cGVjaWFsaXplZFNoYWRlcihDb250ZXh0TXRsICpjb250ZXh0LAogICAgICAgICAgICAgICAgICAg ICBbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6c2g6Om10bDo6a1Jhc3Rlcml6ZXJEaXNj YXJkRW5hYmxlZENvbnN0TmFtZV07CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGZ1bmND b25zdGFudHMgPSBbW01UTEZ1bmN0aW9uQ29uc3RhbnRWYWx1ZXMgYWxsb2NdIGluaXRdOwotICAg ICAgICAgICAgW2Z1bmNDb25zdGFudHMgc2V0Q29uc3RhbnRWYWx1ZTomZW11bGF0ZURpc2NhcmQK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHR5cGU6TVRMRGF0YVR5cGVC b29sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpdGhOYW1lOmRpc2NhcmRF bmFibGVkU3RyXTsKKyAgICAgICAgICAgIGZ1bmNDb25zdGFudHMgPSBtdGw6OmFkb3B0T2JqQ09i aihbW01UTEZ1bmN0aW9uQ29uc3RhbnRWYWx1ZXMgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgICAg IFtmdW5jQ29uc3RhbnRzLmdldCgpIHNldENvbnN0YW50VmFsdWU6JmVtdWxhdGVEaXNjYXJkCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlOk1UTERhdGFU eXBlQm9vbAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3aXRoTmFt ZTpkaXNjYXJkRW5hYmxlZFN0cl07CiAgICAgICAgIH0KICAgICB9ICAvLyBpZiAoc2hhZGVyVHlw ZSA9PSBnbDo6U2hhZGVyVHlwZTo6VmVydGV4KQogICAgIGVsc2UgaWYgKHNoYWRlclR5cGUgPT0g Z2w6OlNoYWRlclR5cGU6OkZyYWdtZW50KQpAQCAtNjc1LDEwICs2NzUsMTAgQEAgYW5nbGU6OlJl c3VsdCBQcm9ncmFtTXRsOjpnZXRTcGVjaWFsaXplZFNoYWRlcihDb250ZXh0TXRsICpjb250ZXh0 LAogICAgICAgICAgICAgICAgICAgICBbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6c2g6 Om10bDo6a0NvdmVyYWdlTWFza0VuYWJsZWRDb25zdE5hbWVdOwogICAgICAgICAgICAgfQogCi0g ICAgICAgICAgICBmdW5jQ29uc3RhbnRzID0gW1tNVExGdW5jdGlvbkNvbnN0YW50VmFsdWVzIGFs bG9jXSBpbml0XTsKLSAgICAgICAgICAgIFtmdW5jQ29uc3RhbnRzIHNldENvbnN0YW50VmFsdWU6 JmVtdWxhdGVDb3ZlcmFnZU1hc2sKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHR5cGU6TVRMRGF0YVR5cGVCb29sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHdpdGhOYW1lOmNvdmVyYWdlTWFza0VuYWJsZWRTdHJdOworICAgICAgICAgICAgZnVuY0Nv bnN0YW50cyA9IG10bDo6YWRvcHRPYmpDT2JqKFtbTVRMRnVuY3Rpb25Db25zdGFudFZhbHVlcyBh bGxvY10gaW5pdF0pOworICAgICAgICAgICAgW2Z1bmNDb25zdGFudHMuZ2V0KCkgc2V0Q29uc3Rh bnRWYWx1ZTomZW11bGF0ZUNvdmVyYWdlTWFzaworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdHlwZTpNVExEYXRhVHlwZUJvb2wKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgd2l0aE5hbWU6Y292ZXJhZ2VNYXNrRW5hYmxlZFN0cl07 CiAgICAgICAgIH0KIAogICAgIH0gIC8vIGdsOjpTaGFkZXJUeXBlOjpGcmFnbWVudApAQCAtNjg3 LDIwICs2ODcsMjAgQEAgYW5nbGU6OlJlc3VsdCBQcm9ncmFtTXRsOjpnZXRTcGVjaWFsaXplZFNo YWRlcihDb250ZXh0TXRsICpjb250ZXh0LAogICAgICAgICBVTlJFQUNIQUJMRSgpOwogICAgICAg ICByZXR1cm4gYW5nbGU6OlJlc3VsdDo6U3RvcDsKICAgICB9Ci0gICAgW2Z1bmNDb25zdGFudHMK KyAgICBbZnVuY0NvbnN0YW50cy5nZXQoKQogICAgICAgICBzZXRDb25zdGFudFZhbHVlOiYoY29u dGV4dC0+Z2V0RGlzcGxheSgpLT5nZXRGZWF0dXJlcygpLmFsbG93U2FtcGxlckNvbXBhcmVHcmFk aWVudC5lbmFibGVkKQogICAgICAgICAgICAgICAgICAgICB0eXBlOk1UTERhdGFUeXBlQm9vbAog ICAgICAgICAgICAgICAgIHdpdGhOYW1lOkAiQU5HTEVVc2VTYW1wbGVDb21wYXJlR3JhZGllbnQi XTsKLSAgICBbZnVuY0NvbnN0YW50cworICAgIFtmdW5jQ29uc3RhbnRzLmdldCgpCiAgICAgICAg IHNldENvbnN0YW50VmFsdWU6Jihjb250ZXh0LT5nZXREaXNwbGF5KCktPmdldEZlYXR1cmVzKCku YWxsb3dTYW1wbGVyQ29tcGFyZUxvZC5lbmFibGVkKQogICAgICAgICAgICAgICAgICAgICB0eXBl Ok1UTERhdGFUeXBlQm9vbAogICAgICAgICAgICAgICAgIHdpdGhOYW1lOkAiQU5HTEVVc2VTYW1w bGVDb21wYXJlTG9kIl07CisKICAgICAvLyBDcmVhdGUgTWV0YWwgc2hhZGVyIG9iamVjdAogICAg IEFOR0xFX01UTF9PQkpDX1NDT1BFCiAgICAgewogICAgICAgICBBTkdMRV9UUlkoQ3JlYXRlTXNs U2hhZGVyKGNvbnRleHQsIHRyYW5zbGF0ZWRNc2xJbmZvLT5tZXRhbExpYnJhcnksIFNIQURFUl9F TlRSWV9OQU1FLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bmNDb25zdGFu dHMsICZzaGFkZXJWYXJpYW50LT5tZXRhbFNoYWRlcikpOwotICAgICAgICBbZnVuY0NvbnN0YW50 cyBBTkdMRV9NVExfQVVUT1JFTEVBU0VdOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGZ1bmNDb25zdGFudHMuZ2V0KCksICZzaGFkZXJWYXJpYW50LT5tZXRhbFNoYWRlcikpOwog ICAgIH0KIAogICAgIC8vIFN0b3JlIHJlZmVyZW5jZSB0byB0aGUgdHJhbnNsYXRlZCBzb3VyY2Ug Zm9yIGVhc2lseSBxdWVyeWluZyBtYXBwZWQgYmluZGluZ3MgbGF0ZXIuCg== 449341 2022-01-17 10:23:18 -0800 2022-01-17 16:57:22 -0800 Patch for landing bug-235281-20220117102317.patch text/plain 3706 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggZDIzMTYwMTBlYmI5NmVhN2Y2ZmFjZWFiMjZiODI5ZTEyNjFiNWY3Yy4uODA1OWZjYjI0MjE2 N2RhZWI5OTA0MmQ1OTViOWFmYzQ5NjBkMDFmMCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAxLTE3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI4NjYwMyk6IHJ4OjpQcm9ncmFtTXRs OjpnZXRTcGVjaWFsaXplZFNoYWRlcigpIGxlYWtzIE1UTEZ1bmN0aW9uQ29uc3RhbnRWYWx1ZXMg b2JqZWN0IGR1ZSBlYXJseSByZXR1cm4gd2hlbiBhbiBlcnJvciBvY2N1cnMgaW4gQU5HTEVfVFJZ KCkgbWFjcm8KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIzNTI4MT4KKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzg3NjU2Mzg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgorCisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dyYW1NdGwu bW06CisgICAgICAgIChyeDo6UHJvZ3JhbU10bDo6Z2V0U3BlY2lhbGl6ZWRTaGFkZXIpOgorICAg ICAgICAtIFVzZSBtdGw6OkF1dG9PYmpDT2JqPD4gdG8gcmVsZWFzZSBNVExGdW5jdGlvbkNvbnN0 YW50VmFsdWVzCisgICAgICAgICAgb2JqZWN0IG9uIGVhcmx5IHJldHVybi4KKwogMjAyMi0wMS0x NiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJ T04gKHIyNDk4MjMpOiBnbDo6Q29udGV4dDo6b25Qcm9ncmFtTGluaygpIGxlYWtzIGdsOjpGcmFt ZWJ1ZmZlciBvYmplY3QgZHVlIGVhcmx5IHJldHVybiB3aGVuIGFuIGVycm9yIG9jY3VycyBpbiBB TkdMRV9UUlkoKSBtYWNybwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dyYW1NdGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQppbmRleCBl M2JkYjRhY2UyYWQ5YjUyOTAzYzUyN2I3MDVlZTA2ZWMzM2JhMTY5Li4xMzUwMmQyZWVhZjI1ZGM2 MzE3MGUwNWU2NzdkNjE4NDEwNjVjNzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQorKysgYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10 bC5tbQpAQCAtNTg5LDcgKzU4OSw3IEBAIGFuZ2xlOjpSZXN1bHQgUHJvZ3JhbU10bDo6Z2V0U3Bl Y2lhbGl6ZWRTaGFkZXIoQ29udGV4dE10bCAqY29udGV4dCwKIAogICAgIG10bDo6VHJhbnNsYXRl ZFNoYWRlckluZm8gKnRyYW5zbGF0ZWRNc2xJbmZvID0gJm1Nc2xTaGFkZXJUcmFuc2xhdGVJbmZv W3NoYWRlclR5cGVdOwogICAgIFByb2dyYW1TaGFkZXJPYmpWYXJpYW50TXRsICpzaGFkZXJWYXJp YW50OwotICAgIE1UTEZ1bmN0aW9uQ29uc3RhbnRWYWx1ZXMgKmZ1bmNDb25zdGFudHMgPSBuaWw7 CisgICAgbXRsOjpBdXRvT2JqQ09iajxNVExGdW5jdGlvbkNvbnN0YW50VmFsdWVzPiBmdW5jQ29u c3RhbnRzOwogCiAgICAgaWYgKHNoYWRlclR5cGUgPT0gZ2w6OlNoYWRlclR5cGU6OlZlcnRleCkK ICAgICB7CkBAIC02MzksNyArNjM5LDcgQEAgYW5nbGU6OlJlc3VsdCBQcm9ncmFtTXRsOjpnZXRT cGVjaWFsaXplZFNoYWRlcihDb250ZXh0TXRsICpjb250ZXh0LAogICAgICAgICAgICAgICAgICAg ICBbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6c2g6Om10bDo6a1Jhc3Rlcml6ZXJEaXNj YXJkRW5hYmxlZENvbnN0TmFtZV07CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGZ1bmND b25zdGFudHMgPSBbW01UTEZ1bmN0aW9uQ29uc3RhbnRWYWx1ZXMgYWxsb2NdIGluaXRdOworICAg ICAgICAgICAgZnVuY0NvbnN0YW50cyA9IG10bDo6YWRvcHRPYmpDT2JqKFtbTVRMRnVuY3Rpb25D b25zdGFudFZhbHVlcyBhbGxvY10gaW5pdF0pOwogICAgICAgICAgICAgW2Z1bmNDb25zdGFudHMg c2V0Q29uc3RhbnRWYWx1ZTomZW11bGF0ZURpc2NhcmQKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHR5cGU6TVRMRGF0YVR5cGVCb29sCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHdpdGhOYW1lOmRpc2NhcmRFbmFibGVkU3RyXTsKQEAgLTY3NSw3ICs2 NzUsNyBAQCBhbmdsZTo6UmVzdWx0IFByb2dyYW1NdGw6OmdldFNwZWNpYWxpemVkU2hhZGVyKENv bnRleHRNdGwgKmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgIFtOU1N0cmluZyBzdHJpbmdX aXRoVVRGOFN0cmluZzpzaDo6bXRsOjprQ292ZXJhZ2VNYXNrRW5hYmxlZENvbnN0TmFtZV07CiAg ICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGZ1bmNDb25zdGFudHMgPSBbW01UTEZ1bmN0aW9u Q29uc3RhbnRWYWx1ZXMgYWxsb2NdIGluaXRdOworICAgICAgICAgICAgZnVuY0NvbnN0YW50cyA9 IG10bDo6YWRvcHRPYmpDT2JqKFtbTVRMRnVuY3Rpb25Db25zdGFudFZhbHVlcyBhbGxvY10gaW5p dF0pOwogICAgICAgICAgICAgW2Z1bmNDb25zdGFudHMgc2V0Q29uc3RhbnRWYWx1ZTomZW11bGF0 ZUNvdmVyYWdlTWFzawogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlw ZTpNVExEYXRhVHlwZUJvb2wKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2l0 aE5hbWU6Y292ZXJhZ2VNYXNrRW5hYmxlZFN0cl07CkBAIC02OTUsMTIgKzY5NSwxMiBAQCBhbmds ZTo6UmVzdWx0IFByb2dyYW1NdGw6OmdldFNwZWNpYWxpemVkU2hhZGVyKENvbnRleHRNdGwgKmNv bnRleHQsCiAgICAgICAgIHNldENvbnN0YW50VmFsdWU6Jihjb250ZXh0LT5nZXREaXNwbGF5KCkt PmdldEZlYXR1cmVzKCkuYWxsb3dTYW1wbGVyQ29tcGFyZUxvZC5lbmFibGVkKQogICAgICAgICAg ICAgICAgICAgICB0eXBlOk1UTERhdGFUeXBlQm9vbAogICAgICAgICAgICAgICAgIHdpdGhOYW1l OkAiQU5HTEVVc2VTYW1wbGVDb21wYXJlTG9kIl07CisKICAgICAvLyBDcmVhdGUgTWV0YWwgc2hh ZGVyIG9iamVjdAogICAgIEFOR0xFX01UTF9PQkpDX1NDT1BFCiAgICAgewogICAgICAgICBBTkdM RV9UUlkoQ3JlYXRlTXNsU2hhZGVyKGNvbnRleHQsIHRyYW5zbGF0ZWRNc2xJbmZvLT5tZXRhbExp YnJhcnksIFNIQURFUl9FTlRSWV9OQU1FLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGZ1bmNDb25zdGFudHMsICZzaGFkZXJWYXJpYW50LT5tZXRhbFNoYWRlcikpOwotICAgICAg ICBbZnVuY0NvbnN0YW50cyBBTkdMRV9NVExfQVVUT1JFTEVBU0VdOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZ1bmNDb25zdGFudHMuZ2V0KCksICZzaGFkZXJWYXJpYW50LT5t ZXRhbFNoYWRlcikpOwogICAgIH0KIAogICAgIC8vIFN0b3JlIHJlZmVyZW5jZSB0byB0aGUgdHJh bnNsYXRlZCBzb3VyY2UgZm9yIGVhc2lseSBxdWVyeWluZyBtYXBwZWQgYmluZGluZ3MgbGF0ZXIu Cg==