226534 2021-06-02 07:37:54 -0700 iOS - VoiceOver reads the programmatically associated label instead of the accessible name provided via the aria-label or aria-labelledby attribute 2021-06-10 12:09:01 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1765976 0 andresg_22 2021-06-02 07:37:54 -0700 iOS - VoiceOver reads the programmatically associated label instead of the accessible name provided via the aria-label or aria-labelledby attribute 1765977 1 webkit-bug-importer 2021-06-02 07:38:04 -0700 <rdar://problem/78762510> 1765978 2 andresg_22 2021-06-02 07:41:45 -0700 rdar://65935211 1765979 3 andresg_22 2021-06-02 07:45:08 -0700 Expected: When an input has a programmatically associated label and an aria-label attribute or aria-labelledby attribute, based on the accessible name computation the aria-label or aria-labelledby attribute should take precedence over the programmatically associated label. Actual: VoiceOver on iOS, reads the programmatically associated label instead of the accessible name provided via the aria-label or aria-labelledby attribute Applies to input types: text, password, search, tel, email and url On macOS Catalina Version 10.15.5 works as expected - aria-label or aria-labelledby attribute takes precedence over the programmatically associated label. 1765986 4 430350 andresg_22 2021-06-02 08:02:11 -0700 Created attachment 430350 Patch 1767658 5 430350 cfleizach 2021-06-07 20:40:08 -0700 Comment on attachment 430350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430350&action=review > Source/WebCore/ChangeLog:10 > + given objet, and using the label of that title element as the label of object > Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp:111 > + if (text.textSource == AccessibilityTextSource::LabelByElement && !coreObject->titleUIElement()) if we don't expose the titleUIElement, should it even be in the accessibilityText that's generated? 1768526 6 431069 andresg_22 2021-06-10 06:20:49 -0700 Created attachment 431069 Patch 1768528 7 andresg_22 2021-06-10 06:28:57 -0700 (In reply to chris fleizach from comment #5) > Comment on attachment 430350 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=430350&action=review > > > Source/WebCore/ChangeLog:10 > > + given objet, and using the label of that title element as the label of > > object Fixed. > > > Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp:111 > > + if (text.textSource == AccessibilityTextSource::LabelByElement && !coreObject->titleUIElement()) > > if we don't expose the titleUIElement, should it even be in the > accessibilityText that's generated? This is used for aria-label, so you can have a form field, for instance, with aria-label="blah" and we want to return "blah" if there is no titleUIElement. It seems that the precedence of titleUIElement over aria-label was established at some point, but I have not check what the aria spec says about this, if any thing. 1768658 8 ews-feeder 2021-06-10 12:08:59 -0700 Committed r278718 (238686@main): <https://commits.webkit.org/238686@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431069. 430350 2021-06-02 08:02:11 -0700 2021-06-10 06:20:45 -0700 Patch bug-226534-20210602110209.patch text/plain 14098 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc1ZjQ2ZGQ0MjAxYjA4 MDM0YTEyYWE1ZTU1OTJkOTk5MjRlNDRiOS4uZmNjMDI1Y2UzMDliZWE5YWVhNzJjYzJjYzM2ODc1 ZmI4ZWIzZmEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDIxLTA2LTAyICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBpT1MgLSBWb2lj ZU92ZXIgcmVhZHMgdGhlIHByb2dyYW1tYXRpY2FsbHkgYXNzb2NpYXRlZCBsYWJlbCBpbnN0ZWFk IG9mIHRoZSBhY2Nlc3NpYmxlIG5hbWUgcHJvdmlkZWQgdmlhIHRoZSBhcmlhLWxhYmVsIG9yIGFy aWEtbGFiZWxsZWRieSBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyNjUzNAorICAgICAgICByZGFyOi8vNjU5MzUyMTEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHJvYmxlbSBpcyBk dWUgdG8gVm9pY2VPdmVyIHJldHJpZXZpbmcgdGhlIHRpdGxlVUlFbGVtZW50IGZvciB0aGUKKyAg ICAgICAgZ2l2ZW4gb2JqZXQsIGFuZCB1c2luZyB0aGUgbGFiZWwgb2YgdGhhdCB0aXRsZSBlbGVt ZW50IGFzIHRoZSBsYWJlbCBvZgorICAgICAgICB0aGUgb2JqZWN0IGluIHF1ZXN0aW9uLiBUaGUg c29sdXRpb24gaW4gdGhpcyBwYXRjaCBpcyB0byBvbmx5IHJldHVybiBhCisgICAgICAgIHRpdGxl IGVsZW1lbnQgaWYgdGhlIG9iamVjdCBjYW4gaGF2ZSB0aXRsZSBlbGVtZW50cyAoaWYgZXhwb3Nl c1RpdGxlVUlFbGVtZW50CisgICAgICAgIGlzIHRydWUpLiBUaGlzIGNoZWNrIHdhcyBtaXNzaW5n IGluIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnRpdGxlVUlFbGVtZW50LgorCisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjpleHBvc2VzVGl0bGVVSUVsZW1lbnQgY29uc3QpOgorICAg ICAgICBUaGlzIG1ldGhvZCBpcyBubyBsb25nZXIgbmVjZXNzYXJ5IGluIHRoZSBBWENvcmVPYmpl Y3QgaW50ZXJmYWNlLAorICAgICAgICBpbnN0ZWFkIGlzIGEgdmlydHVhbCBpbiB0aGUgQVhPYmpl Y3QgY2xhc3MgaGllcmFyY2h5LgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0SW50ZXJmYWNlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OnRpdGxlVUlFbGVtZW50IGNvbnN0KToKKyAgICAgICAgQ2hlY2tzIHdoZXRoZXIg dGhpcyBvYmplY3QgY2FuIGhhdmUgYSB0aXRsZSBlbGVtZW50LgorCisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpjb21wdXRlQWNjZXNzaWJpbGl0eUlzSWdub3Jl ZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojph Y2Nlc3NpYmlsaXR5SGl0VGVzdCBjb25zdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdGsvV2Vi S2l0QWNjZXNzaWJsZVV0aWwuY3BwOgorICAgICAgICAoYWNjZXNzaWJpbGl0eVRpdGxlKToKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRyaWJ1dGVE YXRhKToKKyAgICAgICAgTm8gbmVlZCB0byBjYWNoZSB0aGlzIHZhbHVlIGFueSBtb3JlLgorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oOgor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmg6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJN YWMubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2li aWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L3dpbi9BY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlcldpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlcjo6YWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlKToKKwogMjAy MS0wNS0yNCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dTdHJlYW1lcl0gV2ViUHJvY2VzcyBjcmFzaGVzIHdoZW4gY2VydGFpbiBlbGVtZW50cyBh cmUgbWlzc2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3QuaAppbmRleCA0ZDljOTMzMThhODY3MWIzYmUwOTQyYzBlYzJmYjc2MTRlM2Vk OTc3Li5mZTFkZjM3ZWU0ZjgwNmU4Mjc0NTY5ZWNhN2NmNzliNjJjOTYzMzQ0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApAQCAt MzYzLDcgKzM2Myw2IEBAIHB1YmxpYzoKICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYnNlcnZh YmxlT2JqZWN0KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbnVsbHB0cjsgfQogICAgIHZvaWQg bGlua2VkVUlFbGVtZW50cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImKSBjb25zdCBvdmVy cmlkZSB7IH0KICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiB0aXRsZVVJRWxlbWVudCgpIGNvbnN0 IG92ZXJyaWRlIHsgcmV0dXJuIG51bGxwdHI7IH0KLSAgICBib29sIGV4cG9zZXNUaXRsZVVJRWxl bWVudCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KICAgICBBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBjb3JyZXNwb25kaW5nTGFiZWxGb3JDb250cm9sRWxlbWVudCgpIGNvbnN0IG92ZXJy aWRlIHsgcmV0dXJuIG51bGxwdHI7IH0KICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JyZXNw b25kaW5nQ29udHJvbEZvckxhYmVsRWxlbWVudCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG51 bGxwdHI7IH0KICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBzY3JvbGxCYXIoQWNjZXNzaWJpbGl0 eU9yaWVudGF0aW9uKSBvdmVycmlkZSB7IHJldHVybiBudWxscHRyOyB9CkBAIC03ODYsNiArNzg1 LDcgQEAgcHJvdGVjdGVkOgogICAgIHN0YXRpYyBib29sIGlzQVJJQUlucHV0KEFjY2Vzc2liaWxp dHlSb2xlKTsKICAgICB2b2lkIGFyaWFFbGVtZW50c0Zyb21BdHRyaWJ1dGUoQWNjZXNzaWJpbGl0 eUNoaWxkcmVuVmVjdG9yJiwgY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0OwogICAgIHZvaWQg YXJpYUVsZW1lbnRzUmVmZXJlbmNlZEJ5QXR0cmlidXRlKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZl Y3RvciYsIGNvbnN0IFF1YWxpZmllZE5hbWUmKSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgZXhw b3Nlc1RpdGxlVUlFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgQWNjZXNz aWJpbGl0eU9iamVjdCogcmFkaW9Hcm91cEFuY2VzdG9yKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFj ZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50 ZXJmYWNlLmgKaW5kZXggOTgyMzA2YjU0ODJkMjJjMWYwYzY4NjY4YWQ4NmRjYmFhZjJlNTQ4YS4u OTcwMWI2MTE5NTMwOTgwODY4MjZmOGZmOGMwY2FlNDZkMDI3Njc0MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50 ZXJmYWNlLmgKQEAgLTEwOTksNyArMTA5OSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEFYQ29y ZU9iamVjdCogb2JzZXJ2YWJsZU9iamVjdCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg bGlua2VkVUlFbGVtZW50cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImKSBjb25zdCA9IDA7 CiAgICAgdmlydHVhbCBBWENvcmVPYmplY3QqIHRpdGxlVUlFbGVtZW50KCkgY29uc3QgPSAwOwot ICAgIHZpcnR1YWwgYm9vbCBleHBvc2VzVGl0bGVVSUVsZW1lbnQoKSBjb25zdCA9IDA7CiAgICAg dmlydHVhbCBBWENvcmVPYmplY3QqIGNvcnJlc3BvbmRpbmdMYWJlbEZvckNvbnRyb2xFbGVtZW50 KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgQVhDb3JlT2JqZWN0KiBjb3JyZXNwb25kaW5nQ29u dHJvbEZvckxhYmVsRWxlbWVudCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIEFYQ29yZU9iamVj dCogc2Nyb2xsQmFyKEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvbikgPSAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAKaW5kZXggMWM0NTI2NmViN2Q1ZWU0ZmE3ZGJiMzQ3ZDU1ZTBkNzE1ZjBmYzI2MC4uZmQ0 Nzc1NjIxMjdlZWQzMmZhYzFjZmJjYmYyNTljYjU5MGMwY2Y3YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qu Y3BwCkBAIC0xMjE0LDkgKzEyMTQsOSBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OnRpdGxlRWxlbWVudFRleHQoVmVjdG9yPEFjY2Vzc2liaWxpdHlUZXh0PiYgdGV4dAogICAgIAog QWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dGl0bGVVSUVs ZW1lbnQoKSBjb25zdAogewotICAgIGlmICghbV9yZW5kZXJlcikKKyAgICBpZiAoIW1fcmVuZGVy ZXIgfHwgIWV4cG9zZXNUaXRsZVVJRWxlbWVudCgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK LSAgICAKKwogICAgIC8vIGlmIGlzRmllbGRzZXQgaXMgdHJ1ZSwgdGhlIHJlbmRlcmVyIGlzIGd1 YXJhbnRlZWQgdG8gYmUgYSBSZW5kZXJGaWVsZHNldAogICAgIGlmIChpc0ZpZWxkc2V0KCkpCiAg ICAgICAgIHJldHVybiBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKGRvd25jYXN0PFJlbmRl ckJsb2NrPigqbV9yZW5kZXJlcikuZmluZEZpZWxkc2V0TGVnZW5kKFJlbmRlckJsb2NrOjpGaWVs ZHNldEluY2x1ZGVGbG9hdGluZ09yT3V0T2ZGbG93KSk7CkBAIC0xNTUxLDggKzE1NTEsOCBAQCBi b29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmNvbXB1dGVBY2Nlc3NpYmlsaXR5SXNJZ25v cmVkKCkgY29uc3QKIAogICAgIC8vIEZpbmQgb3V0IGlmIHRoaXMgZWxlbWVudCBpcyBpbnNpZGUg b2YgYSBsYWJlbCBlbGVtZW50LgogICAgIC8vIElmIHNvLCBpdCBtYXkgYmUgaWdub3JlZCBiZWNh dXNlIGl0J3MgdGhlIGxhYmVsIGZvciBhIGNoZWNrYm94IG9yIHJhZGlvIGJ1dHRvbi4KLSAgICBB Y2Nlc3NpYmlsaXR5T2JqZWN0KiBjb250cm9sT2JqZWN0ID0gY29ycmVzcG9uZGluZ0NvbnRyb2xG b3JMYWJlbEVsZW1lbnQoKTsKLSAgICBpZiAoY29udHJvbE9iamVjdCAmJiAhY29udHJvbE9iamVj dC0+ZXhwb3Nlc1RpdGxlVUlFbGVtZW50KCkgJiYgY29udHJvbE9iamVjdC0+aXNDaGVja2JveE9y UmFkaW8oKSkKKyAgICBhdXRvKiBjb250cm9sT2JqZWN0ID0gY29ycmVzcG9uZGluZ0NvbnRyb2xG b3JMYWJlbEVsZW1lbnQoKTsKKyAgICBpZiAoY29udHJvbE9iamVjdCAmJiBjb250cm9sT2JqZWN0 LT5pc0NoZWNrYm94T3JSYWRpbygpICYmICFjb250cm9sT2JqZWN0LT50aXRsZVVJRWxlbWVudCgp KQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIEJ5IGRlZmF1bHQsIG9iamVjdHMgc2hv dWxkIGJlIGlnbm9yZWQgc28gdGhhdCB0aGUgQVggaGllcmFyY2h5IGlzIG5vdApAQCAtMjU2NSw4 ICsyNTY1LDggQEAgQVhDb3JlT2JqZWN0KiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nl c3NpYmlsaXR5SGl0VGVzdChjb25zdCBJbnRQb2ludCYgcG8KICAgICAKICAgICBpZiAocmVzdWx0 ICYmIHJlc3VsdC0+YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpKSB7CiAgICAgICAgIC8vIElmIHRo aXMgZWxlbWVudCBpcyB0aGUgbGFiZWwgb2YgYSBjb250cm9sLCBhIGhpdCB0ZXN0IHNob3VsZCBy ZXR1cm4gdGhlIGNvbnRyb2wuCi0gICAgICAgIEFYQ29yZU9iamVjdCogY29udHJvbE9iamVjdCA9 IHJlc3VsdC0+Y29ycmVzcG9uZGluZ0NvbnRyb2xGb3JMYWJlbEVsZW1lbnQoKTsKLSAgICAgICAg aWYgKGNvbnRyb2xPYmplY3QgJiYgIWNvbnRyb2xPYmplY3QtPmV4cG9zZXNUaXRsZVVJRWxlbWVu dCgpKQorICAgICAgICBhdXRvKiBjb250cm9sT2JqZWN0ID0gcmVzdWx0LT5jb3JyZXNwb25kaW5n Q29udHJvbEZvckxhYmVsRWxlbWVudCgpOworICAgICAgICBpZiAoY29udHJvbE9iamVjdCAmJiAh Y29udHJvbE9iamVjdC0+dGl0bGVVSUVsZW1lbnQoKSkKICAgICAgICAgICAgIHJldHVybiBjb250 cm9sT2JqZWN0OwogCiAgICAgICAgIHJlc3VsdCA9IHJlc3VsdC0+cGFyZW50T2JqZWN0VW5pZ25v cmVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdC5oCmluZGV4IGJiYzkzNmY3ZmUwNTkwNTdmZWM5ZjlmNWRhOWUx MDI3OTRmYmFlMTcuLjk5MTc5ZTg3ZThjNDYwOTA3MGFjZDExMWEzMDNiZGZlMDlhYTIwOGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5oCkBAIC05Niw3ICs5Niw2IEBAIHB1YmxpYzoKICAgICBBY2Nlc3NpYmls aXR5T2JqZWN0KiBwYXJlbnRPYmplY3RJZkV4aXN0cygpIGNvbnN0IG92ZXJyaWRlOwogICAgIEFj Y2Vzc2liaWxpdHlPYmplY3QqIG9ic2VydmFibGVPYmplY3QoKSBjb25zdCBvdmVycmlkZTsKICAg ICB2b2lkIGxpbmtlZFVJRWxlbWVudHMoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJikgY29u c3Qgb3ZlcnJpZGU7Ci0gICAgYm9vbCBleHBvc2VzVGl0bGVVSUVsZW1lbnQoKSBjb25zdCBvdmVy cmlkZTsKICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiB0aXRsZVVJRWxlbWVudCgpIGNvbnN0IG92 ZXJyaWRlOwogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcnJlc3BvbmRpbmdDb250cm9sRm9y TGFiZWxFbGVtZW50KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCog Y29ycmVzcG9uZGluZ0xhYmVsRm9yQ29udHJvbEVsZW1lbnQoKSBjb25zdCBvdmVycmlkZTsKQEAg LTIxMCw2ICsyMDksOCBAQCBwcm90ZWN0ZWQ6CiAgICAgQWNjZXNzaWJpbGl0eVJvbGUgZGV0ZXJt aW5lQWNjZXNzaWJpbGl0eVJvbGUoKSBvdmVycmlkZTsKICAgICBib29sIGNvbXB1dGVBY2Nlc3Np YmlsaXR5SXNJZ25vcmVkKCkgY29uc3Qgb3ZlcnJpZGU7CiAKKyAgICBib29sIGV4cG9zZXNUaXRs ZVVJRWxlbWVudCgpIGNvbnN0IG92ZXJyaWRlOworCiAjaWYgRU5BQkxFKE1BVEhNTCkKICAgICB2 aXJ0dWFsIGJvb2wgaXNJZ25vcmVkRWxlbWVudFdpdGhpbk1hdGhUcmVlKCkgY29uc3Q7CiAjZW5k aWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFj Y2Vzc2libGVVdGlsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktp dEFjY2Vzc2libGVVdGlsLmNwcAppbmRleCA4NGI2YzJkMzlmM2YwM2RhODVmNzNmZTA4ZWNhNWM2 OWU3NDhiZmM2Li42MDk3OWRiNGNhODIwMWJhZWEzZDg5MTRhMWI3Y2UyMmM0YmEzNTMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxl VXRpbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNj ZXNzaWJsZVV0aWwuY3BwCkBAIC0xMDgsNyArMTA4LDcgQEAgU3RyaW5nIGFjY2Vzc2liaWxpdHlU aXRsZShBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0KQogCiAgICAgICAgIC8vIElmIHRo ZXJlJ3MgYW4gZWxlbWVudCB0aGF0IGxhYmVscyB0aGlzIG9iamVjdCBhbmQgaXQncyBub3QgZXhw b3NlZCwgdGhlbiB3ZSBzaG91bGQgdXNlCiAgICAgICAgIC8vIHRoYXQgdGV4dCBhcyBvdXIgdGl0 bGUuCi0gICAgICAgIGlmICh0ZXh0LnRleHRTb3VyY2UgPT0gQWNjZXNzaWJpbGl0eVRleHRTb3Vy Y2U6OkxhYmVsQnlFbGVtZW50ICYmICFjb3JlT2JqZWN0LT5leHBvc2VzVGl0bGVVSUVsZW1lbnQo KSkKKyAgICAgICAgaWYgKHRleHQudGV4dFNvdXJjZSA9PSBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJj ZTo6TGFiZWxCeUVsZW1lbnQgJiYgIWNvcmVPYmplY3QtPnRpdGxlVUlFbGVtZW50KCkpCiAgICAg ICAgICAgICByZXR1cm4gdGV4dC50ZXh0OwogCiAgICAgICAgIC8vIEVsZW1lbnRzIG9mIHJvbGUg QWNjZXNzaWJpbGl0eVJvbGU6OlRvb2xiYXIgd2lsbCByZXR1cm4gaXRzIHRpdGxlIGFzIEFjY2Vz c2liaWxpdHlUZXh0U291cmNlOjpBbHRlcm5hdGl2ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5j cHAKaW5kZXggYWU1YzNkOTE1ZDBlZDUxNGI2MjI4Yzc4ZDE4YTlhMzY0MzBlMTU2OC4uMjBjMGNi YjU3NGZhMzFiMzIyMmU5MmYwMDM2ZjllZDVlNTUyMGFkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9i amVjdC5jcHAKQEAgLTE5MSw3ICsxOTEsNiBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRp YWxpemVBdHRyaWJ1dGVEYXRhKEFYQ29yZU9iamVjdCYgb2JqZWN0LCBib29sIGlzUm9vdAogICAg IHNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpJc0dyYWJiZWQsIG9iamVjdC5pc0dyYWJiZWQo KSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkRyb3BFZmZlY3RzLCBvYmplY3Qu ZGV0ZXJtaW5lRHJvcEVmZmVjdHMoKSk7CiAgICAgc2V0T2JqZWN0UHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWU6OlRpdGxlVUlFbGVtZW50LCBvYmplY3QudGl0bGVVSUVsZW1lbnQoKSk7Ci0gICAgc2V0 UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkV4cG9zZXNUaXRsZVVJRWxlbWVudCwgb2JqZWN0LmV4 cG9zZXNUaXRsZVVJRWxlbWVudCgpKTsKICAgICBzZXRPYmplY3RQcm9wZXJ0eShBWFByb3BlcnR5 TmFtZTo6VmVydGljYWxTY3JvbGxCYXIsIG9iamVjdC5zY3JvbGxCYXIoQWNjZXNzaWJpbGl0eU9y aWVudGF0aW9uOjpWZXJ0aWNhbCkpOwogICAgIHNldE9iamVjdFByb3BlcnR5KEFYUHJvcGVydHlO YW1lOjpIb3Jpem9udGFsU2Nyb2xsQmFyLCBvYmplY3Quc2Nyb2xsQmFyKEFjY2Vzc2liaWxpdHlP cmllbnRhdGlvbjo6SG9yaXpvbnRhbCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1l OjpBUklBUm9sZUF0dHJpYnV0ZSwgc3RhdGljX2Nhc3Q8aW50PihvYmplY3QuYXJpYVJvbGVBdHRy aWJ1dGUoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IDBhZDgwMDBjNGZiMjU4MGE2 ZDg4ZjEyNzkxZWNlZmUyYWY1NDgwZTYuLjM3OTE2NzA5YzEwNGQ5YWIyMTE1ZmVhZjhmNDNiZDJl ZWJlMmJhNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKQEAgLTI1Miw3ICsyNTIsNiBAQCBw cml2YXRlOgogICAgIEFYQ29yZU9iamVjdCogcGFyZW50T2JqZWN0VW5pZ25vcmVkKCkgY29uc3Qg b3ZlcnJpZGU7CiAgICAgdm9pZCBsaW5rZWRVSUVsZW1lbnRzKEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciYgY2hpbGRyZW4pIGNvbnN0IG92ZXJyaWRlIHsgZmlsbENoaWxkcmVuVmVjdG9yRm9y UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkxpbmtlZFVJRWxlbWVudHMsIGNoaWxkcmVuKTsgfQog ICAgIEFYQ29yZU9iamVjdCogdGl0bGVVSUVsZW1lbnQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVy biBvYmplY3RBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZTo6VGl0bGVVSUVsZW1lbnQpOyB9 Ci0gICAgYm9vbCBleHBvc2VzVGl0bGVVSUVsZW1lbnQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVy biBib29sQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OkV4cG9zZXNUaXRsZVVJRWxlbWVu dCk7IH0KICAgICBBWENvcmVPYmplY3QqIHNjcm9sbEJhcihBY2Nlc3NpYmlsaXR5T3JpZW50YXRp b24pIG92ZXJyaWRlOwogICAgIEFjY2Vzc2liaWxpdHlSb2xlIGFyaWFSb2xlQXR0cmlidXRlKCkg Y29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVJvbGU+KGlu dEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpBUklBUm9sZUF0dHJpYnV0ZSkpOyB9CiAg ICAgU3RyaW5nIGNvbXB1dGVkTGFiZWwoKSBvdmVycmlkZSB7IHJldHVybiBzdHJpbmdBdHRyaWJ1 dGVWYWx1ZShBWFByb3BlcnR5TmFtZTo6Q29tcHV0ZWRMYWJlbCk7IH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJl ZS5oCmluZGV4IDgxYWI5M2M2YjliYjQ2YWNmYWNhNDJiOThkMTViMDQxZmRmOTJjNzUuLjY1ZTc3 MWQxOTc3MmI2ODU2NGFjZmM3YzI4MmI1YzJjYjBlOTRiYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu aApAQCAtMTExLDcgKzExMSw2IEBAIGVudW0gY2xhc3MgQVhQcm9wZXJ0eU5hbWUgOiB1aW50MTZf dCB7CiAgICAgRW1iZWRkZWRJbWFnZURlc2NyaXB0aW9uLAogICAgIEVzdGltYXRlZExvYWRpbmdQ cm9ncmVzcywKICAgICBFeHBhbmRlZFRleHRWYWx1ZSwKLSAgICBFeHBvc2VzVGl0bGVVSUVsZW1l bnQsCiAgICAgRmlsZVVwbG9hZEJ1dHRvblJldHVybnNWYWx1ZUluVGl0bGUsCiAgICAgRm9jdXNh YmxlQW5jZXN0b3IsCiAgICAgSGFzQVJJQVZhbHVlTm93LApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMu bW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlck1hYy5tbQppbmRleCA3NTI3NDE1YmEzOTM0ZDU3YWUxMzU3YjNhZWQzMWIxN2Y0 YzhmNzNhLi41ODM5ZTBhMWM4YmQyYjhjM2EyNDAxNmRlMzE4YTliZWQxNTVlMjg2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMjY0MywxMyArMjY0Myw4IEBA IEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogICAgIH0KIAogICAgIGlmIChb YXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5VGl0bGVVSUVsZW1l bnRBdHRyaWJ1dGVdKSB7Ci0gICAgICAgIGlmICghYmFja2luZ09iamVjdC0+ZXhwb3Nlc1RpdGxl VUlFbGVtZW50KCkpCi0gICAgICAgICAgICByZXR1cm4gbmlsOwotCi0gICAgICAgIEFYQ29yZU9i amVjdCogb2JqID0gYmFja2luZ09iamVjdC0+dGl0bGVVSUVsZW1lbnQoKTsKLSAgICAgICAgaWYg KG9iaikKLSAgICAgICAgICAgIHJldHVybiBvYmotPndyYXBwZXIoKTsKLSAgICAgICAgcmV0dXJu IG5pbDsKKyAgICAgICAgYXV0byogb2JqZWN0ID0gYmFja2luZ09iamVjdC0+dGl0bGVVSUVsZW1l bnQoKTsKKyAgICAgICAgcmV0dXJuIG9iamVjdCA/IG9iamVjdC0+d3JhcHBlcigpIDogbmlsOwog ICAgIH0KIAogICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3Np YmlsaXR5VmFsdWVEZXNjcmlwdGlvbkF0dHJpYnV0ZV0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L3dpbi9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcldpbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L3dpbi9BY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlcldpbi5jcHAKaW5kZXggYmMwZmU4MTIwYjA3YzI2NzcxMmUwODVlODcwZTJhMWFlMDQ3M2Q3 Yy4uNDNlOTMxNzkzNTIzOTY0ODliODJiZTAxZWYwNGMxMDAzMGY2OTEwYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS93aW4vQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvd2luL0FjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyV2luLmNwcApAQCAtNDUsMTQgKzQ1LDEwIEBAIHZvaWQgQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXI6OmFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZShjb25zdCBB dG9tU3RyaW5nJiBhCiAKICAgICAvLyBOb3QgYSByZWFsIGNvbmNlcHQgb24gV2luZG93cywgYnV0 IHVzZWQgaGVhdmlseSBpbiBXZWJLaXQgYWNjZXNzaWJpbGl0eSB0ZXN0aW5nLgogICAgIGlmIChh dHRyaWJ1dGVOYW1lID09ICJBWFRpdGxlVUlFbGVtZW50QXR0cmlidXRlIikgewotICAgICAgICBp ZiAoIW1fb2JqZWN0LT5leHBvc2VzVGl0bGVVSUVsZW1lbnQoKSkKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmogPSBtX29iamVjdC0+dGl0bGVV SUVsZW1lbnQoKTsKLSAgICAgICAgaWYgKG9iaikgeworICAgICAgICBpZiAoYXV0byogb2JqZWN0 ID0gbV9vYmplY3QtPnRpdGxlVUlFbGVtZW50KCkpIHsKICAgICAgICAgICAgIEFTU0VSVChWX1ZU KHJlc3VsdCkgPT0gVlRfRU1QVFkpOwogICAgICAgICAgICAgVl9WVChyZXN1bHQpID0gVlRfVU5L Tk9XTjsKLSAgICAgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyKiB3cmFwcGVyID0g b2JqLT53cmFwcGVyKCk7CisgICAgICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciog d3JhcHBlciA9IG9iamVjdC0+d3JhcHBlcigpOwogICAgICAgICAgICAgVl9VTktOT1dOKHJlc3Vs dCkgPSB3cmFwcGVyOwogICAgICAgICAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAgICAgICAgICAg d3JhcHBlci0+QWRkUmVmKCk7Cg== 431069 2021-06-10 06:20:49 -0700 2021-06-10 12:09:00 -0700 Patch bug-226534-20210610092047.patch text/plain 14100 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgxNWY5YTdiMjFhYmE3 NjRhZDExYmIwYjJkODI4NWI3MGViZDViNC4uNWNlYTg1MTE1ODljMDhjYTIxZWM3ODM1MDAzYjJj MWJjMTViMGU0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDIxLTA2LTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBpT1MgLSBWb2lj ZU92ZXIgcmVhZHMgdGhlIHByb2dyYW1tYXRpY2FsbHkgYXNzb2NpYXRlZCBsYWJlbCBpbnN0ZWFk IG9mIHRoZSBhY2Nlc3NpYmxlIG5hbWUgcHJvdmlkZWQgdmlhIHRoZSBhcmlhLWxhYmVsIG9yIGFy aWEtbGFiZWxsZWRieSBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyNjUzNAorICAgICAgICByZGFyOi8vNjU5MzUyMTEKKworICAgICAg ICBSZXZpZXdlZCBieSBDaHJpcyBGbGVpemFjaC4KKworICAgICAgICBUaGUgcHJvYmxlbSBpcyBk dWUgdG8gVm9pY2VPdmVyIHJldHJpZXZpbmcgdGhlIHRpdGxlVUlFbGVtZW50IGZvciB0aGUKKyAg ICAgICAgZ2l2ZW4gb2JqZWN0LCBhbmQgdXNpbmcgdGhlIGxhYmVsIG9mIHRoYXQgdGl0bGUgZWxl bWVudCBhcyB0aGUgbGFiZWwgb2YKKyAgICAgICAgdGhlIG9iamVjdCBpbiBxdWVzdGlvbi4gVGhl IHNvbHV0aW9uIGluIHRoaXMgcGF0Y2ggaXMgdG8gb25seSByZXR1cm4gYQorICAgICAgICB0aXRs ZSBlbGVtZW50IGlmIHRoZSBvYmplY3QgY2FuIGhhdmUgdGl0bGUgZWxlbWVudHMgKGlmIGV4cG9z ZXNUaXRsZVVJRWxlbWVudAorICAgICAgICBpcyB0cnVlKS4gVGhpcyBjaGVjayB3YXMgbWlzc2lu ZyBpbiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0aXRsZVVJRWxlbWVudC4KKworICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6ZXhwb3Nlc1RpdGxlVUlFbGVtZW50IGNvbnN0KToKKyAg ICAgICAgVGhpcyBtZXRob2QgaXMgbm8gbG9uZ2VyIG5lY2Vzc2FyeSBpbiB0aGUgQVhDb3JlT2Jq ZWN0IGludGVyZmFjZSwKKyAgICAgICAgaW5zdGVhZCBpcyBhIHZpcnR1YWwgaW4gdGhlIEFYT2Jq ZWN0IGNsYXNzIGhpZXJhcmNoeS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU9iamVjdEludGVyZmFjZS5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0Ojp0aXRsZVVJRWxlbWVudCBjb25zdCk6CisgICAgICAgIENoZWNrcyB3aGV0aGVy IHRoaXMgb2JqZWN0IGNhbiBoYXZlIGEgdGl0bGUgZWxlbWVudC4KKworICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y29tcHV0ZUFjY2Vzc2liaWxpdHlJc0lnbm9y ZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 YWNjZXNzaWJpbGl0eUhpdFRlc3QgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL1dl YktpdEFjY2Vzc2libGVVdGlsLmNwcDoKKyAgICAgICAgKGFjY2Vzc2liaWxpdHlUaXRsZSk6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmlidXRl RGF0YSk6CisgICAgICAgIE5vIG5lZWQgdG8gY2FjaGUgdGhpcyB2YWx1ZSBhbnkgbW9yZS4KKwor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaDoK KyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy TWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3Np YmlsaXR5QXR0cmlidXRlVmFsdWU6XSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS93aW4vQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXI6OmFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZSk6CisKIDIw MjEtMDYtMDcgIEltYW5vbCBGZXJuYW5kZXogIDxpZmVybmFuZGV6QGlnYWxpYS5jb20+CiAKICAg ICAgICAgQ2hhbmdlIFdlYlhSU3BhY2U6OmVmZWN0aXZlT3JpZ2luKCkgbWF0cml4IG11bHRpcGxp Y2F0aW9uIG9yZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU9iamVjdC5oCmluZGV4IDYwMzJmNjhmY2Y2MjYyMzQ2MjJlODc5M2E2ZDQ2ZmZkYzRj N2Q2OWUuLmM3ZjAzMTdkZmZkNDhhNGNjYWU4ZDU0MWI0MDExYjM4ODAwMWI0YjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCkBA IC0zNjMsNyArMzYzLDYgQEAgcHVibGljOgogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIG9ic2Vy dmFibGVPYmplY3QoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBudWxscHRyOyB9CiAgICAgdm9p ZCBsaW5rZWRVSUVsZW1lbnRzKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYpIGNvbnN0IG92 ZXJyaWRlIHsgfQogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHRpdGxlVUlFbGVtZW50KCkgY29u c3Qgb3ZlcnJpZGUgeyByZXR1cm4gbnVsbHB0cjsgfQotICAgIGJvb2wgZXhwb3Nlc1RpdGxlVUlF bGVtZW50KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogICAgIEFjY2Vzc2liaWxp dHlPYmplY3QqIGNvcnJlc3BvbmRpbmdMYWJlbEZvckNvbnRyb2xFbGVtZW50KCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gbnVsbHB0cjsgfQogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcnJl c3BvbmRpbmdDb250cm9sRm9yTGFiZWxFbGVtZW50KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4g bnVsbHB0cjsgfQogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHNjcm9sbEJhcihBY2Nlc3NpYmls aXR5T3JpZW50YXRpb24pIG92ZXJyaWRlIHsgcmV0dXJuIG51bGxwdHI7IH0KQEAgLTc4Niw2ICs3 ODUsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgc3RhdGljIGJvb2wgaXNBUklBSW5wdXQoQWNjZXNzaWJp bGl0eVJvbGUpOwogICAgIHZvaWQgYXJpYUVsZW1lbnRzRnJvbUF0dHJpYnV0ZShBY2Nlc3NpYmls aXR5Q2hpbGRyZW5WZWN0b3ImLCBjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Q7CiAgICAgdm9p ZCBhcmlhRWxlbWVudHNSZWZlcmVuY2VkQnlBdHRyaWJ1dGUoQWNjZXNzaWJpbGl0eUNoaWxkcmVu VmVjdG9yJiwgY29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBl eHBvc2VzVGl0bGVVSUVsZW1lbnQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKICAgICBBY2Nl c3NpYmlsaXR5T2JqZWN0KiByYWRpb0dyb3VwQW5jZXN0b3IoKSBjb25zdDsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJm YWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJ bnRlcmZhY2UuaAppbmRleCAzYWYyNTExZTY5NDBjODhjY2UzNzhmYjAxZDA1MjJiMzY5NjljNjEw Li43OTRhMTFlMmJiNTZlNTMzNWI2ZGI5ZjYxOTEzOWUwMWNmNzQwNzI2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJ bnRlcmZhY2UuaApAQCAtMTA5OSw3ICsxMDk5LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgQVhD b3JlT2JqZWN0KiBvYnNlcnZhYmxlT2JqZWN0KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9p ZCBsaW5rZWRVSUVsZW1lbnRzKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYpIGNvbnN0ID0g MDsKICAgICB2aXJ0dWFsIEFYQ29yZU9iamVjdCogdGl0bGVVSUVsZW1lbnQoKSBjb25zdCA9IDA7 Ci0gICAgdmlydHVhbCBib29sIGV4cG9zZXNUaXRsZVVJRWxlbWVudCgpIGNvbnN0ID0gMDsKICAg ICB2aXJ0dWFsIEFYQ29yZU9iamVjdCogY29ycmVzcG9uZGluZ0xhYmVsRm9yQ29udHJvbEVsZW1l bnQoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBBWENvcmVPYmplY3QqIGNvcnJlc3BvbmRpbmdD b250cm9sRm9yTGFiZWxFbGVtZW50KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgQVhDb3JlT2Jq ZWN0KiBzY3JvbGxCYXIoQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9uKSA9IDA7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qu Y3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcAppbmRleCBkZDUwNDUyODdjYjEzMmJjNDMyYWUyZTk2ZjM5MTg2YTlhOGJmNmE1Li45 NWU1ZWE1NzRiOTRjZDA1NzQxMzQ3ZWMxYmU3NTRmNGJjNzhmMmY4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAKQEAgLTEyMTQsOSArMTIxNCw5IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dDo6dGl0bGVFbGVtZW50VGV4dChWZWN0b3I8QWNjZXNzaWJpbGl0eVRleHQ+JiB0ZXh0CiAgICAg CiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0aXRsZVVJ RWxlbWVudCgpIGNvbnN0CiB7Ci0gICAgaWYgKCFtX3JlbmRlcmVyKQorICAgIGlmICghbV9yZW5k ZXJlciB8fCAhZXhwb3Nlc1RpdGxlVUlFbGVtZW50KCkpCiAgICAgICAgIHJldHVybiBudWxscHRy OwotICAgIAorCiAgICAgLy8gaWYgaXNGaWVsZHNldCBpcyB0cnVlLCB0aGUgcmVuZGVyZXIgaXMg Z3VhcmFudGVlZCB0byBiZSBhIFJlbmRlckZpZWxkc2V0CiAgICAgaWYgKGlzRmllbGRzZXQoKSkK ICAgICAgICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoZG93bmNhc3Q8UmVu ZGVyQmxvY2s+KCptX3JlbmRlcmVyKS5maW5kRmllbGRzZXRMZWdlbmQoUmVuZGVyQmxvY2s6OkZp ZWxkc2V0SW5jbHVkZUZsb2F0aW5nT3JPdXRPZkZsb3cpKTsKQEAgLTE1NTEsOCArMTU1MSw4IEBA IGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y29tcHV0ZUFjY2Vzc2liaWxpdHlJc0ln bm9yZWQoKSBjb25zdAogCiAgICAgLy8gRmluZCBvdXQgaWYgdGhpcyBlbGVtZW50IGlzIGluc2lk ZSBvZiBhIGxhYmVsIGVsZW1lbnQuCiAgICAgLy8gSWYgc28sIGl0IG1heSBiZSBpZ25vcmVkIGJl Y2F1c2UgaXQncyB0aGUgbGFiZWwgZm9yIGEgY2hlY2tib3ggb3IgcmFkaW8gYnV0dG9uLgotICAg IEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvbnRyb2xPYmplY3QgPSBjb3JyZXNwb25kaW5nQ29udHJv bEZvckxhYmVsRWxlbWVudCgpOwotICAgIGlmIChjb250cm9sT2JqZWN0ICYmICFjb250cm9sT2Jq ZWN0LT5leHBvc2VzVGl0bGVVSUVsZW1lbnQoKSAmJiBjb250cm9sT2JqZWN0LT5pc0NoZWNrYm94 T3JSYWRpbygpKQorICAgIGF1dG8qIGNvbnRyb2xPYmplY3QgPSBjb3JyZXNwb25kaW5nQ29udHJv bEZvckxhYmVsRWxlbWVudCgpOworICAgIGlmIChjb250cm9sT2JqZWN0ICYmIGNvbnRyb2xPYmpl Y3QtPmlzQ2hlY2tib3hPclJhZGlvKCkgJiYgIWNvbnRyb2xPYmplY3QtPnRpdGxlVUlFbGVtZW50 KCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gQnkgZGVmYXVsdCwgb2JqZWN0cyBz aG91bGQgYmUgaWdub3JlZCBzbyB0aGF0IHRoZSBBWCBoaWVyYXJjaHkgaXMgbm90CkBAIC0yNTY1 LDggKzI1NjUsOCBAQCBBWENvcmVPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFj Y2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBvaW50JiBwbwogICAgIAogICAgIGlmIChyZXN1 bHQgJiYgcmVzdWx0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpIHsKICAgICAgICAgLy8gSWYg dGhpcyBlbGVtZW50IGlzIHRoZSBsYWJlbCBvZiBhIGNvbnRyb2wsIGEgaGl0IHRlc3Qgc2hvdWxk IHJldHVybiB0aGUgY29udHJvbC4KLSAgICAgICAgQVhDb3JlT2JqZWN0KiBjb250cm9sT2JqZWN0 ID0gcmVzdWx0LT5jb3JyZXNwb25kaW5nQ29udHJvbEZvckxhYmVsRWxlbWVudCgpOwotICAgICAg ICBpZiAoY29udHJvbE9iamVjdCAmJiAhY29udHJvbE9iamVjdC0+ZXhwb3Nlc1RpdGxlVUlFbGVt ZW50KCkpCisgICAgICAgIGF1dG8qIGNvbnRyb2xPYmplY3QgPSByZXN1bHQtPmNvcnJlc3BvbmRp bmdDb250cm9sRm9yTGFiZWxFbGVtZW50KCk7CisgICAgICAgIGlmIChjb250cm9sT2JqZWN0ICYm ICFjb250cm9sT2JqZWN0LT50aXRsZVVJRWxlbWVudCgpKQogICAgICAgICAgICAgcmV0dXJuIGNv bnRyb2xPYmplY3Q7CiAKICAgICAgICAgcmVzdWx0ID0gcmVzdWx0LT5wYXJlbnRPYmplY3RVbmln bm9yZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKaW5kZXggYmJjOTM2ZjdmZTA1OTA1N2ZlYzlmOWY1ZGE5 ZTEwMjc5NGZiYWUxNy4uOTkxNzllODdlOGM0NjA5MDcwYWNkMTExYTMwM2JkZmUwOWFhMjA4ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmgKQEAgLTk2LDcgKzk2LDYgQEAgcHVibGljOgogICAgIEFjY2Vzc2li aWxpdHlPYmplY3QqIHBhcmVudE9iamVjdElmRXhpc3RzKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAg QWNjZXNzaWJpbGl0eU9iamVjdCogb2JzZXJ2YWJsZU9iamVjdCgpIGNvbnN0IG92ZXJyaWRlOwog ICAgIHZvaWQgbGlua2VkVUlFbGVtZW50cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImKSBj b25zdCBvdmVycmlkZTsKLSAgICBib29sIGV4cG9zZXNUaXRsZVVJRWxlbWVudCgpIGNvbnN0IG92 ZXJyaWRlOwogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHRpdGxlVUlFbGVtZW50KCkgY29uc3Qg b3ZlcnJpZGU7CiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogY29ycmVzcG9uZGluZ0NvbnRyb2xG b3JMYWJlbEVsZW1lbnQoKSBjb25zdCBvdmVycmlkZTsKICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0 KiBjb3JyZXNwb25kaW5nTGFiZWxGb3JDb250cm9sRWxlbWVudCgpIGNvbnN0IG92ZXJyaWRlOwpA QCAtMjEwLDYgKzIwOSw4IEBAIHByb3RlY3RlZDoKICAgICBBY2Nlc3NpYmlsaXR5Um9sZSBkZXRl cm1pbmVBY2Nlc3NpYmlsaXR5Um9sZSgpIG92ZXJyaWRlOwogICAgIGJvb2wgY29tcHV0ZUFjY2Vz c2liaWxpdHlJc0lnbm9yZWQoKSBjb25zdCBvdmVycmlkZTsKIAorICAgIGJvb2wgZXhwb3Nlc1Rp dGxlVUlFbGVtZW50KCkgY29uc3Qgb3ZlcnJpZGU7CisKICNpZiBFTkFCTEUoTUFUSE1MKQogICAg IHZpcnR1YWwgYm9vbCBpc0lnbm9yZWRFbGVtZW50V2l0aGluTWF0aFRyZWUoKSBjb25zdDsKICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0 QWNjZXNzaWJsZVV0aWwuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2Vi S2l0QWNjZXNzaWJsZVV0aWwuY3BwCmluZGV4IGM3MDY0NzQ3MzFhNzQ4NjYyMjgyNjA4NDY4OWRm YjA0MmU2ZDc2MDkuLmQ5ZGNkYTkwOGYyZTEyZDU5ZDkxY2M1NTIwNDgzZWEwM2Y1ZjY5MWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2li bGVVdGlsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRB Y2Nlc3NpYmxlVXRpbC5jcHAKQEAgLTEwOCw3ICsxMDgsNyBAQCBTdHJpbmcgYWNjZXNzaWJpbGl0 eVRpdGxlKEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3QpCiAKICAgICAgICAgLy8gSWYg dGhlcmUncyBhbiBlbGVtZW50IHRoYXQgbGFiZWxzIHRoaXMgb2JqZWN0IGFuZCBpdCdzIG5vdCBl eHBvc2VkLCB0aGVuIHdlIHNob3VsZCB1c2UKICAgICAgICAgLy8gdGhhdCB0ZXh0IGFzIG91ciB0 aXRsZS4KLSAgICAgICAgaWYgKHRleHQudGV4dFNvdXJjZSA9PSBBY2Nlc3NpYmlsaXR5VGV4dFNv dXJjZTo6TGFiZWxCeUVsZW1lbnQgJiYgIWNvcmVPYmplY3QtPmV4cG9zZXNUaXRsZVVJRWxlbWVu dCgpKQorICAgICAgICBpZiAodGV4dC50ZXh0U291cmNlID09IEFjY2Vzc2liaWxpdHlUZXh0U291 cmNlOjpMYWJlbEJ5RWxlbWVudCAmJiAhY29yZU9iamVjdC0+dGl0bGVVSUVsZW1lbnQoKSkKICAg ICAgICAgICAgIHJldHVybiB0ZXh0LnRleHQ7CiAKICAgICAgICAgLy8gRWxlbWVudHMgb2Ygcm9s ZSBBY2Nlc3NpYmlsaXR5Um9sZTo6VG9vbGJhciB3aWxsIHJldHVybiBpdHMgdGl0bGUgYXMgQWNj ZXNzaWJpbGl0eVRleHRTb3VyY2U6OkFsdGVybmF0aXZlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmNwcAppbmRleCA3ZTRmODQ2MTE5YzZjOWJiNzViYTg0MzRlYWIxMzk5NmRhNjdiYTgwLi4xZmVi YzljMzdjZTc5Y2QzNzUzZGE5NTNmNDAyYTI2YmU4MjljZTQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmNwcApAQCAtMTkxLDcgKzE5MSw2IEBAIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5p dGlhbGl6ZUF0dHJpYnV0ZURhdGEoQVhDb3JlT2JqZWN0JiBvYmplY3QsIGJvb2wgaXNSb290CiAg ICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OklzR3JhYmJlZCwgb2JqZWN0LmlzR3JhYmJl ZCgpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6RHJvcEVmZmVjdHMsIG9iamVj dC5kZXRlcm1pbmVEcm9wRWZmZWN0cygpKTsKICAgICBzZXRPYmplY3RQcm9wZXJ0eShBWFByb3Bl cnR5TmFtZTo6VGl0bGVVSUVsZW1lbnQsIG9iamVjdC50aXRsZVVJRWxlbWVudCgpKTsKLSAgICBz ZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6RXhwb3Nlc1RpdGxlVUlFbGVtZW50LCBvYmplY3Qu ZXhwb3Nlc1RpdGxlVUlFbGVtZW50KCkpOwogICAgIHNldE9iamVjdFByb3BlcnR5KEFYUHJvcGVy dHlOYW1lOjpWZXJ0aWNhbFNjcm9sbEJhciwgb2JqZWN0LnNjcm9sbEJhcihBY2Nlc3NpYmlsaXR5 T3JpZW50YXRpb246OlZlcnRpY2FsKSk7CiAgICAgc2V0T2JqZWN0UHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWU6Okhvcml6b250YWxTY3JvbGxCYXIsIG9iamVjdC5zY3JvbGxCYXIoQWNjZXNzaWJpbGl0 eU9yaWVudGF0aW9uOjpIb3Jpem9udGFsKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5h bWU6OkFSSUFSb2xlQXR0cmlidXRlLCBzdGF0aWNfY2FzdDxpbnQ+KG9iamVjdC5hcmlhUm9sZUF0 dHJpYnV0ZSgpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lz b2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKaW5kZXggYzAxZWZhZDlkYmNiYThj MGE1MTI3YmYzZTAxNzMzZDJiNGI1OWFlOC4uNDEwOTczOTg5ODZhOGRmMDBkYWE2YWEyMWU0ZTAy NTk2M2I2NmJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaApAQCAtMjUyLDcgKzI1Miw2IEBA IHByaXZhdGU6CiAgICAgQVhDb3JlT2JqZWN0KiBwYXJlbnRPYmplY3RVbmlnbm9yZWQoKSBjb25z dCBvdmVycmlkZTsKICAgICB2b2lkIGxpbmtlZFVJRWxlbWVudHMoQWNjZXNzaWJpbGl0eUNoaWxk cmVuVmVjdG9yJiBjaGlsZHJlbikgY29uc3Qgb3ZlcnJpZGUgeyBmaWxsQ2hpbGRyZW5WZWN0b3JG b3JQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6TGlua2VkVUlFbGVtZW50cywgY2hpbGRyZW4pOyB9 CiAgICAgQVhDb3JlT2JqZWN0KiB0aXRsZVVJRWxlbWVudCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0 dXJuIG9iamVjdEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpUaXRsZVVJRWxlbWVudCk7 IH0KLSAgICBib29sIGV4cG9zZXNUaXRsZVVJRWxlbWVudCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0 dXJuIGJvb2xBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZTo6RXhwb3Nlc1RpdGxlVUlFbGVt ZW50KTsgfQogICAgIEFYQ29yZU9iamVjdCogc2Nyb2xsQmFyKEFjY2Vzc2liaWxpdHlPcmllbnRh dGlvbikgb3ZlcnJpZGU7CiAgICAgQWNjZXNzaWJpbGl0eVJvbGUgYXJpYVJvbGVBdHRyaWJ1dGUo KSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5Um9sZT4o aW50QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OkFSSUFSb2xlQXR0cmlidXRlKSk7IH0K ICAgICBTdHJpbmcgY29tcHV0ZWRMYWJlbCgpIG92ZXJyaWRlIHsgcmV0dXJuIHN0cmluZ0F0dHJp YnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpDb21wdXRlZExhYmVsKTsgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu aCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmgKaW5kZXggMTg5ZGU1YjIzOGUwZmU2ZDg3NDFkODZhZWI2YTBmMTVmZGZhOTI4ZC4uN2Mz NDY5Njc5N2FiNGYwOTY4NDBlZThkZTM3YzA3ODZmYzdkMTllYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJl ZS5oCkBAIC0xMTEsNyArMTExLDYgQEAgZW51bSBjbGFzcyBBWFByb3BlcnR5TmFtZSA6IHVpbnQx Nl90IHsKICAgICBFbWJlZGRlZEltYWdlRGVzY3JpcHRpb24sCiAgICAgRXN0aW1hdGVkTG9hZGlu Z1Byb2dyZXNzLAogICAgIEV4cGFuZGVkVGV4dFZhbHVlLAotICAgIEV4cG9zZXNUaXRsZVVJRWxl bWVudCwKICAgICBGaWxlVXBsb2FkQnV0dG9uUmV0dXJuc1ZhbHVlSW5UaXRsZSwKICAgICBGb2N1 c2FibGVBbmNlc3RvciwKICAgICBIYXNBUklBVmFsdWVOb3csCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1h Yy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyTWFjLm1tCmluZGV4IDg5NzNlMzk1NjQ3NDZkYzM3NWZhNWI2YTAyYzBkYzg1 OTRkZGMxNmIuLjRhNzliM2IzZmIzNzliMWM2YjcwYTc1N2NmZGMwZjVjZGI3MjY2ZDkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFj L1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCkBAIC0yNjM5LDEzICsyNjM5LDgg QEAgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiAgICAgfQogCiAgICAgaWYg KFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlUaXRsZVVJRWxl bWVudEF0dHJpYnV0ZV0pIHsKLSAgICAgICAgaWYgKCFiYWNraW5nT2JqZWN0LT5leHBvc2VzVGl0 bGVVSUVsZW1lbnQoKSkKLSAgICAgICAgICAgIHJldHVybiBuaWw7Ci0KLSAgICAgICAgQVhDb3Jl T2JqZWN0KiBvYmogPSBiYWNraW5nT2JqZWN0LT50aXRsZVVJRWxlbWVudCgpOwotICAgICAgICBp ZiAob2JqKQotICAgICAgICAgICAgcmV0dXJuIG9iai0+d3JhcHBlcigpOwotICAgICAgICByZXR1 cm4gbmlsOworICAgICAgICBhdXRvKiBvYmplY3QgPSBiYWNraW5nT2JqZWN0LT50aXRsZVVJRWxl bWVudCgpOworICAgICAgICByZXR1cm4gb2JqZWN0ID8gb2JqZWN0LT53cmFwcGVyKCkgOiBuaWw7 CiAgICAgfQogCiAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vz c2liaWxpdHlWYWx1ZURlc2NyaXB0aW9uQXR0cmlidXRlXSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvd2luL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyV2luLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvd2luL0FjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyV2luLmNwcAppbmRleCBiYzBmZTgxMjBiMDdjMjY3NzEyZTA4NWU4NzBlMmExYWUwNDcz ZDdjLi40M2U5MzE3OTM1MjM5NjQ4OWI4MmJlMDFlZjA0YzEwMDMwZjY5MTBhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L3dpbi9BY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlcldpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS93aW4vQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJXaW4uY3BwCkBAIC00NSwxNCArNDUsMTAgQEAgdm9pZCBBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlcjo6YWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlKGNvbnN0 IEF0b21TdHJpbmcmIGEKIAogICAgIC8vIE5vdCBhIHJlYWwgY29uY2VwdCBvbiBXaW5kb3dzLCBi dXQgdXNlZCBoZWF2aWx5IGluIFdlYktpdCBhY2Nlc3NpYmlsaXR5IHRlc3RpbmcuCiAgICAgaWYg KGF0dHJpYnV0ZU5hbWUgPT0gIkFYVGl0bGVVSUVsZW1lbnRBdHRyaWJ1dGUiKSB7Ci0gICAgICAg IGlmICghbV9vYmplY3QtPmV4cG9zZXNUaXRsZVVJRWxlbWVudCgpKQotICAgICAgICAgICAgcmV0 dXJuOwotCi0gICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIG9iaiA9IG1fb2JqZWN0LT50aXRs ZVVJRWxlbWVudCgpOwotICAgICAgICBpZiAob2JqKSB7CisgICAgICAgIGlmIChhdXRvKiBvYmpl Y3QgPSBtX29iamVjdC0+dGl0bGVVSUVsZW1lbnQoKSkgewogICAgICAgICAgICAgQVNTRVJUKFZf VlQocmVzdWx0KSA9PSBWVF9FTVBUWSk7CiAgICAgICAgICAgICBWX1ZUKHJlc3VsdCkgPSBWVF9V TktOT1dOOwotICAgICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIqIHdyYXBwZXIg PSBvYmotPndyYXBwZXIoKTsKKyAgICAgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy KiB3cmFwcGVyID0gb2JqZWN0LT53cmFwcGVyKCk7CiAgICAgICAgICAgICBWX1VOS05PV04ocmVz dWx0KSA9IHdyYXBwZXI7CiAgICAgICAgICAgICBpZiAod3JhcHBlcikKICAgICAgICAgICAgICAg ICB3cmFwcGVyLT5BZGRSZWYoKTsK