230754 2021-09-24 09:08:56 -0700 Fix for crash in accessibility/Mac/search-predicate-for-adhoc-radio-groups.html in isolated tree mode. 2021-09-27 09:03:28 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1796908 0 andresg_22 2021-09-24 09:08:56 -0700 Fix for crash in accessibility/Mac/search-predicate-for-adhoc-radio-groups.html in isolated tree mode. 1796909 1 webkit-bug-importer 2021-09-24 09:09:14 -0700 <rdar://problem/83498599> 1796914 2 439155 andresg_22 2021-09-24 09:29:47 -0700 Created attachment 439155 Patch 1796925 3 439155 cfleizach 2021-09-24 09:52:43 -0700 Comment on attachment 439155 Patch In file included from /Volumes/Data/worker/iOS-14-Build-EWS/build/WebKitBuild/Release-iphoneos/DerivedSources/WebCore/unified-sources/UnifiedSource5-mm.mm:3: ./accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:2777:34: error: no member named 'getAttribute' in 'WebCore::AXCoreObject' 1796941 4 439160 andresg_22 2021-09-24 10:34:08 -0700 Created attachment 439160 Patch 1796954 5 439165 andresg_22 2021-09-24 10:58:43 -0700 Created attachment 439165 Patch 1797460 6 439353 andresg_22 2021-09-27 08:05:13 -0700 Created attachment 439353 Patch 1797494 7 ews-feeder 2021-09-27 09:03:26 -0700 Committed r283115 (242173@main): <https://commits.webkit.org/242173@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439353. 439155 2021-09-24 09:29:47 -0700 2021-09-24 10:34:03 -0700 Patch bug-230754-20210924122946.patch text/plain 12239 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyOTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzM2ZWRjODc4ODAyZjE5 Mzk2ZmVlNzc3NzM5ODAzYmFkZGU5ZjYwMi4uNDMxYjg3MzU2NGY0ZTZjNjE0YTJiM2YwYzgwYzFl OTk5ODRhNDNlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTA5LTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGNy YXNoIGluIGFjY2Vzc2liaWxpdHkvTWFjL3NlYXJjaC1wcmVkaWNhdGUtZm9yLWFkaG9jLXJhZGlv LWdyb3Vwcy5odG1sIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDc1NAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODM0OTg1OTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9NYWMvc2VhcmNoLXByZWRpY2F0ZS1mb3ItYWRob2Mt cmFkaW8tZ3JvdXBzLmh0bWwKKworICAgICAgICBUaGUgY3Jhc2ggd2FzIGNhdXNlZCBieSB0aGUg Y2FsbCBpbiBpc1JhZGlvQnV0dG9uSW5EaWZmZXJlbnRBZGhvY0dyb3VwCisgICAgICAgIHRvIGF4 T2JqZWN0LT5lbGVtZW50KCktPmdldE5hbWVBdHRyaWJ1dGUoKSwgc2luY2UgZWxlbWVudCgpIHNo b3VsZCBub3QKKyAgICAgICAgYmUgY2FsbGVkIG9mZiBvZiB0aGUgbWFpbiB0aHJlYWQuIFRoYXQg YnJpbnMgdXAgdGhlIHF1ZXN0aW9uIG9mIGhvdyB0bworICAgICAgICBnZXQgZWxlbWVudCBhdHRy aWJ1dGVzIG9uIHRoZSBBWCB0aHJlYWQuIEZvciB0aGF0IHB1cnBvc2UsIEkgYWRkZWQgdGhlCisg ICAgICAgIGF0dHJpYnV0ZVZhbHVlIG1ldGhvZCB0byB0aGUgQVhDb3JlT2JqZWN0IGludGVyZmFj ZSwgYW5kIHJlbW92ZWQgdGhlCisgICAgICAgIHJlbGF0ZWQgbWV0aG9kcyB0aGF0IHRha2UgUXVh bGlmaWVkTmFtZXMgYW5kIHJldHVybiBhbiBBdG9tU3RyaW5nLCBzaW5jZQorICAgICAgICB0aGV5 IGNhbm5vdCBiZSB1c2VkIG9mZiBvZiB0aGUgbWFpbiB0aHJlYWQuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdDo6YXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGFGb3JDaGls ZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Ojppc1JhZGlvQnV0dG9uSW5EaWZm ZXJlbnRBZGhvY0dyb3VwKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRl cmZhY2UuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6Y29sdW1uSGVh ZGVycyk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjpyb3dIZWFk ZXJzKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVB dHRyaWJ1dGVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmF0dHJp YnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6Omhh c0F0dHJpYnV0ZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVk T2JqZWN0OjpnZXRBdHRyaWJ1dGUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGFjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgorCiAyMDIxLTA5LTIzICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgQVhE UlRFbGVtZW50SWRBdHRyaWJ1dGUgZnJvbSB0aGUgQVggb2JqZWN0IHBsYXRmb3JtIHdyYXBwZXIg aW50ZXJmYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU9iamVjdC5jcHAKaW5kZXggNjgxOTM2ZjU4ZjBmOWM4YWQ0M2E0Mjg0MWJhYzJhMmYx Y2YxMjFjOS4uNTY4ZGE3MThmMzNhNzFiNGJlYTg0Y2FhMjk3ZTJlZDg2OGY1ZjM2MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu Y3BwCkBAIC0xOTU1LDYgKzE5NTUsMTYgQEAgY29uc3QgQXRvbVN0cmluZyYgQWNjZXNzaWJpbGl0 eU9iamVjdDo6Z2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0dHJpYnUKICAgICBy ZXR1cm4gbnVsbEF0b20oKTsKIH0KIAorc3RkOjpvcHRpb25hbDxTdHJpbmc+IEFjY2Vzc2liaWxp dHlPYmplY3Q6OmF0dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmluZyYgYXR0cmlidXRlTmFtZSkgY29u c3QKK3sKKyAgICBpZiAoYXR0cmlidXRlTmFtZSA9PSAibmFtZSIpIHsKKyAgICAgICAgYXV0byB2 YWx1ZSA9IGdldEF0dHJpYnV0ZShuYW1lQXR0cik7CisgICAgICAgIGlmICghdmFsdWUuaXNOdWxs KCkpCisgICAgICAgICAgICByZXR1cm4gdmFsdWU7CisgICAgfQorICAgIHJldHVybiBzdGQ6Om51 bGxvcHQ7Cit9CisKIGludCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpnZXRJbnRlZ3JhbEF0dHJpYnV0 ZShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyaWJ1dGVOYW1lKSBjb25zdAogewogICAgIHJldHVy biBwYXJzZUhUTUxJbnRlZ2VyKGdldEF0dHJpYnV0ZShhdHRyaWJ1dGVOYW1lKSkudmFsdWVfb3Io MCk7CkBAIC0zNTk0LDE3ICszNjA0LDE3IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU9iamVjdDo6YXJp YU93bnNSZWZlcmVuY2luZ0VsZW1lbnRzKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvCiAKIHZv aWQgQWNjZXNzaWJpbGl0eU9iamVjdDo6c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGFGb3JDaGls ZChBWENvcmVPYmplY3QqIGNoaWxkKQogewotICAgIGlmICghY2hpbGQpCisgICAgaWYgKCFpczxB Y2Nlc3NpYmlsaXR5T2JqZWN0PihjaGlsZCkpCiAgICAgICAgIHJldHVybjsKLSAgICAKKwogICAg IGlmIChjaGlsZC0+cGFyZW50T2JqZWN0KCkgIT0gdGhpcykgewogICAgICAgICBjaGlsZC0+Y2xl YXJJc0lnbm9yZWRGcm9tUGFyZW50RGF0YSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAg IAorCiAgICAgQWNjZXNzaWJpbGl0eUlzSWdub3JlZEZyb21QYXJlbnREYXRhIHJlc3VsdCA9IEFj Y2Vzc2liaWxpdHlJc0lnbm9yZWRGcm9tUGFyZW50RGF0YSh0aGlzKTsKICAgICBpZiAoIW1faXNJ Z25vcmVkRnJvbVBhcmVudERhdGEuaXNOdWxsKCkpIHsKLSAgICAgICAgcmVzdWx0LmlzQVhIaWRk ZW4gPSAobV9pc0lnbm9yZWRGcm9tUGFyZW50RGF0YS5pc0FYSGlkZGVuIHx8IGVxdWFsTGV0dGVy c0lnbm9yaW5nQVNDSUlDYXNlKGNoaWxkLT5nZXRBdHRyaWJ1dGUoYXJpYV9oaWRkZW5BdHRyKSwg InRydWUiKSkgJiYgIWNoaWxkLT5pc0ZvY3VzZWQoKTsKKyAgICAgICAgcmVzdWx0LmlzQVhIaWRk ZW4gPSAobV9pc0lnbm9yZWRGcm9tUGFyZW50RGF0YS5pc0FYSGlkZGVuIHx8IGVxdWFsTGV0dGVy c0lnbm9yaW5nQVNDSUlDYXNlKGRvd25jYXN0PEFjY2Vzc2liaWxpdHlPYmplY3Q+KGNoaWxkKS0+ Z2V0QXR0cmlidXRlKGFyaWFfaGlkZGVuQXR0ciksICJ0cnVlIikpICYmICFjaGlsZC0+aXNGb2N1 c2VkKCk7CiAgICAgICAgIHJlc3VsdC5pc1ByZXNlbnRhdGlvbmFsQ2hpbGRPZkFyaWFSb2xlID0g bV9pc0lnbm9yZWRGcm9tUGFyZW50RGF0YS5pc1ByZXNlbnRhdGlvbmFsQ2hpbGRPZkFyaWFSb2xl IHx8IGFyaWFSb2xlSGFzUHJlc2VudGF0aW9uYWxDaGlsZHJlbigpOwogICAgICAgICByZXN1bHQu aXNEZXNjZW5kYW50T2ZCYXJyZW5QYXJlbnQgPSBtX2lzSWdub3JlZEZyb21QYXJlbnREYXRhLmlz RGVzY2VuZGFudE9mQmFycmVuUGFyZW50IHx8ICFjYW5IYXZlQ2hpbGRyZW4oKTsKICAgICB9IGVs c2UgewpAQCAtMzYxMiw3ICszNjIyLDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzZXRJ c0lnbm9yZWRGcm9tUGFyZW50RGF0YUZvckNoaWxkKEFYQ29yZU9iamVjdCogY2hpbGQKICAgICAg ICAgcmVzdWx0LmlzUHJlc2VudGF0aW9uYWxDaGlsZE9mQXJpYVJvbGUgPSBjaGlsZC0+aXNQcmVz ZW50YXRpb25hbENoaWxkT2ZBcmlhUm9sZSgpOwogICAgICAgICByZXN1bHQuaXNEZXNjZW5kYW50 T2ZCYXJyZW5QYXJlbnQgPSBjaGlsZC0+aXNEZXNjZW5kYW50T2ZCYXJyZW5QYXJlbnQoKTsKICAg ICB9Ci0gICAgCisKICAgICBjaGlsZC0+c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGEocmVzdWx0 KTsKIH0KIApAQCAtMzY1Myw3ICszNjYzLDcgQEAgc3RhdGljIGJvb2wgaXNSYWRpb0J1dHRvbklu RGlmZmVyZW50QWRob2NHcm91cChBWENvcmVPYmplY3QqIGF4T2JqZWN0LCBBWENvcmVPYmoKICAg ICBpZiAoIXJlZmVyZW5jZU9iamVjdCB8fCAhcmVmZXJlbmNlT2JqZWN0LT5pc1JhZGlvQnV0dG9u KCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgcmV0dXJuIGF4T2JqZWN0LT5lbGVtZW50 KCktPmdldE5hbWVBdHRyaWJ1dGUoKSAhPSByZWZlcmVuY2VPYmplY3QtPmVsZW1lbnQoKS0+Z2V0 TmFtZUF0dHJpYnV0ZSgpOworICAgIHJldHVybiBheE9iamVjdC0+YXR0cmlidXRlVmFsdWUoIm5h bWUiKSAhPSByZWZlcmVuY2VPYmplY3QtPmF0dHJpYnV0ZVZhbHVlKCJuYW1lIik7CiB9CiAKIHN0 YXRpYyBib29sIGlzQWNjZXNzaWJpbGl0eU9iamVjdFNlYXJjaE1hdGNoQXRJbmRleChBWENvcmVP YmplY3QqIGF4T2JqZWN0LCBBY2Nlc3NpYmlsaXR5U2VhcmNoQ3JpdGVyaWEgY29uc3QmIGNyaXRl cmlhLCBzaXplX3QgaW5kZXgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdC5oCmluZGV4IGEzNzczOGU5YTM5YWI2MTA5MDlhNTc4NTVhODNk MjM0MTFmNzQ2ZjAuLjYxOTdlY2Q4ZWU2YzQ5YjBmNzFiYWMwYzAwNDhjNjVlZmFiNTVhMmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oCkBAIC01MTQsOCArNTE0LDkgQEAgcHVibGljOgogICAgIEFjY2Vzc2liaWxpdHlPYmplY3Qq IGZpcnN0QW5vbnltb3VzQmxvY2tDaGlsZCgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgV0VCQ09S RV9FWFBPUlQgc3RhdGljIEFjY2Vzc2liaWxpdHlSb2xlIGFyaWFSb2xlVG9XZWJDb3JlUm9sZShj b25zdCBTdHJpbmcmKTsKLSAgICBib29sIGhhc0F0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1l JikgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgY29uc3QgQXRvbVN0cmluZyYgZ2V0QXR0cmlidXRlKGNv bnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgaGFz QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdDsKKyAgICB2aXJ0dWFsIGNvbnN0 IEF0b21TdHJpbmcmIGdldEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Q7Cisg ICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IGF0dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmluZyYpIGNv bnN0IG92ZXJyaWRlOwogICAgIGludCBnZXRJbnRlZ3JhbEF0dHJpYnV0ZShjb25zdCBRdWFsaWZp ZWROYW1lJikgY29uc3Q7CiAgICAgYm9vbCBoYXNUYWdOYW1lKGNvbnN0IFF1YWxpZmllZE5hbWUm KSBjb25zdCBvdmVycmlkZTsKICAgICBTdHJpbmcgdGFnTmFtZSgpIGNvbnN0IG92ZXJyaWRlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2Jq ZWN0SW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3RJbnRlcmZhY2UuaAppbmRleCBiNDAzNTA3MWRmZmU5ODczYTQ5MWYxMmZhOWFhN2Zk ODMxOWJlYzJmLi42MjJkYTRiNWRjYTMwNmI2MTE2MTcwOWVmM2VmMDY0NGE4N2Y2NDRkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJ bnRlcmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3RJbnRlcmZhY2UuaApAQCAtMTI1NSw4ICsxMjU1LDcgQEAgcHVibGljOgogICAgIGJv b2wgaXNBbmNlc3Rvck9mT2JqZWN0KGNvbnN0IEFYQ29yZU9iamVjdCopIGNvbnN0OwogICAgIHZp cnR1YWwgQVhDb3JlT2JqZWN0KiBmaXJzdEFub255bW91c0Jsb2NrQ2hpbGQoKSBjb25zdCA9IDA7 CiAKLSAgICB2aXJ0dWFsIGJvb2wgaGFzQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBj b25zdCA9IDA7Ci0gICAgdmlydHVhbCBjb25zdCBBdG9tU3RyaW5nJiBnZXRBdHRyaWJ1dGUoY29u c3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIHN0ZDo6b3B0aW9uYWw8 U3RyaW5nPiBhdHRyaWJ1dGVWYWx1ZShjb25zdCBTdHJpbmcmKSBjb25zdCA9IDA7CiAgICAgdmly dHVhbCBib29sIGhhc1RhZ05hbWUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0ID0gMDsKICAg ICB2aXJ0dWFsIFN0cmluZyB0YWdOYW1lKCkgY29uc3QgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwuY3BwIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcAppbmRl eCAzZjY1MDhlMDYxYzE4MDA2ZmVlNjFlNGU0ZDFkNmIzOTc2MjhkMjcxLi4yN2NmODY5ZjRkNTc3 MWM5ODRiMmJlM2Y0NjEyNmI5ODc3YjYwMDE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5jcHAKQEAgLTI1OCw3ICsy NTgsOCBAQCBBWENvcmVPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBBY2Nlc3Np YmlsaXR5VGFibGVDZWxsOjpjb2x1bW5IZWFkZXJzKAogICAgICAgICBpZiAoIXRhYmxlQ2VsbCB8 fCB0YWJsZUNlbGwgPT0gdGhpcyB8fCBoZWFkZXJzLmNvbnRhaW5zKHRhYmxlQ2VsbCkpCiAgICAg ICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBjb25zdCBBdG9tU3RyaW5nJiBzY29wZSA9IHRh YmxlQ2VsbC0+Z2V0QXR0cmlidXRlKHNjb3BlQXR0cik7CisgICAgICAgIEFTU0VSVChpczxBY2Nl c3NpYmlsaXR5T2JqZWN0Pih0YWJsZUNlbGwpKTsKKyAgICAgICAgY29uc3QgQXRvbVN0cmluZyYg c2NvcGUgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pih0YWJsZUNlbGwpLT5nZXRBdHRy aWJ1dGUoc2NvcGVBdHRyKTsKICAgICAgICAgaWYgKHNjb3BlID09ICJjb2xncm91cCIgJiYgaXNU YWJsZUNlbGxJblNhbWVDb2xHcm91cCh0YWJsZUNlbGwpKQogICAgICAgICAgICAgaGVhZGVycy5h cHBlbmQodGFibGVDZWxsKTsKICAgICAgICAgZWxzZSBpZiAodGFibGVDZWxsLT5pc0NvbHVtbkhl YWRlckNlbGwoKSkKQEAgLTI4Myw3ICsyODQsNyBAQCBBWENvcmVPYmplY3Q6OkFjY2Vzc2liaWxp dHlDaGlsZHJlblZlY3RvciBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjpyb3dIZWFkZXJzKCkKICAg ICAgICAgaWYgKCF0YWJsZUNlbGwgfHwgdGFibGVDZWxsID09IHRoaXMgfHwgaGVhZGVycy5jb250 YWlucyh0YWJsZUNlbGwpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIAotICAgICAg ICBjb25zdCBBdG9tU3RyaW5nJiBzY29wZSA9IHRhYmxlQ2VsbC0+Z2V0QXR0cmlidXRlKHNjb3Bl QXR0cik7CisgICAgICAgIGNvbnN0IEF0b21TdHJpbmcmIHNjb3BlID0gZG93bmNhc3Q8QWNjZXNz aWJpbGl0eU9iamVjdD4odGFibGVDZWxsKS0+Z2V0QXR0cmlidXRlKHNjb3BlQXR0cik7CiAgICAg ICAgIGlmIChzY29wZSA9PSAicm93Z3JvdXAiICYmIGlzVGFibGVDZWxsSW5TYW1lUm93R3JvdXAo dGFibGVDZWxsKSkKICAgICAgICAgICAgIGhlYWRlcnMuYXBwZW5kKHRhYmxlQ2VsbCk7CiAgICAg ICAgIGVsc2UgaWYgKHRhYmxlQ2VsbC0+aXNSb3dIZWFkZXJDZWxsKCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCmluZGV4IDA2NjNiODAxNTk4ZTg1MDMxYTIwYjZkODZkYmMzMDE5NjFhNzM5 YjUuLjNjM2VjZjVmYjI3YmU2YmViY2MxYjJhOWI1NTY5MjlmODc2NDUwM2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRPYmplY3QuY3BwCkBAIC02OCw2ICs2OCw4IEBAIHZvaWQgQVhJc29sYXRlZE9iamVj dDo6aW5pdCgpCiAKIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZUF0dHJpYnV0ZURh dGEoQVhDb3JlT2JqZWN0JiBvYmplY3QsIGJvb2wgaXNSb290KQogeworICAgIEFTU0VSVChpczxB Y2Nlc3NpYmlsaXR5T2JqZWN0PihvYmplY3QpKTsKKwogICAgIHNldFByb3BlcnR5KEFYUHJvcGVy dHlOYW1lOjpBUklBTGFuZG1hcmtSb2xlRGVzY3JpcHRpb24sIG9iamVjdC5hcmlhTGFuZG1hcmtS b2xlRGVzY3JpcHRpb24oKS5pc29sYXRlZENvcHkoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9w ZXJ0eU5hbWU6OkFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbiwgb2JqZWN0LmFjY2Vzc2liaWxpdHlE ZXNjcmlwdGlvbigpLmlzb2xhdGVkQ29weSgpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5 TmFtZTo6Qm91bmRpbmdCb3hSZWN0LCBvYmplY3QuYm91bmRpbmdCb3hSZWN0KCkpOwpAQCAtMjgy LDYgKzI4NCwxMSBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRyaWJ1dGVE YXRhKEFYQ29yZU9iamVjdCYgb2JqZWN0LCBib29sIGlzUm9vdAogICAgIGlmIChvYmplY3QuaXNU ZXh0Q29udHJvbCgpKQogICAgICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6VGV4dExl bmd0aCwgb2JqZWN0LnRleHRMZW5ndGgoKSk7CiAKKyAgICBpZiAob2JqZWN0LmlzUmFkaW9CdXR0 b24oKSkgeworICAgICAgICBpZiAoYXV0byBuYW1lQXR0cmlidXRlID0gb2JqZWN0LmF0dHJpYnV0 ZVZhbHVlKCJuYW1lIikpCisgICAgICAgICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6 TmFtZUF0dHJpYnV0ZSwgbmFtZUF0dHJpYnV0ZS0+aXNvbGF0ZWRDb3B5KCkpOworICAgIH0KKwog ICAgIGlmIChvYmplY3QuY2FuSGF2ZVNlbGVjdGVkQ2hpbGRyZW4oKSkgewogICAgICAgICBBY2Nl c3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3Igc2VsZWN0ZWRDaGlsZHJlbjsKICAgICAgICAgb2JqZWN0 LnNlbGVjdGVkQ2hpbGRyZW4oc2VsZWN0ZWRDaGlsZHJlbik7CkBAIC0yMTY0LDE2ICsyMTcxLDEz IEBAIEFYQ29yZU9iamVjdCogQVhJc29sYXRlZE9iamVjdDo6Zmlyc3RBbm9ueW1vdXNCbG9ja0No aWxkKCkgY29uc3QKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotYm9vbCBBWElzb2xhdGVkT2Jq ZWN0OjpoYXNBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0Ci17Ci0gICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCi1jb25zdCBBdG9tU3Ry aW5nJiBBWElzb2xhdGVkT2JqZWN0OjpnZXRBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYp IGNvbnN0CitzdGQ6Om9wdGlvbmFsPFN0cmluZz4gQVhJc29sYXRlZE9iamVjdDo6YXR0cmlidXRl VmFsdWUoY29uc3QgU3RyaW5nJiBhdHRyaWJ1dGVOYW1lKSBjb25zdAogewotICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBudWxsQXRvbSgpOworICAgIGlmIChhdHRyaWJ1dGVO YW1lID09ICJuYW1lIikgeworICAgICAgICBpZiAobV9wcm9wZXJ0eU1hcC5jb250YWlucyhBWFBy b3BlcnR5TmFtZTo6TmFtZUF0dHJpYnV0ZSkpCisgICAgICAgICAgICByZXR1cm4gc3RyaW5nQXR0 cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6Ok5hbWVBdHRyaWJ1dGUpOworICAgIH0KKyAgICBy ZXR1cm4gc3RkOjpudWxsb3B0OwogfQogCiBib29sIEFYSXNvbGF0ZWRPYmplY3Q6Omhhc1RhZ05h bWUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmggYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKaW5k ZXggZDdjYTcwNzU1ZDlmOGJiZDliY2E3ZTEyOGUwODBkMzRmZDY1N2E1NC4uNjI1ZjY1NWZkZWE0 MmMwZjkzOTE5MDg1YjM2YjEzYzQyODY3MmE4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaApA QCAtNjE2LDggKzYxNiw3IEBAIHByaXZhdGU6CiAgICAgQVhDb3JlT2JqZWN0KiBhY3RpdmVEZXNj ZW5kYW50KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBoYW5kbGVBY3RpdmVEZXNjZW5kYW50 Q2hhbmdlZCgpIG92ZXJyaWRlOwogICAgIEFYQ29yZU9iamVjdCogZmlyc3RBbm9ueW1vdXNCbG9j a0NoaWxkKCkgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgYm9vbCBoYXNBdHRyaWJ1dGUoY29uc3QgUXVh bGlmaWVkTmFtZSYpIGNvbnN0IG92ZXJyaWRlOwotICAgIGNvbnN0IEF0b21TdHJpbmcmIGdldEF0 dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Qgb3ZlcnJpZGU7CisgICAgc3RkOjpv cHRpb25hbDxTdHJpbmc+IGF0dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmluZyYpIGNvbnN0IG92ZXJy aWRlOwogICAgIGJvb2wgaGFzVGFnTmFtZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Qgb3Zl cnJpZGU7CiAgICAgU3RyaW5nIHN0cmluZ1ZhbHVlRm9yTVNBQSgpIGNvbnN0IG92ZXJyaWRlOwog ICAgIFN0cmluZyBzdHJpbmdSb2xlRm9yTVNBQSgpIGNvbnN0IG92ZXJyaWRlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRy ZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRUcmVlLmgKaW5kZXggY2Y0Mjg2MjM5ZjY0Yjk0NGUxN2U0Y2U4ZjM2ODA4ZDM5ZjExNzQwMi4u NjVmZTZkNTAzZDU4OTg2ZTYyZTNkYTBkYTI4YTQ5MTA4YWNjMjM4NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk VHJlZS5oCkBAIC0yNTEsNiArMjUxLDcgQEAgZW51bSBjbGFzcyBBWFByb3BlcnR5TmFtZSA6IHVp bnQxNl90IHsKICAgICBNYXRoU3VwZXJzY3JpcHRPYmplY3QsCiAgICAgTWF4VmFsdWVGb3JSYW5n ZSwKICAgICBNaW5WYWx1ZUZvclJhbmdlLAorICAgIE5hbWVBdHRyaWJ1dGUsCiAgICAgTmV4dFNp YmxpbmcsCiAgICAgT3JpZW50YXRpb24sCiAgICAgT3V0ZXJIVE1MLAo= 439160 2021-09-24 10:34:08 -0700 2021-09-24 11:00:44 -0700 Patch bug-230754-20210924133407.patch text/plain 13842 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyOTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzM2ZWRjODc4ODAyZjE5 Mzk2ZmVlNzc3NzM5ODAzYmFkZGU5ZjYwMi4uMTVlMDY3ZjVhMTZjNDhjMDc2ZjljYjAyNDYzY2M1 NWNkMzJkNDdmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTA5LTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGNy YXNoIGluIGFjY2Vzc2liaWxpdHkvTWFjL3NlYXJjaC1wcmVkaWNhdGUtZm9yLWFkaG9jLXJhZGlv LWdyb3Vwcy5odG1sIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDc1NAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODM0OTg1OTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9NYWMvc2VhcmNoLXByZWRpY2F0ZS1mb3ItYWRob2Mt cmFkaW8tZ3JvdXBzLmh0bWwKKworICAgICAgICBUaGUgY3Jhc2ggd2FzIGNhdXNlZCBieSB0aGUg Y2FsbCBpbiBpc1JhZGlvQnV0dG9uSW5EaWZmZXJlbnRBZGhvY0dyb3VwCisgICAgICAgIHRvIGF4 T2JqZWN0LT5lbGVtZW50KCktPmdldE5hbWVBdHRyaWJ1dGUoKSwgc2luY2UgZWxlbWVudCgpIHNo b3VsZCBub3QKKyAgICAgICAgYmUgY2FsbGVkIG9mZiBvZiB0aGUgbWFpbiB0aHJlYWQuIFRoYXQg YnJpbnMgdXAgdGhlIHF1ZXN0aW9uIG9mIGhvdyB0bworICAgICAgICBnZXQgZWxlbWVudCBhdHRy aWJ1dGVzIG9uIHRoZSBBWCB0aHJlYWQuIEZvciB0aGF0IHB1cnBvc2UsIEkgYWRkZWQgdGhlCisg ICAgICAgIGF0dHJpYnV0ZVZhbHVlIG1ldGhvZCB0byB0aGUgQVhDb3JlT2JqZWN0IGludGVyZmFj ZSwgYW5kIHJlbW92ZWQgdGhlCisgICAgICAgIHJlbGF0ZWQgbWV0aG9kcyB0aGF0IHRha2UgUXVh bGlmaWVkTmFtZXMgYW5kIHJldHVybiBhbiBBdG9tU3RyaW5nLCBzaW5jZQorICAgICAgICB0aGV5 IGNhbm5vdCBiZSB1c2VkIG9mZiBvZiB0aGUgbWFpbiB0aHJlYWQuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdDo6YXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGFGb3JDaGls ZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Ojppc1JhZGlvQnV0dG9uSW5EaWZm ZXJlbnRBZGhvY0dyb3VwKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRl cmZhY2UuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6Y29sdW1uSGVh ZGVycyk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjpyb3dIZWFk ZXJzKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlcklPUy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIg YWNjZXNzaWJpbGl0eUlkZW50aWZpZXJdKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0 ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkFY SXNvbGF0ZWRPYmplY3Q6OmF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkFYSXNvbGF0ZWRPYmplY3Q6Omhhc0F0dHJpYnV0ZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpnZXRBdHRyaWJ1dGUgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5o OgorCiAyMDIxLTA5LTIzICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgQVhEUlRFbGVtZW50SWRBdHRyaWJ1dGUgZnJvbSB0aGUgQVggb2Jq ZWN0IHBsYXRmb3JtIHdyYXBwZXIgaW50ZXJmYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggNjgxOTM2ZjU4ZjBm OWM4YWQ0M2E0Mjg0MWJhYzJhMmYxY2YxMjFjOS4uOTFmNzdiZWJjOTRkNDIxN2M0ZjNjNWIxMjJh YTBlYzY2NmE5Zjc5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0xOTU1LDYgKzE5NTUsMTYgQEAgY29uc3QgQXRv bVN0cmluZyYgQWNjZXNzaWJpbGl0eU9iamVjdDo6Z2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmll ZE5hbWUmIGF0dHJpYnUKICAgICByZXR1cm4gbnVsbEF0b20oKTsKIH0KIAorc3RkOjpvcHRpb25h bDxTdHJpbmc+IEFjY2Vzc2liaWxpdHlPYmplY3Q6OmF0dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmlu ZyYgYXR0cmlidXRlTmFtZSkgY29uc3QKK3sKKyAgICBpZiAoYXR0cmlidXRlTmFtZSA9PSAibmFt ZSIpIHsKKyAgICAgICAgYXV0byB2YWx1ZSA9IGdldEF0dHJpYnV0ZShuYW1lQXR0cik7CisgICAg ICAgIGlmICghdmFsdWUuaXNOdWxsKCkpCisgICAgICAgICAgICByZXR1cm4gdmFsdWU7CisgICAg fQorICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Cit9CisKIGludCBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpnZXRJbnRlZ3JhbEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyaWJ1dGVOYW1l KSBjb25zdAogewogICAgIHJldHVybiBwYXJzZUhUTUxJbnRlZ2VyKGdldEF0dHJpYnV0ZShhdHRy aWJ1dGVOYW1lKSkudmFsdWVfb3IoMCk7CkBAIC0yNjc3LDEyICsyNjg3LDEyIEBAIGludCBBY2Nl c3NpYmlsaXR5T2JqZWN0Ojpwb3NJblNldCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGdldEludGVn cmFsQXR0cmlidXRlKGFyaWFfcG9zaW5zZXRBdHRyKTsKIH0KLSAgICAKKwogU3RyaW5nIEFjY2Vz c2liaWxpdHlPYmplY3Q6OmlkZW50aWZpZXJBdHRyaWJ1dGUoKSBjb25zdAogewogICAgIHJldHVy biBnZXRBdHRyaWJ1dGUoaWRBdHRyKTsKIH0KLSAgICAKKwogdm9pZCBBY2Nlc3NpYmlsaXR5T2Jq ZWN0OjpjbGFzc0xpc3QoVmVjdG9yPFN0cmluZz4mIGNsYXNzTGlzdCkgY29uc3QKIHsKICAgICBO b2RlKiBub2RlID0gdGhpcy0+bm9kZSgpOwpAQCAtMzU5NCwxNyArMzYwNCwxNyBAQCB2b2lkIEFj Y2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFPd25zUmVmZXJlbmNpbmdFbGVtZW50cyhBY2Nlc3NpYmls aXR5Q2hpbGRyZW5WZWN0bwogCiB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnNldElzSWdub3Jl ZEZyb21QYXJlbnREYXRhRm9yQ2hpbGQoQVhDb3JlT2JqZWN0KiBjaGlsZCkKIHsKLSAgICBpZiAo IWNoaWxkKQorICAgIGlmICghaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4oY2hpbGQpKQogICAgICAg ICByZXR1cm47Ci0gICAgCisKICAgICBpZiAoY2hpbGQtPnBhcmVudE9iamVjdCgpICE9IHRoaXMp IHsKICAgICAgICAgY2hpbGQtPmNsZWFySXNJZ25vcmVkRnJvbVBhcmVudERhdGEoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KLSAgICAKKwogICAgIEFjY2Vzc2liaWxpdHlJc0lnbm9yZWRGcm9t UGFyZW50RGF0YSByZXN1bHQgPSBBY2Nlc3NpYmlsaXR5SXNJZ25vcmVkRnJvbVBhcmVudERhdGEo dGhpcyk7CiAgICAgaWYgKCFtX2lzSWdub3JlZEZyb21QYXJlbnREYXRhLmlzTnVsbCgpKSB7Ci0g ICAgICAgIHJlc3VsdC5pc0FYSGlkZGVuID0gKG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNB WEhpZGRlbiB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShjaGlsZC0+Z2V0QXR0cmli dXRlKGFyaWFfaGlkZGVuQXR0ciksICJ0cnVlIikpICYmICFjaGlsZC0+aXNGb2N1c2VkKCk7Cisg ICAgICAgIHJlc3VsdC5pc0FYSGlkZGVuID0gKG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNB WEhpZGRlbiB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShkb3duY2FzdDxBY2Nlc3Np YmlsaXR5T2JqZWN0PihjaGlsZCktPmdldEF0dHJpYnV0ZShhcmlhX2hpZGRlbkF0dHIpLCAidHJ1 ZSIpKSAmJiAhY2hpbGQtPmlzRm9jdXNlZCgpOwogICAgICAgICByZXN1bHQuaXNQcmVzZW50YXRp b25hbENoaWxkT2ZBcmlhUm9sZSA9IG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNQcmVzZW50 YXRpb25hbENoaWxkT2ZBcmlhUm9sZSB8fCBhcmlhUm9sZUhhc1ByZXNlbnRhdGlvbmFsQ2hpbGRy ZW4oKTsKICAgICAgICAgcmVzdWx0LmlzRGVzY2VuZGFudE9mQmFycmVuUGFyZW50ID0gbV9pc0ln bm9yZWRGcm9tUGFyZW50RGF0YS5pc0Rlc2NlbmRhbnRPZkJhcnJlblBhcmVudCB8fCAhY2FuSGF2 ZUNoaWxkcmVuKCk7CiAgICAgfSBlbHNlIHsKQEAgLTM2MTIsNyArMzYyMiw3IEBAIHZvaWQgQWNj ZXNzaWJpbGl0eU9iamVjdDo6c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGFGb3JDaGlsZChBWENv cmVPYmplY3QqIGNoaWxkCiAgICAgICAgIHJlc3VsdC5pc1ByZXNlbnRhdGlvbmFsQ2hpbGRPZkFy aWFSb2xlID0gY2hpbGQtPmlzUHJlc2VudGF0aW9uYWxDaGlsZE9mQXJpYVJvbGUoKTsKICAgICAg ICAgcmVzdWx0LmlzRGVzY2VuZGFudE9mQmFycmVuUGFyZW50ID0gY2hpbGQtPmlzRGVzY2VuZGFu dE9mQmFycmVuUGFyZW50KCk7CiAgICAgfQotICAgIAorCiAgICAgY2hpbGQtPnNldElzSWdub3Jl ZEZyb21QYXJlbnREYXRhKHJlc3VsdCk7CiB9CiAKQEAgLTM2NTMsNyArMzY2Myw3IEBAIHN0YXRp YyBib29sIGlzUmFkaW9CdXR0b25JbkRpZmZlcmVudEFkaG9jR3JvdXAoQVhDb3JlT2JqZWN0KiBh eE9iamVjdCwgQVhDb3JlT2JqCiAgICAgaWYgKCFyZWZlcmVuY2VPYmplY3QgfHwgIXJlZmVyZW5j ZU9iamVjdC0+aXNSYWRpb0J1dHRvbigpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHJl dHVybiBheE9iamVjdC0+ZWxlbWVudCgpLT5nZXROYW1lQXR0cmlidXRlKCkgIT0gcmVmZXJlbmNl T2JqZWN0LT5lbGVtZW50KCktPmdldE5hbWVBdHRyaWJ1dGUoKTsKKyAgICByZXR1cm4gYXhPYmpl Y3QtPmF0dHJpYnV0ZVZhbHVlKCJuYW1lIikgIT0gcmVmZXJlbmNlT2JqZWN0LT5hdHRyaWJ1dGVW YWx1ZSgibmFtZSIpOwogfQogCiBzdGF0aWMgYm9vbCBpc0FjY2Vzc2liaWxpdHlPYmplY3RTZWFy Y2hNYXRjaEF0SW5kZXgoQVhDb3JlT2JqZWN0KiBheE9iamVjdCwgQWNjZXNzaWJpbGl0eVNlYXJj aENyaXRlcmlhIGNvbnN0JiBjcml0ZXJpYSwgc2l6ZV90IGluZGV4KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCBhMzc3Mzhl OWEzOWFiNjEwOTA5YTU3ODU1YTgzZDIzNDExZjc0NmYwLi42MTk3ZWNkOGVlNmM0OWIwZjcxYmFj MGMwMDQ4YzY1ZWZhYjU1YTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApAQCAtNTE0LDggKzUxNCw5IEBAIHB1YmxpYzoKICAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmaXJzdEFub255bW91c0Jsb2NrQ2hpbGQoKSBjb25zdCBv dmVycmlkZTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBBY2Nlc3NpYmlsaXR5Um9sZSBh cmlhUm9sZVRvV2ViQ29yZVJvbGUoY29uc3QgU3RyaW5nJik7Ci0gICAgYm9vbCBoYXNBdHRyaWJ1 dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0IG92ZXJyaWRlOwotICAgIGNvbnN0IEF0b21T dHJpbmcmIGdldEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Qgb3ZlcnJpZGU7 CisgICAgdmlydHVhbCBib29sIGhhc0F0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29u c3Q7CisgICAgdmlydHVhbCBjb25zdCBBdG9tU3RyaW5nJiBnZXRBdHRyaWJ1dGUoY29uc3QgUXVh bGlmaWVkTmFtZSYpIGNvbnN0OworICAgIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBhdHRyaWJ1dGVW YWx1ZShjb25zdCBTdHJpbmcmKSBjb25zdCBvdmVycmlkZTsKICAgICBpbnQgZ2V0SW50ZWdyYWxB dHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0OwogICAgIGJvb2wgaGFzVGFnTmFt ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgU3RyaW5nIHRhZ05h bWUoKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKaW5kZXggYjQwMzUwNzFk ZmZlOTg3M2E0OTFmMTJmYTlhYTdmZDgzMTliZWMyZi4uNjIyZGE0YjVkY2EzMDZiNjExNjE3MDll ZjNlZjA2NDRhODdmNjQ0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTEyNTUsOCArMTI1 NSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQW5jZXN0b3JPZk9iamVjdChjb25zdCBBWENvcmVP YmplY3QqKSBjb25zdDsKICAgICB2aXJ0dWFsIEFYQ29yZU9iamVjdCogZmlyc3RBbm9ueW1vdXNC bG9ja0NoaWxkKCkgY29uc3QgPSAwOwogCi0gICAgdmlydHVhbCBib29sIGhhc0F0dHJpYnV0ZShj b25zdCBRdWFsaWZpZWROYW1lJikgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgY29uc3QgQXRvbVN0 cmluZyYgZ2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdCA9IDA7CisgICAg dmlydHVhbCBzdGQ6Om9wdGlvbmFsPFN0cmluZz4gYXR0cmlidXRlVmFsdWUoY29uc3QgU3RyaW5n JikgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBoYXNUYWdOYW1lKGNvbnN0IFF1YWxpZmll ZE5hbWUmKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBTdHJpbmcgdGFnTmFtZSgpIGNvbnN0ID0g MDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5VGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVRhYmxlQ2VsbC5jcHAKaW5kZXggM2Y2NTA4ZTA2MWMxODAwNmZlZTYxZTRlNGQxZDZiMzk3 NjI4ZDI3MS4uMjdjZjg2OWY0ZDU3NzFjOTg0YjJiZTNmNDYxMjZiOTg3N2I2MDAxNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxs LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJs ZUNlbGwuY3BwCkBAIC0yNTgsNyArMjU4LDggQEAgQVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5 Q2hpbGRyZW5WZWN0b3IgQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6Y29sdW1uSGVhZGVycygKICAg ICAgICAgaWYgKCF0YWJsZUNlbGwgfHwgdGFibGVDZWxsID09IHRoaXMgfHwgaGVhZGVycy5jb250 YWlucyh0YWJsZUNlbGwpKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgY29uc3Qg QXRvbVN0cmluZyYgc2NvcGUgPSB0YWJsZUNlbGwtPmdldEF0dHJpYnV0ZShzY29wZUF0dHIpOwor ICAgICAgICBBU1NFUlQoaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4odGFibGVDZWxsKSk7CisgICAg ICAgIGNvbnN0IEF0b21TdHJpbmcmIHNjb3BlID0gZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVj dD4odGFibGVDZWxsKS0+Z2V0QXR0cmlidXRlKHNjb3BlQXR0cik7CiAgICAgICAgIGlmIChzY29w ZSA9PSAiY29sZ3JvdXAiICYmIGlzVGFibGVDZWxsSW5TYW1lQ29sR3JvdXAodGFibGVDZWxsKSkK ICAgICAgICAgICAgIGhlYWRlcnMuYXBwZW5kKHRhYmxlQ2VsbCk7CiAgICAgICAgIGVsc2UgaWYg KHRhYmxlQ2VsbC0+aXNDb2x1bW5IZWFkZXJDZWxsKCkpCkBAIC0yODMsNyArMjg0LDcgQEAgQVhD b3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgQWNjZXNzaWJpbGl0eVRhYmxl Q2VsbDo6cm93SGVhZGVycygpCiAgICAgICAgIGlmICghdGFibGVDZWxsIHx8IHRhYmxlQ2VsbCA9 PSB0aGlzIHx8IGhlYWRlcnMuY29udGFpbnModGFibGVDZWxsKSkKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICAKLSAgICAgICAgY29uc3QgQXRvbVN0cmluZyYgc2NvcGUgPSB0YWJsZUNl bGwtPmdldEF0dHJpYnV0ZShzY29wZUF0dHIpOworICAgICAgICBjb25zdCBBdG9tU3RyaW5nJiBz Y29wZSA9IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlPYmplY3Q+KHRhYmxlQ2VsbCktPmdldEF0dHJp YnV0ZShzY29wZUF0dHIpOwogICAgICAgICBpZiAoc2NvcGUgPT0gInJvd2dyb3VwIiAmJiBpc1Rh YmxlQ2VsbEluU2FtZVJvd0dyb3VwKHRhYmxlQ2VsbCkpCiAgICAgICAgICAgICBoZWFkZXJzLmFw cGVuZCh0YWJsZUNlbGwpOwogICAgICAgICBlbHNlIGlmICh0YWJsZUNlbGwtPmlzUm93SGVhZGVy Q2VsbCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2Vi QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQppbmRleCA0MGJi MTA3ZDU5NjdjMTQxYzVmMmJjNGEzMzMwYzVlMGQzYzhkZDA2Li40MTNhNTRmYjAxYmRlMTQyM2M5 MGFiNjg1ODExZjc3Y2ZjMmJhOTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl cklPUy5tbQpAQCAtNDIsNyArNDIsNiBAQAogI2ltcG9ydCAiSGl0VGVzdFJlc3VsdC5oIgogI2lt cG9ydCAiSFRNTEZyYW1lT3duZXJFbGVtZW50LmgiCiAjaW1wb3J0ICJIVE1MSW5wdXRFbGVtZW50 LmgiCi0jaW1wb3J0ICJIVE1MTmFtZXMuaCIKICNpbXBvcnQgIkludFJlY3QuaCIKICNpbXBvcnQg IkxvY2FsaXplZFN0cmluZ3MuaCIKICNpbXBvcnQgIlBhZ2UuaCIKQEAgLTkzLDcgKzkyLDYgQEAg ZW51bSB7CiBAZW5kCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotdXNpbmcgbmFtZXNwYWNl IEhUTUxOYW1lczsKIAogdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgVUlBY2Nlc3NpYmlsaXR5 U2Nyb2xsRGlyZWN0aW9uKSB7CiAgICAgVUlBY2Nlc3NpYmlsaXR5U2Nyb2xsRGlyZWN0aW9uUmln aHQgPSAxLApAQCAtMjc3Myw4ICsyNzcxLDcgQEAgc3RhdGljIFJlbmRlck9iamVjdCogcmVuZGVy ZXJGb3JWaWV3KFdBS1ZpZXcqIHZpZXcpCiB7CiAgICAgaWYgKCFbc2VsZiBfcHJlcGFyZUFjY2Vz c2liaWxpdHlDYWxsXSkKICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAKLSAgICByZXR1cm4gc2Vs Zi5heEJhY2tpbmdPYmplY3QtPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OmlkQXR0cik7CisgICAg cmV0dXJuIHNlbGYuYXhCYWNraW5nT2JqZWN0LT5pZGVudGlmaWVyQXR0cmlidXRlKCk7CiB9CiAK IC0gKE5TQXJyYXk8TlNTdHJpbmcgKj4gKilhY2Nlc3NpYmlsaXR5U3BlZWNoSGludApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkT2JqZWN0LmNwcAppbmRleCAwNjYzYjgwMTU5OGU4NTAzMWEyMGI2ZDg2ZGJjMzAx OTYxYTczOWI1Li4zYzNlY2Y1ZmIyN2JlNmJlYmNjMWIyYTliNTU2OTI5Zjg3NjQ1MDNhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAtNjgsNiArNjgsOCBAQCB2b2lkIEFYSXNvbGF0 ZWRPYmplY3Q6OmluaXQoKQogCiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRy aWJ1dGVEYXRhKEFYQ29yZU9iamVjdCYgb2JqZWN0LCBib29sIGlzUm9vdCkKIHsKKyAgICBBU1NF UlQoaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4ob2JqZWN0KSk7CisKICAgICBzZXRQcm9wZXJ0eShB WFByb3BlcnR5TmFtZTo6QVJJQUxhbmRtYXJrUm9sZURlc2NyaXB0aW9uLCBvYmplY3QuYXJpYUxh bmRtYXJrUm9sZURlc2NyaXB0aW9uKCkuaXNvbGF0ZWRDb3B5KCkpOwogICAgIHNldFByb3BlcnR5 KEFYUHJvcGVydHlOYW1lOjpBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24sIG9iamVjdC5hY2Nlc3Np YmlsaXR5RGVzY3JpcHRpb24oKS5pc29sYXRlZENvcHkoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQ cm9wZXJ0eU5hbWU6OkJvdW5kaW5nQm94UmVjdCwgb2JqZWN0LmJvdW5kaW5nQm94UmVjdCgpKTsK QEAgLTI4Miw2ICsyODQsMTEgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0 cmlidXRlRGF0YShBWENvcmVPYmplY3QmIG9iamVjdCwgYm9vbCBpc1Jvb3QKICAgICBpZiAob2Jq ZWN0LmlzVGV4dENvbnRyb2woKSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OlRleHRMZW5ndGgsIG9iamVjdC50ZXh0TGVuZ3RoKCkpOwogCisgICAgaWYgKG9iamVjdC5pc1Jh ZGlvQnV0dG9uKCkpIHsKKyAgICAgICAgaWYgKGF1dG8gbmFtZUF0dHJpYnV0ZSA9IG9iamVjdC5h dHRyaWJ1dGVWYWx1ZSgibmFtZSIpKQorICAgICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWU6Ok5hbWVBdHRyaWJ1dGUsIG5hbWVBdHRyaWJ1dGUtPmlzb2xhdGVkQ29weSgpKTsKKyAg ICB9CisKICAgICBpZiAob2JqZWN0LmNhbkhhdmVTZWxlY3RlZENoaWxkcmVuKCkpIHsKICAgICAg ICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHNlbGVjdGVkQ2hpbGRyZW47CiAgICAgICAg IG9iamVjdC5zZWxlY3RlZENoaWxkcmVuKHNlbGVjdGVkQ2hpbGRyZW4pOwpAQCAtMjE2NCwxNiAr MjE3MSwxMyBAQCBBWENvcmVPYmplY3QqIEFYSXNvbGF0ZWRPYmplY3Q6OmZpcnN0QW5vbnltb3Vz QmxvY2tDaGlsZCgpIGNvbnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLWJvb2wgQVhJc29s YXRlZE9iamVjdDo6aGFzQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdAotewot ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBmYWxzZTsKLX0KLQotY29uc3Qg QXRvbVN0cmluZyYgQVhJc29sYXRlZE9iamVjdDo6Z2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmll ZE5hbWUmKSBjb25zdAorc3RkOjpvcHRpb25hbDxTdHJpbmc+IEFYSXNvbGF0ZWRPYmplY3Q6OmF0 dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmluZyYgYXR0cmlidXRlTmFtZSkgY29uc3QKIHsKLSAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gbnVsbEF0b20oKTsKKyAgICBpZiAoYXR0 cmlidXRlTmFtZSA9PSAibmFtZSIpIHsKKyAgICAgICAgaWYgKG1fcHJvcGVydHlNYXAuY29udGFp bnMoQVhQcm9wZXJ0eU5hbWU6Ok5hbWVBdHRyaWJ1dGUpKQorICAgICAgICAgICAgcmV0dXJuIHN0 cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpOYW1lQXR0cmlidXRlKTsKKyAgICB9 CisgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIH0KIAogYm9vbCBBWElzb2xhdGVkT2JqZWN0Ojpo YXNUYWdOYW1lKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVj dC5oCmluZGV4IGQ3Y2E3MDc1NWQ5ZjhiYmQ5YmNhN2UxMjhlMDgwZDM0ZmQ2NTdhNTQuLjYyNWY2 NTVmZGVhNDJjMGY5MzkxOTA4NWIzNmIxM2M0Mjg2NzJhOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmgKQEAgLTYxNiw4ICs2MTYsNyBAQCBwcml2YXRlOgogICAgIEFYQ29yZU9iamVjdCogYWN0 aXZlRGVzY2VuZGFudCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgaGFuZGxlQWN0aXZlRGVz Y2VuZGFudENoYW5nZWQoKSBvdmVycmlkZTsKICAgICBBWENvcmVPYmplY3QqIGZpcnN0QW5vbnlt b3VzQmxvY2tDaGlsZCgpIGNvbnN0IG92ZXJyaWRlOwotICAgIGJvb2wgaGFzQXR0cmlidXRlKGNv bnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdCBvdmVycmlkZTsKLSAgICBjb25zdCBBdG9tU3RyaW5n JiBnZXRBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0IG92ZXJyaWRlOworICAg IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBhdHRyaWJ1dGVWYWx1ZShjb25zdCBTdHJpbmcmKSBjb25z dCBvdmVycmlkZTsKICAgICBib29sIGhhc1RhZ05hbWUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNv bnN0IG92ZXJyaWRlOwogICAgIFN0cmluZyBzdHJpbmdWYWx1ZUZvck1TQUEoKSBjb25zdCBvdmVy cmlkZTsKICAgICBTdHJpbmcgc3RyaW5nUm9sZUZvck1TQUEoKSBjb25zdCBvdmVycmlkZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5oCmluZGV4IGNmNDI4NjIzOWY2NGI5NDRlMTdlNGNlOGYzNjgwOGQzOWYx MTc0MDIuLjY1ZmU2ZDUwM2Q1ODk4NmU2MmUzZGEwZGEyOGE0OTEwOGFjYzIzODUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZFRyZWUuaApAQCAtMjUxLDYgKzI1MSw3IEBAIGVudW0gY2xhc3MgQVhQcm9wZXJ0eU5h bWUgOiB1aW50MTZfdCB7CiAgICAgTWF0aFN1cGVyc2NyaXB0T2JqZWN0LAogICAgIE1heFZhbHVl Rm9yUmFuZ2UsCiAgICAgTWluVmFsdWVGb3JSYW5nZSwKKyAgICBOYW1lQXR0cmlidXRlLAogICAg IE5leHRTaWJsaW5nLAogICAgIE9yaWVudGF0aW9uLAogICAgIE91dGVySFRNTCwK 439165 2021-09-24 10:58:43 -0700 2021-09-27 08:05:09 -0700 Patch bug-230754-20210924135842.patch text/plain 13443 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyOTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzM2ZWRjODc4ODAyZjE5 Mzk2ZmVlNzc3NzM5ODAzYmFkZGU5ZjYwMi4uMTVlMDY3ZjVhMTZjNDhjMDc2ZjljYjAyNDYzY2M1 NWNkMzJkNDdmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTA5LTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGNy YXNoIGluIGFjY2Vzc2liaWxpdHkvTWFjL3NlYXJjaC1wcmVkaWNhdGUtZm9yLWFkaG9jLXJhZGlv LWdyb3Vwcy5odG1sIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDc1NAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODM0OTg1OTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9NYWMvc2VhcmNoLXByZWRpY2F0ZS1mb3ItYWRob2Mt cmFkaW8tZ3JvdXBzLmh0bWwKKworICAgICAgICBUaGUgY3Jhc2ggd2FzIGNhdXNlZCBieSB0aGUg Y2FsbCBpbiBpc1JhZGlvQnV0dG9uSW5EaWZmZXJlbnRBZGhvY0dyb3VwCisgICAgICAgIHRvIGF4 T2JqZWN0LT5lbGVtZW50KCktPmdldE5hbWVBdHRyaWJ1dGUoKSwgc2luY2UgZWxlbWVudCgpIHNo b3VsZCBub3QKKyAgICAgICAgYmUgY2FsbGVkIG9mZiBvZiB0aGUgbWFpbiB0aHJlYWQuIFRoYXQg YnJpbnMgdXAgdGhlIHF1ZXN0aW9uIG9mIGhvdyB0bworICAgICAgICBnZXQgZWxlbWVudCBhdHRy aWJ1dGVzIG9uIHRoZSBBWCB0aHJlYWQuIEZvciB0aGF0IHB1cnBvc2UsIEkgYWRkZWQgdGhlCisg ICAgICAgIGF0dHJpYnV0ZVZhbHVlIG1ldGhvZCB0byB0aGUgQVhDb3JlT2JqZWN0IGludGVyZmFj ZSwgYW5kIHJlbW92ZWQgdGhlCisgICAgICAgIHJlbGF0ZWQgbWV0aG9kcyB0aGF0IHRha2UgUXVh bGlmaWVkTmFtZXMgYW5kIHJldHVybiBhbiBBdG9tU3RyaW5nLCBzaW5jZQorICAgICAgICB0aGV5 IGNhbm5vdCBiZSB1c2VkIG9mZiBvZiB0aGUgbWFpbiB0aHJlYWQuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdDo6YXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGFGb3JDaGls ZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Ojppc1JhZGlvQnV0dG9uSW5EaWZm ZXJlbnRBZGhvY0dyb3VwKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRl cmZhY2UuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6Y29sdW1uSGVh ZGVycyk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjpyb3dIZWFk ZXJzKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlcklPUy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIg YWNjZXNzaWJpbGl0eUlkZW50aWZpZXJdKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0 ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkFY SXNvbGF0ZWRPYmplY3Q6OmF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkFYSXNvbGF0ZWRPYmplY3Q6Omhhc0F0dHJpYnV0ZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpnZXRBdHRyaWJ1dGUgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5o OgorCiAyMDIxLTA5LTIzICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgQVhEUlRFbGVtZW50SWRBdHRyaWJ1dGUgZnJvbSB0aGUgQVggb2Jq ZWN0IHBsYXRmb3JtIHdyYXBwZXIgaW50ZXJmYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggNjgxOTM2ZjU4ZjBm OWM4YWQ0M2E0Mjg0MWJhYzJhMmYxY2YxMjFjOS4uOTFmNzdiZWJjOTRkNDIxN2M0ZjNjNWIxMjJh YTBlYzY2NmE5Zjc5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0xOTU1LDYgKzE5NTUsMTYgQEAgY29uc3QgQXRv bVN0cmluZyYgQWNjZXNzaWJpbGl0eU9iamVjdDo6Z2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmll ZE5hbWUmIGF0dHJpYnUKICAgICByZXR1cm4gbnVsbEF0b20oKTsKIH0KIAorc3RkOjpvcHRpb25h bDxTdHJpbmc+IEFjY2Vzc2liaWxpdHlPYmplY3Q6OmF0dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmlu ZyYgYXR0cmlidXRlTmFtZSkgY29uc3QKK3sKKyAgICBpZiAoYXR0cmlidXRlTmFtZSA9PSAibmFt ZSIpIHsKKyAgICAgICAgYXV0byB2YWx1ZSA9IGdldEF0dHJpYnV0ZShuYW1lQXR0cik7CisgICAg ICAgIGlmICghdmFsdWUuaXNOdWxsKCkpCisgICAgICAgICAgICByZXR1cm4gdmFsdWU7CisgICAg fQorICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Cit9CisKIGludCBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpnZXRJbnRlZ3JhbEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyaWJ1dGVOYW1l KSBjb25zdAogewogICAgIHJldHVybiBwYXJzZUhUTUxJbnRlZ2VyKGdldEF0dHJpYnV0ZShhdHRy aWJ1dGVOYW1lKSkudmFsdWVfb3IoMCk7CkBAIC0yNjc3LDEyICsyNjg3LDEyIEBAIGludCBBY2Nl c3NpYmlsaXR5T2JqZWN0Ojpwb3NJblNldCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGdldEludGVn cmFsQXR0cmlidXRlKGFyaWFfcG9zaW5zZXRBdHRyKTsKIH0KLSAgICAKKwogU3RyaW5nIEFjY2Vz c2liaWxpdHlPYmplY3Q6OmlkZW50aWZpZXJBdHRyaWJ1dGUoKSBjb25zdAogewogICAgIHJldHVy biBnZXRBdHRyaWJ1dGUoaWRBdHRyKTsKIH0KLSAgICAKKwogdm9pZCBBY2Nlc3NpYmlsaXR5T2Jq ZWN0OjpjbGFzc0xpc3QoVmVjdG9yPFN0cmluZz4mIGNsYXNzTGlzdCkgY29uc3QKIHsKICAgICBO b2RlKiBub2RlID0gdGhpcy0+bm9kZSgpOwpAQCAtMzU5NCwxNyArMzYwNCwxNyBAQCB2b2lkIEFj Y2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFPd25zUmVmZXJlbmNpbmdFbGVtZW50cyhBY2Nlc3NpYmls aXR5Q2hpbGRyZW5WZWN0bwogCiB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnNldElzSWdub3Jl ZEZyb21QYXJlbnREYXRhRm9yQ2hpbGQoQVhDb3JlT2JqZWN0KiBjaGlsZCkKIHsKLSAgICBpZiAo IWNoaWxkKQorICAgIGlmICghaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4oY2hpbGQpKQogICAgICAg ICByZXR1cm47Ci0gICAgCisKICAgICBpZiAoY2hpbGQtPnBhcmVudE9iamVjdCgpICE9IHRoaXMp IHsKICAgICAgICAgY2hpbGQtPmNsZWFySXNJZ25vcmVkRnJvbVBhcmVudERhdGEoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KLSAgICAKKwogICAgIEFjY2Vzc2liaWxpdHlJc0lnbm9yZWRGcm9t UGFyZW50RGF0YSByZXN1bHQgPSBBY2Nlc3NpYmlsaXR5SXNJZ25vcmVkRnJvbVBhcmVudERhdGEo dGhpcyk7CiAgICAgaWYgKCFtX2lzSWdub3JlZEZyb21QYXJlbnREYXRhLmlzTnVsbCgpKSB7Ci0g ICAgICAgIHJlc3VsdC5pc0FYSGlkZGVuID0gKG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNB WEhpZGRlbiB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShjaGlsZC0+Z2V0QXR0cmli dXRlKGFyaWFfaGlkZGVuQXR0ciksICJ0cnVlIikpICYmICFjaGlsZC0+aXNGb2N1c2VkKCk7Cisg ICAgICAgIHJlc3VsdC5pc0FYSGlkZGVuID0gKG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNB WEhpZGRlbiB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShkb3duY2FzdDxBY2Nlc3Np YmlsaXR5T2JqZWN0PihjaGlsZCktPmdldEF0dHJpYnV0ZShhcmlhX2hpZGRlbkF0dHIpLCAidHJ1 ZSIpKSAmJiAhY2hpbGQtPmlzRm9jdXNlZCgpOwogICAgICAgICByZXN1bHQuaXNQcmVzZW50YXRp b25hbENoaWxkT2ZBcmlhUm9sZSA9IG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNQcmVzZW50 YXRpb25hbENoaWxkT2ZBcmlhUm9sZSB8fCBhcmlhUm9sZUhhc1ByZXNlbnRhdGlvbmFsQ2hpbGRy ZW4oKTsKICAgICAgICAgcmVzdWx0LmlzRGVzY2VuZGFudE9mQmFycmVuUGFyZW50ID0gbV9pc0ln bm9yZWRGcm9tUGFyZW50RGF0YS5pc0Rlc2NlbmRhbnRPZkJhcnJlblBhcmVudCB8fCAhY2FuSGF2 ZUNoaWxkcmVuKCk7CiAgICAgfSBlbHNlIHsKQEAgLTM2MTIsNyArMzYyMiw3IEBAIHZvaWQgQWNj ZXNzaWJpbGl0eU9iamVjdDo6c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGFGb3JDaGlsZChBWENv cmVPYmplY3QqIGNoaWxkCiAgICAgICAgIHJlc3VsdC5pc1ByZXNlbnRhdGlvbmFsQ2hpbGRPZkFy aWFSb2xlID0gY2hpbGQtPmlzUHJlc2VudGF0aW9uYWxDaGlsZE9mQXJpYVJvbGUoKTsKICAgICAg ICAgcmVzdWx0LmlzRGVzY2VuZGFudE9mQmFycmVuUGFyZW50ID0gY2hpbGQtPmlzRGVzY2VuZGFu dE9mQmFycmVuUGFyZW50KCk7CiAgICAgfQotICAgIAorCiAgICAgY2hpbGQtPnNldElzSWdub3Jl ZEZyb21QYXJlbnREYXRhKHJlc3VsdCk7CiB9CiAKQEAgLTM2NTMsNyArMzY2Myw3IEBAIHN0YXRp YyBib29sIGlzUmFkaW9CdXR0b25JbkRpZmZlcmVudEFkaG9jR3JvdXAoQVhDb3JlT2JqZWN0KiBh eE9iamVjdCwgQVhDb3JlT2JqCiAgICAgaWYgKCFyZWZlcmVuY2VPYmplY3QgfHwgIXJlZmVyZW5j ZU9iamVjdC0+aXNSYWRpb0J1dHRvbigpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHJl dHVybiBheE9iamVjdC0+ZWxlbWVudCgpLT5nZXROYW1lQXR0cmlidXRlKCkgIT0gcmVmZXJlbmNl T2JqZWN0LT5lbGVtZW50KCktPmdldE5hbWVBdHRyaWJ1dGUoKTsKKyAgICByZXR1cm4gYXhPYmpl Y3QtPmF0dHJpYnV0ZVZhbHVlKCJuYW1lIikgIT0gcmVmZXJlbmNlT2JqZWN0LT5hdHRyaWJ1dGVW YWx1ZSgibmFtZSIpOwogfQogCiBzdGF0aWMgYm9vbCBpc0FjY2Vzc2liaWxpdHlPYmplY3RTZWFy Y2hNYXRjaEF0SW5kZXgoQVhDb3JlT2JqZWN0KiBheE9iamVjdCwgQWNjZXNzaWJpbGl0eVNlYXJj aENyaXRlcmlhIGNvbnN0JiBjcml0ZXJpYSwgc2l6ZV90IGluZGV4KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCBhMzc3Mzhl OWEzOWFiNjEwOTA5YTU3ODU1YTgzZDIzNDExZjc0NmYwLi42MTk3ZWNkOGVlNmM0OWIwZjcxYmFj MGMwMDQ4YzY1ZWZhYjU1YTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApAQCAtNTE0LDggKzUxNCw5IEBAIHB1YmxpYzoKICAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmaXJzdEFub255bW91c0Jsb2NrQ2hpbGQoKSBjb25zdCBv dmVycmlkZTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBBY2Nlc3NpYmlsaXR5Um9sZSBh cmlhUm9sZVRvV2ViQ29yZVJvbGUoY29uc3QgU3RyaW5nJik7Ci0gICAgYm9vbCBoYXNBdHRyaWJ1 dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0IG92ZXJyaWRlOwotICAgIGNvbnN0IEF0b21T dHJpbmcmIGdldEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Qgb3ZlcnJpZGU7 CisgICAgdmlydHVhbCBib29sIGhhc0F0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29u c3Q7CisgICAgdmlydHVhbCBjb25zdCBBdG9tU3RyaW5nJiBnZXRBdHRyaWJ1dGUoY29uc3QgUXVh bGlmaWVkTmFtZSYpIGNvbnN0OworICAgIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBhdHRyaWJ1dGVW YWx1ZShjb25zdCBTdHJpbmcmKSBjb25zdCBvdmVycmlkZTsKICAgICBpbnQgZ2V0SW50ZWdyYWxB dHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0OwogICAgIGJvb2wgaGFzVGFnTmFt ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgU3RyaW5nIHRhZ05h bWUoKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKaW5kZXggYjQwMzUwNzFk ZmZlOTg3M2E0OTFmMTJmYTlhYTdmZDgzMTliZWMyZi4uNjIyZGE0YjVkY2EzMDZiNjExNjE3MDll ZjNlZjA2NDRhODdmNjQ0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTEyNTUsOCArMTI1 NSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQW5jZXN0b3JPZk9iamVjdChjb25zdCBBWENvcmVP YmplY3QqKSBjb25zdDsKICAgICB2aXJ0dWFsIEFYQ29yZU9iamVjdCogZmlyc3RBbm9ueW1vdXNC bG9ja0NoaWxkKCkgY29uc3QgPSAwOwogCi0gICAgdmlydHVhbCBib29sIGhhc0F0dHJpYnV0ZShj b25zdCBRdWFsaWZpZWROYW1lJikgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgY29uc3QgQXRvbVN0 cmluZyYgZ2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdCA9IDA7CisgICAg dmlydHVhbCBzdGQ6Om9wdGlvbmFsPFN0cmluZz4gYXR0cmlidXRlVmFsdWUoY29uc3QgU3RyaW5n JikgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBoYXNUYWdOYW1lKGNvbnN0IFF1YWxpZmll ZE5hbWUmKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBTdHJpbmcgdGFnTmFtZSgpIGNvbnN0ID0g MDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5VGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVRhYmxlQ2VsbC5jcHAKaW5kZXggM2Y2NTA4ZTA2MWMxODAwNmZlZTYxZTRlNGQxZDZiMzk3 NjI4ZDI3MS4uMjdjZjg2OWY0ZDU3NzFjOTg0YjJiZTNmNDYxMjZiOTg3N2I2MDAxNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxs LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJs ZUNlbGwuY3BwCkBAIC0yNTgsNyArMjU4LDggQEAgQVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5 Q2hpbGRyZW5WZWN0b3IgQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6Y29sdW1uSGVhZGVycygKICAg ICAgICAgaWYgKCF0YWJsZUNlbGwgfHwgdGFibGVDZWxsID09IHRoaXMgfHwgaGVhZGVycy5jb250 YWlucyh0YWJsZUNlbGwpKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgY29uc3Qg QXRvbVN0cmluZyYgc2NvcGUgPSB0YWJsZUNlbGwtPmdldEF0dHJpYnV0ZShzY29wZUF0dHIpOwor ICAgICAgICBBU1NFUlQoaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4odGFibGVDZWxsKSk7CisgICAg ICAgIGNvbnN0IEF0b21TdHJpbmcmIHNjb3BlID0gZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVj dD4odGFibGVDZWxsKS0+Z2V0QXR0cmlidXRlKHNjb3BlQXR0cik7CiAgICAgICAgIGlmIChzY29w ZSA9PSAiY29sZ3JvdXAiICYmIGlzVGFibGVDZWxsSW5TYW1lQ29sR3JvdXAodGFibGVDZWxsKSkK ICAgICAgICAgICAgIGhlYWRlcnMuYXBwZW5kKHRhYmxlQ2VsbCk7CiAgICAgICAgIGVsc2UgaWYg KHRhYmxlQ2VsbC0+aXNDb2x1bW5IZWFkZXJDZWxsKCkpCkBAIC0yODMsNyArMjg0LDcgQEAgQVhD b3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgQWNjZXNzaWJpbGl0eVRhYmxl Q2VsbDo6cm93SGVhZGVycygpCiAgICAgICAgIGlmICghdGFibGVDZWxsIHx8IHRhYmxlQ2VsbCA9 PSB0aGlzIHx8IGhlYWRlcnMuY29udGFpbnModGFibGVDZWxsKSkKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICAKLSAgICAgICAgY29uc3QgQXRvbVN0cmluZyYgc2NvcGUgPSB0YWJsZUNl bGwtPmdldEF0dHJpYnV0ZShzY29wZUF0dHIpOworICAgICAgICBjb25zdCBBdG9tU3RyaW5nJiBz Y29wZSA9IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlPYmplY3Q+KHRhYmxlQ2VsbCktPmdldEF0dHJp YnV0ZShzY29wZUF0dHIpOwogICAgICAgICBpZiAoc2NvcGUgPT0gInJvd2dyb3VwIiAmJiBpc1Rh YmxlQ2VsbEluU2FtZVJvd0dyb3VwKHRhYmxlQ2VsbCkpCiAgICAgICAgICAgICBoZWFkZXJzLmFw cGVuZCh0YWJsZUNlbGwpOwogICAgICAgICBlbHNlIGlmICh0YWJsZUNlbGwtPmlzUm93SGVhZGVy Q2VsbCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2Vi QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQppbmRleCA0MGJi MTA3ZDU5NjdjMTQxYzVmMmJjNGEzMzMwYzVlMGQzYzhkZDA2Li5lMjdlZDU5NjkyOTUxNDNjMjll NzJhMDYxMGZhZjdkOGRmMjQxYjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl cklPUy5tbQpAQCAtMjc3Myw4ICsyNzczLDcgQEAgc3RhdGljIFJlbmRlck9iamVjdCogcmVuZGVy ZXJGb3JWaWV3KFdBS1ZpZXcqIHZpZXcpCiB7CiAgICAgaWYgKCFbc2VsZiBfcHJlcGFyZUFjY2Vz c2liaWxpdHlDYWxsXSkKICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAKLSAgICByZXR1cm4gc2Vs Zi5heEJhY2tpbmdPYmplY3QtPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OmlkQXR0cik7CisgICAg cmV0dXJuIHNlbGYuYXhCYWNraW5nT2JqZWN0LT5pZGVudGlmaWVyQXR0cmlidXRlKCk7CiB9CiAK IC0gKE5TQXJyYXk8TlNTdHJpbmcgKj4gKilhY2Nlc3NpYmlsaXR5U3BlZWNoSGludApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkT2JqZWN0LmNwcAppbmRleCAwNjYzYjgwMTU5OGU4NTAzMWEyMGI2ZDg2ZGJjMzAx OTYxYTczOWI1Li4zYzNlY2Y1ZmIyN2JlNmJlYmNjMWIyYTliNTU2OTI5Zjg3NjQ1MDNhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAtNjgsNiArNjgsOCBAQCB2b2lkIEFYSXNvbGF0 ZWRPYmplY3Q6OmluaXQoKQogCiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRy aWJ1dGVEYXRhKEFYQ29yZU9iamVjdCYgb2JqZWN0LCBib29sIGlzUm9vdCkKIHsKKyAgICBBU1NF UlQoaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4ob2JqZWN0KSk7CisKICAgICBzZXRQcm9wZXJ0eShB WFByb3BlcnR5TmFtZTo6QVJJQUxhbmRtYXJrUm9sZURlc2NyaXB0aW9uLCBvYmplY3QuYXJpYUxh bmRtYXJrUm9sZURlc2NyaXB0aW9uKCkuaXNvbGF0ZWRDb3B5KCkpOwogICAgIHNldFByb3BlcnR5 KEFYUHJvcGVydHlOYW1lOjpBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24sIG9iamVjdC5hY2Nlc3Np YmlsaXR5RGVzY3JpcHRpb24oKS5pc29sYXRlZENvcHkoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQ cm9wZXJ0eU5hbWU6OkJvdW5kaW5nQm94UmVjdCwgb2JqZWN0LmJvdW5kaW5nQm94UmVjdCgpKTsK QEAgLTI4Miw2ICsyODQsMTEgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0 cmlidXRlRGF0YShBWENvcmVPYmplY3QmIG9iamVjdCwgYm9vbCBpc1Jvb3QKICAgICBpZiAob2Jq ZWN0LmlzVGV4dENvbnRyb2woKSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OlRleHRMZW5ndGgsIG9iamVjdC50ZXh0TGVuZ3RoKCkpOwogCisgICAgaWYgKG9iamVjdC5pc1Jh ZGlvQnV0dG9uKCkpIHsKKyAgICAgICAgaWYgKGF1dG8gbmFtZUF0dHJpYnV0ZSA9IG9iamVjdC5h dHRyaWJ1dGVWYWx1ZSgibmFtZSIpKQorICAgICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWU6Ok5hbWVBdHRyaWJ1dGUsIG5hbWVBdHRyaWJ1dGUtPmlzb2xhdGVkQ29weSgpKTsKKyAg ICB9CisKICAgICBpZiAob2JqZWN0LmNhbkhhdmVTZWxlY3RlZENoaWxkcmVuKCkpIHsKICAgICAg ICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHNlbGVjdGVkQ2hpbGRyZW47CiAgICAgICAg IG9iamVjdC5zZWxlY3RlZENoaWxkcmVuKHNlbGVjdGVkQ2hpbGRyZW4pOwpAQCAtMjE2NCwxNiAr MjE3MSwxMyBAQCBBWENvcmVPYmplY3QqIEFYSXNvbGF0ZWRPYmplY3Q6OmZpcnN0QW5vbnltb3Vz QmxvY2tDaGlsZCgpIGNvbnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLWJvb2wgQVhJc29s YXRlZE9iamVjdDo6aGFzQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdAotewot ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBmYWxzZTsKLX0KLQotY29uc3Qg QXRvbVN0cmluZyYgQVhJc29sYXRlZE9iamVjdDo6Z2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmll ZE5hbWUmKSBjb25zdAorc3RkOjpvcHRpb25hbDxTdHJpbmc+IEFYSXNvbGF0ZWRPYmplY3Q6OmF0 dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmluZyYgYXR0cmlidXRlTmFtZSkgY29uc3QKIHsKLSAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gbnVsbEF0b20oKTsKKyAgICBpZiAoYXR0 cmlidXRlTmFtZSA9PSAibmFtZSIpIHsKKyAgICAgICAgaWYgKG1fcHJvcGVydHlNYXAuY29udGFp bnMoQVhQcm9wZXJ0eU5hbWU6Ok5hbWVBdHRyaWJ1dGUpKQorICAgICAgICAgICAgcmV0dXJuIHN0 cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpOYW1lQXR0cmlidXRlKTsKKyAgICB9 CisgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIH0KIAogYm9vbCBBWElzb2xhdGVkT2JqZWN0Ojpo YXNUYWdOYW1lKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVj dC5oCmluZGV4IGQ3Y2E3MDc1NWQ5ZjhiYmQ5YmNhN2UxMjhlMDgwZDM0ZmQ2NTdhNTQuLjYyNWY2 NTVmZGVhNDJjMGY5MzkxOTA4NWIzNmIxM2M0Mjg2NzJhOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmgKQEAgLTYxNiw4ICs2MTYsNyBAQCBwcml2YXRlOgogICAgIEFYQ29yZU9iamVjdCogYWN0 aXZlRGVzY2VuZGFudCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgaGFuZGxlQWN0aXZlRGVz Y2VuZGFudENoYW5nZWQoKSBvdmVycmlkZTsKICAgICBBWENvcmVPYmplY3QqIGZpcnN0QW5vbnlt b3VzQmxvY2tDaGlsZCgpIGNvbnN0IG92ZXJyaWRlOwotICAgIGJvb2wgaGFzQXR0cmlidXRlKGNv bnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdCBvdmVycmlkZTsKLSAgICBjb25zdCBBdG9tU3RyaW5n JiBnZXRBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0IG92ZXJyaWRlOworICAg IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBhdHRyaWJ1dGVWYWx1ZShjb25zdCBTdHJpbmcmKSBjb25z dCBvdmVycmlkZTsKICAgICBib29sIGhhc1RhZ05hbWUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNv bnN0IG92ZXJyaWRlOwogICAgIFN0cmluZyBzdHJpbmdWYWx1ZUZvck1TQUEoKSBjb25zdCBvdmVy cmlkZTsKICAgICBTdHJpbmcgc3RyaW5nUm9sZUZvck1TQUEoKSBjb25zdCBvdmVycmlkZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5oCmluZGV4IGNmNDI4NjIzOWY2NGI5NDRlMTdlNGNlOGYzNjgwOGQzOWYx MTc0MDIuLjY1ZmU2ZDUwM2Q1ODk4NmU2MmUzZGEwZGEyOGE0OTEwOGFjYzIzODUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZFRyZWUuaApAQCAtMjUxLDYgKzI1MSw3IEBAIGVudW0gY2xhc3MgQVhQcm9wZXJ0eU5h bWUgOiB1aW50MTZfdCB7CiAgICAgTWF0aFN1cGVyc2NyaXB0T2JqZWN0LAogICAgIE1heFZhbHVl Rm9yUmFuZ2UsCiAgICAgTWluVmFsdWVGb3JSYW5nZSwKKyAgICBOYW1lQXR0cmlidXRlLAogICAg IE5leHRTaWJsaW5nLAogICAgIE9yaWVudGF0aW9uLAogICAgIE91dGVySFRNTCwK 439353 2021-09-27 08:05:13 -0700 2021-09-27 09:03:27 -0700 Patch bug-230754-20210927110511.patch text/plain 13443 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyOTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzM2ZWRjODc4ODAyZjE5 Mzk2ZmVlNzc3NzM5ODAzYmFkZGU5ZjYwMi4uNmU0ZDczMjMyOWZhZWEwZjMzYzQzMzhlZmJkMzQ5 OTI5Yjk2MTVhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTA5LTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGNy YXNoIGluIGFjY2Vzc2liaWxpdHkvTWFjL3NlYXJjaC1wcmVkaWNhdGUtZm9yLWFkaG9jLXJhZGlv LWdyb3Vwcy5odG1sIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDc1NAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODM0OTg1OTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCisKKyAg ICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9NYWMvc2VhcmNoLXByZWRpY2F0ZS1mb3ItYWRob2Mt cmFkaW8tZ3JvdXBzLmh0bWwKKworICAgICAgICBUaGUgY3Jhc2ggd2FzIGNhdXNlZCBieSB0aGUg Y2FsbCBpbiBpc1JhZGlvQnV0dG9uSW5EaWZmZXJlbnRBZGhvY0dyb3VwCisgICAgICAgIHRvIGF4 T2JqZWN0LT5lbGVtZW50KCktPmdldE5hbWVBdHRyaWJ1dGUoKSwgc2luY2UgZWxlbWVudCgpIHNo b3VsZCBub3QKKyAgICAgICAgYmUgY2FsbGVkIG9mZiBvZiB0aGUgbWFpbiB0aHJlYWQuIFRoYXQg YnJpbnMgdXAgdGhlIHF1ZXN0aW9uIG9mIGhvdyB0bworICAgICAgICBnZXQgZWxlbWVudCBhdHRy aWJ1dGVzIG9uIHRoZSBBWCB0aHJlYWQuIEZvciB0aGF0IHB1cnBvc2UsIEkgYWRkZWQgdGhlCisg ICAgICAgIGF0dHJpYnV0ZVZhbHVlIG1ldGhvZCB0byB0aGUgQVhDb3JlT2JqZWN0IGludGVyZmFj ZSwgYW5kIHJlbW92ZWQgdGhlCisgICAgICAgIHJlbGF0ZWQgbWV0aG9kcyB0aGF0IHRha2UgUXVh bGlmaWVkTmFtZXMgYW5kIHJldHVybiBhbiBBdG9tU3RyaW5nLCBzaW5jZQorICAgICAgICB0aGV5 IGNhbm5vdCBiZSB1c2VkIG9mZiBvZiB0aGUgbWFpbiB0aHJlYWQuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdDo6YXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGFGb3JDaGls ZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Ojppc1JhZGlvQnV0dG9uSW5EaWZm ZXJlbnRBZGhvY0dyb3VwKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRl cmZhY2UuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6Y29sdW1uSGVh ZGVycyk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjpyb3dIZWFk ZXJzKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlcklPUy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIg YWNjZXNzaWJpbGl0eUlkZW50aWZpZXJdKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0 ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkFY SXNvbGF0ZWRPYmplY3Q6OmF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkFYSXNvbGF0ZWRPYmplY3Q6Omhhc0F0dHJpYnV0ZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpnZXRBdHRyaWJ1dGUgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5o OgorCiAyMDIxLTA5LTIzICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgQVhEUlRFbGVtZW50SWRBdHRyaWJ1dGUgZnJvbSB0aGUgQVggb2Jq ZWN0IHBsYXRmb3JtIHdyYXBwZXIgaW50ZXJmYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggNjgxOTM2ZjU4ZjBm OWM4YWQ0M2E0Mjg0MWJhYzJhMmYxY2YxMjFjOS4uOTFmNzdiZWJjOTRkNDIxN2M0ZjNjNWIxMjJh YTBlYzY2NmE5Zjc5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0xOTU1LDYgKzE5NTUsMTYgQEAgY29uc3QgQXRv bVN0cmluZyYgQWNjZXNzaWJpbGl0eU9iamVjdDo6Z2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmll ZE5hbWUmIGF0dHJpYnUKICAgICByZXR1cm4gbnVsbEF0b20oKTsKIH0KIAorc3RkOjpvcHRpb25h bDxTdHJpbmc+IEFjY2Vzc2liaWxpdHlPYmplY3Q6OmF0dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmlu ZyYgYXR0cmlidXRlTmFtZSkgY29uc3QKK3sKKyAgICBpZiAoYXR0cmlidXRlTmFtZSA9PSAibmFt ZSIpIHsKKyAgICAgICAgYXV0byB2YWx1ZSA9IGdldEF0dHJpYnV0ZShuYW1lQXR0cik7CisgICAg ICAgIGlmICghdmFsdWUuaXNOdWxsKCkpCisgICAgICAgICAgICByZXR1cm4gdmFsdWU7CisgICAg fQorICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Cit9CisKIGludCBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpnZXRJbnRlZ3JhbEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyaWJ1dGVOYW1l KSBjb25zdAogewogICAgIHJldHVybiBwYXJzZUhUTUxJbnRlZ2VyKGdldEF0dHJpYnV0ZShhdHRy aWJ1dGVOYW1lKSkudmFsdWVfb3IoMCk7CkBAIC0yNjc3LDEyICsyNjg3LDEyIEBAIGludCBBY2Nl c3NpYmlsaXR5T2JqZWN0Ojpwb3NJblNldCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGdldEludGVn cmFsQXR0cmlidXRlKGFyaWFfcG9zaW5zZXRBdHRyKTsKIH0KLSAgICAKKwogU3RyaW5nIEFjY2Vz c2liaWxpdHlPYmplY3Q6OmlkZW50aWZpZXJBdHRyaWJ1dGUoKSBjb25zdAogewogICAgIHJldHVy biBnZXRBdHRyaWJ1dGUoaWRBdHRyKTsKIH0KLSAgICAKKwogdm9pZCBBY2Nlc3NpYmlsaXR5T2Jq ZWN0OjpjbGFzc0xpc3QoVmVjdG9yPFN0cmluZz4mIGNsYXNzTGlzdCkgY29uc3QKIHsKICAgICBO b2RlKiBub2RlID0gdGhpcy0+bm9kZSgpOwpAQCAtMzU5NCwxNyArMzYwNCwxNyBAQCB2b2lkIEFj Y2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFPd25zUmVmZXJlbmNpbmdFbGVtZW50cyhBY2Nlc3NpYmls aXR5Q2hpbGRyZW5WZWN0bwogCiB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnNldElzSWdub3Jl ZEZyb21QYXJlbnREYXRhRm9yQ2hpbGQoQVhDb3JlT2JqZWN0KiBjaGlsZCkKIHsKLSAgICBpZiAo IWNoaWxkKQorICAgIGlmICghaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4oY2hpbGQpKQogICAgICAg ICByZXR1cm47Ci0gICAgCisKICAgICBpZiAoY2hpbGQtPnBhcmVudE9iamVjdCgpICE9IHRoaXMp IHsKICAgICAgICAgY2hpbGQtPmNsZWFySXNJZ25vcmVkRnJvbVBhcmVudERhdGEoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KLSAgICAKKwogICAgIEFjY2Vzc2liaWxpdHlJc0lnbm9yZWRGcm9t UGFyZW50RGF0YSByZXN1bHQgPSBBY2Nlc3NpYmlsaXR5SXNJZ25vcmVkRnJvbVBhcmVudERhdGEo dGhpcyk7CiAgICAgaWYgKCFtX2lzSWdub3JlZEZyb21QYXJlbnREYXRhLmlzTnVsbCgpKSB7Ci0g ICAgICAgIHJlc3VsdC5pc0FYSGlkZGVuID0gKG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNB WEhpZGRlbiB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShjaGlsZC0+Z2V0QXR0cmli dXRlKGFyaWFfaGlkZGVuQXR0ciksICJ0cnVlIikpICYmICFjaGlsZC0+aXNGb2N1c2VkKCk7Cisg ICAgICAgIHJlc3VsdC5pc0FYSGlkZGVuID0gKG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNB WEhpZGRlbiB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShkb3duY2FzdDxBY2Nlc3Np YmlsaXR5T2JqZWN0PihjaGlsZCktPmdldEF0dHJpYnV0ZShhcmlhX2hpZGRlbkF0dHIpLCAidHJ1 ZSIpKSAmJiAhY2hpbGQtPmlzRm9jdXNlZCgpOwogICAgICAgICByZXN1bHQuaXNQcmVzZW50YXRp b25hbENoaWxkT2ZBcmlhUm9sZSA9IG1faXNJZ25vcmVkRnJvbVBhcmVudERhdGEuaXNQcmVzZW50 YXRpb25hbENoaWxkT2ZBcmlhUm9sZSB8fCBhcmlhUm9sZUhhc1ByZXNlbnRhdGlvbmFsQ2hpbGRy ZW4oKTsKICAgICAgICAgcmVzdWx0LmlzRGVzY2VuZGFudE9mQmFycmVuUGFyZW50ID0gbV9pc0ln bm9yZWRGcm9tUGFyZW50RGF0YS5pc0Rlc2NlbmRhbnRPZkJhcnJlblBhcmVudCB8fCAhY2FuSGF2 ZUNoaWxkcmVuKCk7CiAgICAgfSBlbHNlIHsKQEAgLTM2MTIsNyArMzYyMiw3IEBAIHZvaWQgQWNj ZXNzaWJpbGl0eU9iamVjdDo6c2V0SXNJZ25vcmVkRnJvbVBhcmVudERhdGFGb3JDaGlsZChBWENv cmVPYmplY3QqIGNoaWxkCiAgICAgICAgIHJlc3VsdC5pc1ByZXNlbnRhdGlvbmFsQ2hpbGRPZkFy aWFSb2xlID0gY2hpbGQtPmlzUHJlc2VudGF0aW9uYWxDaGlsZE9mQXJpYVJvbGUoKTsKICAgICAg ICAgcmVzdWx0LmlzRGVzY2VuZGFudE9mQmFycmVuUGFyZW50ID0gY2hpbGQtPmlzRGVzY2VuZGFu dE9mQmFycmVuUGFyZW50KCk7CiAgICAgfQotICAgIAorCiAgICAgY2hpbGQtPnNldElzSWdub3Jl ZEZyb21QYXJlbnREYXRhKHJlc3VsdCk7CiB9CiAKQEAgLTM2NTMsNyArMzY2Myw3IEBAIHN0YXRp YyBib29sIGlzUmFkaW9CdXR0b25JbkRpZmZlcmVudEFkaG9jR3JvdXAoQVhDb3JlT2JqZWN0KiBh eE9iamVjdCwgQVhDb3JlT2JqCiAgICAgaWYgKCFyZWZlcmVuY2VPYmplY3QgfHwgIXJlZmVyZW5j ZU9iamVjdC0+aXNSYWRpb0J1dHRvbigpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHJl dHVybiBheE9iamVjdC0+ZWxlbWVudCgpLT5nZXROYW1lQXR0cmlidXRlKCkgIT0gcmVmZXJlbmNl T2JqZWN0LT5lbGVtZW50KCktPmdldE5hbWVBdHRyaWJ1dGUoKTsKKyAgICByZXR1cm4gYXhPYmpl Y3QtPmF0dHJpYnV0ZVZhbHVlKCJuYW1lIikgIT0gcmVmZXJlbmNlT2JqZWN0LT5hdHRyaWJ1dGVW YWx1ZSgibmFtZSIpOwogfQogCiBzdGF0aWMgYm9vbCBpc0FjY2Vzc2liaWxpdHlPYmplY3RTZWFy Y2hNYXRjaEF0SW5kZXgoQVhDb3JlT2JqZWN0KiBheE9iamVjdCwgQWNjZXNzaWJpbGl0eVNlYXJj aENyaXRlcmlhIGNvbnN0JiBjcml0ZXJpYSwgc2l6ZV90IGluZGV4KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCBhMzc3Mzhl OWEzOWFiNjEwOTA5YTU3ODU1YTgzZDIzNDExZjc0NmYwLi42MTk3ZWNkOGVlNmM0OWIwZjcxYmFj MGMwMDQ4YzY1ZWZhYjU1YTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApAQCAtNTE0LDggKzUxNCw5IEBAIHB1YmxpYzoKICAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmaXJzdEFub255bW91c0Jsb2NrQ2hpbGQoKSBjb25zdCBv dmVycmlkZTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBBY2Nlc3NpYmlsaXR5Um9sZSBh cmlhUm9sZVRvV2ViQ29yZVJvbGUoY29uc3QgU3RyaW5nJik7Ci0gICAgYm9vbCBoYXNBdHRyaWJ1 dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0IG92ZXJyaWRlOwotICAgIGNvbnN0IEF0b21T dHJpbmcmIGdldEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Qgb3ZlcnJpZGU7 CisgICAgdmlydHVhbCBib29sIGhhc0F0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29u c3Q7CisgICAgdmlydHVhbCBjb25zdCBBdG9tU3RyaW5nJiBnZXRBdHRyaWJ1dGUoY29uc3QgUXVh bGlmaWVkTmFtZSYpIGNvbnN0OworICAgIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBhdHRyaWJ1dGVW YWx1ZShjb25zdCBTdHJpbmcmKSBjb25zdCBvdmVycmlkZTsKICAgICBpbnQgZ2V0SW50ZWdyYWxB dHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0OwogICAgIGJvb2wgaGFzVGFnTmFt ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgU3RyaW5nIHRhZ05h bWUoKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKaW5kZXggYjQwMzUwNzFk ZmZlOTg3M2E0OTFmMTJmYTlhYTdmZDgzMTliZWMyZi4uNjIyZGE0YjVkY2EzMDZiNjExNjE3MDll ZjNlZjA2NDRhODdmNjQ0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTEyNTUsOCArMTI1 NSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQW5jZXN0b3JPZk9iamVjdChjb25zdCBBWENvcmVP YmplY3QqKSBjb25zdDsKICAgICB2aXJ0dWFsIEFYQ29yZU9iamVjdCogZmlyc3RBbm9ueW1vdXNC bG9ja0NoaWxkKCkgY29uc3QgPSAwOwogCi0gICAgdmlydHVhbCBib29sIGhhc0F0dHJpYnV0ZShj b25zdCBRdWFsaWZpZWROYW1lJikgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgY29uc3QgQXRvbVN0 cmluZyYgZ2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdCA9IDA7CisgICAg dmlydHVhbCBzdGQ6Om9wdGlvbmFsPFN0cmluZz4gYXR0cmlidXRlVmFsdWUoY29uc3QgU3RyaW5n JikgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBoYXNUYWdOYW1lKGNvbnN0IFF1YWxpZmll ZE5hbWUmKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBTdHJpbmcgdGFnTmFtZSgpIGNvbnN0ID0g MDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5VGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVRhYmxlQ2VsbC5jcHAKaW5kZXggM2Y2NTA4ZTA2MWMxODAwNmZlZTYxZTRlNGQxZDZiMzk3 NjI4ZDI3MS4uMjdjZjg2OWY0ZDU3NzFjOTg0YjJiZTNmNDYxMjZiOTg3N2I2MDAxNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxs LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJs ZUNlbGwuY3BwCkBAIC0yNTgsNyArMjU4LDggQEAgQVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5 Q2hpbGRyZW5WZWN0b3IgQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6Y29sdW1uSGVhZGVycygKICAg ICAgICAgaWYgKCF0YWJsZUNlbGwgfHwgdGFibGVDZWxsID09IHRoaXMgfHwgaGVhZGVycy5jb250 YWlucyh0YWJsZUNlbGwpKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgY29uc3Qg QXRvbVN0cmluZyYgc2NvcGUgPSB0YWJsZUNlbGwtPmdldEF0dHJpYnV0ZShzY29wZUF0dHIpOwor ICAgICAgICBBU1NFUlQoaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4odGFibGVDZWxsKSk7CisgICAg ICAgIGNvbnN0IEF0b21TdHJpbmcmIHNjb3BlID0gZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVj dD4odGFibGVDZWxsKS0+Z2V0QXR0cmlidXRlKHNjb3BlQXR0cik7CiAgICAgICAgIGlmIChzY29w ZSA9PSAiY29sZ3JvdXAiICYmIGlzVGFibGVDZWxsSW5TYW1lQ29sR3JvdXAodGFibGVDZWxsKSkK ICAgICAgICAgICAgIGhlYWRlcnMuYXBwZW5kKHRhYmxlQ2VsbCk7CiAgICAgICAgIGVsc2UgaWYg KHRhYmxlQ2VsbC0+aXNDb2x1bW5IZWFkZXJDZWxsKCkpCkBAIC0yODMsNyArMjg0LDcgQEAgQVhD b3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgQWNjZXNzaWJpbGl0eVRhYmxl Q2VsbDo6cm93SGVhZGVycygpCiAgICAgICAgIGlmICghdGFibGVDZWxsIHx8IHRhYmxlQ2VsbCA9 PSB0aGlzIHx8IGhlYWRlcnMuY29udGFpbnModGFibGVDZWxsKSkKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICAKLSAgICAgICAgY29uc3QgQXRvbVN0cmluZyYgc2NvcGUgPSB0YWJsZUNl bGwtPmdldEF0dHJpYnV0ZShzY29wZUF0dHIpOworICAgICAgICBjb25zdCBBdG9tU3RyaW5nJiBz Y29wZSA9IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlPYmplY3Q+KHRhYmxlQ2VsbCktPmdldEF0dHJp YnV0ZShzY29wZUF0dHIpOwogICAgICAgICBpZiAoc2NvcGUgPT0gInJvd2dyb3VwIiAmJiBpc1Rh YmxlQ2VsbEluU2FtZVJvd0dyb3VwKHRhYmxlQ2VsbCkpCiAgICAgICAgICAgICBoZWFkZXJzLmFw cGVuZCh0YWJsZUNlbGwpOwogICAgICAgICBlbHNlIGlmICh0YWJsZUNlbGwtPmlzUm93SGVhZGVy Q2VsbCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2Vi QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQppbmRleCA0MGJi MTA3ZDU5NjdjMTQxYzVmMmJjNGEzMzMwYzVlMGQzYzhkZDA2Li5lMjdlZDU5NjkyOTUxNDNjMjll NzJhMDYxMGZhZjdkOGRmMjQxYjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl cklPUy5tbQpAQCAtMjc3Myw4ICsyNzczLDcgQEAgc3RhdGljIFJlbmRlck9iamVjdCogcmVuZGVy ZXJGb3JWaWV3KFdBS1ZpZXcqIHZpZXcpCiB7CiAgICAgaWYgKCFbc2VsZiBfcHJlcGFyZUFjY2Vz c2liaWxpdHlDYWxsXSkKICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAKLSAgICByZXR1cm4gc2Vs Zi5heEJhY2tpbmdPYmplY3QtPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OmlkQXR0cik7CisgICAg cmV0dXJuIHNlbGYuYXhCYWNraW5nT2JqZWN0LT5pZGVudGlmaWVyQXR0cmlidXRlKCk7CiB9CiAK IC0gKE5TQXJyYXk8TlNTdHJpbmcgKj4gKilhY2Nlc3NpYmlsaXR5U3BlZWNoSGludApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkT2JqZWN0LmNwcAppbmRleCAwNjYzYjgwMTU5OGU4NTAzMWEyMGI2ZDg2ZGJjMzAx OTYxYTczOWI1Li4zYzNlY2Y1ZmIyN2JlNmJlYmNjMWIyYTliNTU2OTI5Zjg3NjQ1MDNhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAtNjgsNiArNjgsOCBAQCB2b2lkIEFYSXNvbGF0 ZWRPYmplY3Q6OmluaXQoKQogCiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRy aWJ1dGVEYXRhKEFYQ29yZU9iamVjdCYgb2JqZWN0LCBib29sIGlzUm9vdCkKIHsKKyAgICBBU1NF UlQoaXM8QWNjZXNzaWJpbGl0eU9iamVjdD4ob2JqZWN0KSk7CisKICAgICBzZXRQcm9wZXJ0eShB WFByb3BlcnR5TmFtZTo6QVJJQUxhbmRtYXJrUm9sZURlc2NyaXB0aW9uLCBvYmplY3QuYXJpYUxh bmRtYXJrUm9sZURlc2NyaXB0aW9uKCkuaXNvbGF0ZWRDb3B5KCkpOwogICAgIHNldFByb3BlcnR5 KEFYUHJvcGVydHlOYW1lOjpBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24sIG9iamVjdC5hY2Nlc3Np YmlsaXR5RGVzY3JpcHRpb24oKS5pc29sYXRlZENvcHkoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQ cm9wZXJ0eU5hbWU6OkJvdW5kaW5nQm94UmVjdCwgb2JqZWN0LmJvdW5kaW5nQm94UmVjdCgpKTsK QEAgLTI4Miw2ICsyODQsMTEgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0 cmlidXRlRGF0YShBWENvcmVPYmplY3QmIG9iamVjdCwgYm9vbCBpc1Jvb3QKICAgICBpZiAob2Jq ZWN0LmlzVGV4dENvbnRyb2woKSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OlRleHRMZW5ndGgsIG9iamVjdC50ZXh0TGVuZ3RoKCkpOwogCisgICAgaWYgKG9iamVjdC5pc1Jh ZGlvQnV0dG9uKCkpIHsKKyAgICAgICAgaWYgKGF1dG8gbmFtZUF0dHJpYnV0ZSA9IG9iamVjdC5h dHRyaWJ1dGVWYWx1ZSgibmFtZSIpKQorICAgICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWU6Ok5hbWVBdHRyaWJ1dGUsIG5hbWVBdHRyaWJ1dGUtPmlzb2xhdGVkQ29weSgpKTsKKyAg ICB9CisKICAgICBpZiAob2JqZWN0LmNhbkhhdmVTZWxlY3RlZENoaWxkcmVuKCkpIHsKICAgICAg ICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHNlbGVjdGVkQ2hpbGRyZW47CiAgICAgICAg IG9iamVjdC5zZWxlY3RlZENoaWxkcmVuKHNlbGVjdGVkQ2hpbGRyZW4pOwpAQCAtMjE2NCwxNiAr MjE3MSwxMyBAQCBBWENvcmVPYmplY3QqIEFYSXNvbGF0ZWRPYmplY3Q6OmZpcnN0QW5vbnltb3Vz QmxvY2tDaGlsZCgpIGNvbnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLWJvb2wgQVhJc29s YXRlZE9iamVjdDo6aGFzQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdAotewot ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBmYWxzZTsKLX0KLQotY29uc3Qg QXRvbVN0cmluZyYgQVhJc29sYXRlZE9iamVjdDo6Z2V0QXR0cmlidXRlKGNvbnN0IFF1YWxpZmll ZE5hbWUmKSBjb25zdAorc3RkOjpvcHRpb25hbDxTdHJpbmc+IEFYSXNvbGF0ZWRPYmplY3Q6OmF0 dHJpYnV0ZVZhbHVlKGNvbnN0IFN0cmluZyYgYXR0cmlidXRlTmFtZSkgY29uc3QKIHsKLSAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gbnVsbEF0b20oKTsKKyAgICBpZiAoYXR0 cmlidXRlTmFtZSA9PSAibmFtZSIpIHsKKyAgICAgICAgaWYgKG1fcHJvcGVydHlNYXAuY29udGFp bnMoQVhQcm9wZXJ0eU5hbWU6Ok5hbWVBdHRyaWJ1dGUpKQorICAgICAgICAgICAgcmV0dXJuIHN0 cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpOYW1lQXR0cmlidXRlKTsKKyAgICB9 CisgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIH0KIAogYm9vbCBBWElzb2xhdGVkT2JqZWN0Ojpo YXNUYWdOYW1lKGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVj dC5oCmluZGV4IGQ3Y2E3MDc1NWQ5ZjhiYmQ5YmNhN2UxMjhlMDgwZDM0ZmQ2NTdhNTQuLjYyNWY2 NTVmZGVhNDJjMGY5MzkxOTA4NWIzNmIxM2M0Mjg2NzJhOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmgKQEAgLTYxNiw4ICs2MTYsNyBAQCBwcml2YXRlOgogICAgIEFYQ29yZU9iamVjdCogYWN0 aXZlRGVzY2VuZGFudCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgaGFuZGxlQWN0aXZlRGVz Y2VuZGFudENoYW5nZWQoKSBvdmVycmlkZTsKICAgICBBWENvcmVPYmplY3QqIGZpcnN0QW5vbnlt b3VzQmxvY2tDaGlsZCgpIGNvbnN0IG92ZXJyaWRlOwotICAgIGJvb2wgaGFzQXR0cmlidXRlKGNv bnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdCBvdmVycmlkZTsKLSAgICBjb25zdCBBdG9tU3RyaW5n JiBnZXRBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0IG92ZXJyaWRlOworICAg IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBhdHRyaWJ1dGVWYWx1ZShjb25zdCBTdHJpbmcmKSBjb25z dCBvdmVycmlkZTsKICAgICBib29sIGhhc1RhZ05hbWUoY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNv bnN0IG92ZXJyaWRlOwogICAgIFN0cmluZyBzdHJpbmdWYWx1ZUZvck1TQUEoKSBjb25zdCBvdmVy cmlkZTsKICAgICBTdHJpbmcgc3RyaW5nUm9sZUZvck1TQUEoKSBjb25zdCBvdmVycmlkZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5oCmluZGV4IGNmNDI4NjIzOWY2NGI5NDRlMTdlNGNlOGYzNjgwOGQzOWYx MTc0MDIuLjY1ZmU2ZDUwM2Q1ODk4NmU2MmUzZGEwZGEyOGE0OTEwOGFjYzIzODUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZFRyZWUuaApAQCAtMjUxLDYgKzI1MSw3IEBAIGVudW0gY2xhc3MgQVhQcm9wZXJ0eU5h bWUgOiB1aW50MTZfdCB7CiAgICAgTWF0aFN1cGVyc2NyaXB0T2JqZWN0LAogICAgIE1heFZhbHVl Rm9yUmFuZ2UsCiAgICAgTWluVmFsdWVGb3JSYW5nZSwKKyAgICBOYW1lQXR0cmlidXRlLAogICAg IE5leHRTaWJsaW5nLAogICAgIE9yaWVudGF0aW9uLAogICAgIE91dGVySFRNTCwK