247350 2022-11-01 18:09:15 -0700 AX: Render tree continuations can cause parts of the AX tree to be duplicated 2022-11-05 13:39:13 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1909689 0 tyler_w 2022-11-01 18:09:15 -0700 We partially solved this in https://bugs.webkit.org/show_bug.cgi?id=157818, but that change isn't enough to prevent the problem in all cases. 1909690 1 webkit-bug-importer 2022-11-01 18:09:26 -0700 <rdar://problem/101835073> 1909803 2 463364 tyler_w 2022-11-02 10:33:05 -0700 Created attachment 463364 Patch 1909806 3 tyler_w 2022-11-02 10:38:18 -0700 rdar://101506601 1909807 4 463364 cfleizach 2022-11-02 10:39:59 -0700 Comment on attachment 463364 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=463364&action=review > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:408 > + return nextObject->nextSibling(); do we need to check if return nextObject->nextSibling(); == nil and then fall down to next case? 1909808 5 463365 tyler_w 2022-11-02 10:43:32 -0700 Created attachment 463365 Patch 1909809 6 tyler_w 2022-11-02 10:44:29 -0700 (In reply to chris fleizach from comment #4) > Comment on attachment 463364 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=463364&action=review > > > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:408 > > + return nextObject->nextSibling(); > > do we need to check if return nextObject->nextSibling(); == nil and then > fall down to next case? No, because if we aren't able to compute a non-null nextSibling by this point then there is nothing left to do besides also returning nullptr. I've re-ordered the logic a bit in the latest revision to make this more clear. 1909810 7 463366 tyler_w 2022-11-02 10:46:33 -0700 Created attachment 463366 Patch 1909816 8 andresg_22 2022-11-02 11:32:14 -0700 (In reply to Tyler Wilcock from comment #7) > Created attachment 463366 [details] > Patch Don't we have a similar problem with previousSibling? 1909817 9 tyler_w 2022-11-02 11:37:11 -0700 (In reply to Andres Gonzalez from comment #8) > (In reply to Tyler Wilcock from comment #7) > > Created attachment 463366 [details] > > Patch > > Don't we have a similar problem with previousSibling? Yeah, we might need to apply the same fix to previousSibling in the future. This fix is especially important for nextSibling because it's used in AccessibilityRenderObject::addChildren, while previousSibling is not. We can re-evaluate later on. 1910576 10 ews-feeder 2022-11-05 13:39:11 -0700 Committed 256363@main (ade47b72cbb4): <https://commits.webkit.org/256363@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 463366. 463364 2022-11-02 10:33:05 -0700 2022-11-02 10:43:30 -0700 Patch bug-247350-20221102103305.patch text/plain 2600 tyler_w RnJvbSBlZjI1ZDU1YWJkNTE3YzdiZGQzOTUwNzcxOTNmZGU2MjA3YjgxZjEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogV2VkLCAyIE5vdiAyMDIyIDEwOjIyOjE2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IFJl bmRlciB0cmVlIGNvbnRpbnVhdGlvbnMgY2FuIGNhdXNlIHBhcnRzIG9mIHRoZSBBWCB0cmVlCiB0 byBiZSBkdXBsaWNhdGVkIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NDczNTAKIHJkYXI6Ly8xMDE1MDY2MDEKTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0 ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKV2UgcGFydGlhbGx5IHNvbHZlZCB0aGlzIGlu IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc4MTgsCmJ1dCB0aGF0 IGNoYW5nZSBpc24ndCBlbm91Z2ggdG8gcHJldmVudCB0aGUgcHJvYmxlbSBpbiBhbGwgY2FzZXMg YmVjYXVzZQppdCB3YXMgc2NvcGVkIHRvbyBuYXJyb3dseSDigJTCoG9ubHkgc2tpcHBpbmcgdGhl IGNvbXB1dGVkIG5leHQgc2libGluZyBpZgpgbV9yZW5kZXJlcmAgaGFkIGEgcGFyZW50IHdpdGgg YW4gaW5saW5lIGNvbnRpbnVhdGlvbi4KCldpdGggdGhpcyBwYXRjaCwgd2Ugbm93IHNraXAgYW55 IGNvbXB1dGVkIG5leHRTaWJsaW5nIHdoZW4gaXQgaGFzIHRoZQpzYW1lIG5vbi1udWxsIG5vZGUg YXMgYG1fcmVuZGVyZXJgLgoKRGVzcGl0ZSBtYW55IGF0dGVtcHRzLCBJIHdhc24ndCBhYmxlIHRv IGNvbnN0cnVjdCBhIHRlc3RjYXNlIGZvciB0aGlzIG9uZSwKYnV0IEkgaGF2ZSBtYW51YWxseSBj b25maXJtZWQgdGhhdCB0aGUgYnVnIGlzIGZpeGVkLgoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgooV2ViQ29yZTo6QWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdDo6bmV4dFNpYmxpbmcgY29uc3QpOgotLS0KIC4uLi9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwICAgIHwgMTQgKysrKysrKy0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAKaW5kZXggNTM4NDQ3OTQ2MzI5Li5iMTczOGM1NWQ2NzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0LmNwcApAQCAtMzk5LDEzICszOTksMTMgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bmV4dFNpYmxpbmcoKSBjb25zdAogICAgICAgICAvLyBD YXNlIDViOiBjb250aW51YXRpb24gaXMgYW4gaW5saW5lIC0gaW4gdGhpcyBjYXNlIHRoZSBpbmxp bmUncyBmaXJzdCBjaGlsZCBpcyB0aGUgbmV4dCBzaWJsaW5nCiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIG5leHRTaWJsaW5nID0gZmlyc3RDaGlsZENvbnNpZGVyaW5nQ29udGludWF0aW9uKGNv bnRpbnVhdGlvbik7Ci0gICAgICAgIAotICAgICAgICAvLyBBZnRlciBjYXNlIDQsIHRoZXJlIGFy ZSBjaGFuY2VzIHRoYXQgbmV4dFNpYmxpbmcgaGFzIHRoZSBzYW1lIG5vZGUgYXMgdGhlIGN1cnJl bnQgcmVuZGVyZXIsCi0gICAgICAgIC8vIHdoaWNoIG1pZ2h0IGxlYWQgdG8gYWRkaW5nIHRoZSBz YW1lIGNoaWxkIHJlcGVhdGVkbHkuCi0gICAgICAgIGlmIChuZXh0U2libGluZyAmJiBuZXh0U2li bGluZy0+bm9kZSgpID09IG1fcmVuZGVyZXItPm5vZGUoKSkgewotICAgICAgICAgICAgaWYgKEFj Y2Vzc2liaWxpdHlPYmplY3QqIG5leHRPYmogPSBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRl KG5leHRTaWJsaW5nKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbmV4dE9iai0+bmV4dFNpYmxp bmcoKTsKLSAgICAgICAgfQorICAgIH0KKworICAgIC8vIEFmdGVyIGNhc2UgNCwgdGhlcmUgYXJl IGNoYW5jZXMgdGhhdCBuZXh0U2libGluZyBoYXMgdGhlIHNhbWUgbm9kZSBhcyB0aGUgY3VycmVu dCByZW5kZXJlciwKKyAgICAvLyB3aGljaCBtaWdodCBsZWFkIHRvIGFkZGluZyB0aGUgc2FtZSBj aGlsZCByZXBlYXRlZGx5LgorICAgIGlmIChuZXh0U2libGluZyAmJiBuZXh0U2libGluZy0+bm9k ZSgpICYmIG5leHRTaWJsaW5nLT5ub2RlKCkgPT0gbV9yZW5kZXJlci0+bm9kZSgpKSB7CisgICAg ICAgIGlmIChhdXRvKiBuZXh0T2JqZWN0ID0gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShu ZXh0U2libGluZykpCisgICAgICAgICAgICByZXR1cm4gbmV4dE9iamVjdC0+bmV4dFNpYmxpbmco KTsKICAgICB9CiAKICAgICBpZiAoIW5leHRTaWJsaW5nKQo= 463365 2022-11-02 10:43:32 -0700 2022-11-02 10:46:31 -0700 Patch bug-247350-20221102104331.patch text/plain 2702 tyler_w RnJvbSA2NDNlNWM0YTliOWE0ZmFhN2E1OTZhMjI1OGYzOGRjYTA5YjQyZjcwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogV2VkLCAyIE5vdiAyMDIyIDEwOjIyOjE2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IFJl bmRlciB0cmVlIGNvbnRpbnVhdGlvbnMgY2FuIGNhdXNlIHBhcnRzIG9mIHRoZSBBWCB0cmVlCiB0 byBiZSBkdXBsaWNhdGVkIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NDczNTAKIHJkYXI6Ly8xMDE1MDY2MDEKTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0 ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKV2UgcGFydGlhbGx5IHNvbHZlZCB0aGlzIGlu IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc4MTgsCmJ1dCB0aGF0 IGNoYW5nZSBpc24ndCBlbm91Z2ggdG8gcHJldmVudCB0aGUgcHJvYmxlbSBpbiBhbGwgY2FzZXMg YmVjYXVzZQppdCB3YXMgc2NvcGVkIHRvbyBuYXJyb3dseSDigJTCoG9ubHkgc2tpcHBpbmcgdGhl IGNvbXB1dGVkIG5leHQgc2libGluZyBpZgpgbV9yZW5kZXJlcmAgaGFkIGEgcGFyZW50IHdpdGgg YW4gaW5saW5lIGNvbnRpbnVhdGlvbi4KCldpdGggdGhpcyBwYXRjaCwgd2Ugbm93IHNraXAgYW55 IGNvbXB1dGVkIG5leHRTaWJsaW5nIHdoZW4gaXQgaGFzIHRoZQpzYW1lIG5vbi1udWxsIG5vZGUg YXMgYG1fcmVuZGVyZXJgLgoKRGVzcGl0ZSBtYW55IGF0dGVtcHRzLCBJIHdhc24ndCBhYmxlIHRv IGNvbnN0cnVjdCBhIHRlc3RjYXNlIGZvciB0aGlzIG9uZSwKYnV0IEkgaGF2ZSBtYW51YWxseSBj b25maXJtZWQgdGhhdCB0aGUgYnVnIGlzIGZpeGVkLgoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgooV2ViQ29yZTo6QWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdDo6bmV4dFNpYmxpbmcgY29uc3QpOgotLS0KIC4uLi9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwICAgIHwgMTQgKysrKysrKy0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAKaW5kZXggNTM4NDQ3OTQ2MzI5Li4yZjAwMjdjNmQ4NjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0LmNwcApAQCAtMzk5LDE4ICszOTksMTggQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bmV4dFNpYmxpbmcoKSBjb25zdAogICAgICAgICAvLyBD YXNlIDViOiBjb250aW51YXRpb24gaXMgYW4gaW5saW5lIC0gaW4gdGhpcyBjYXNlIHRoZSBpbmxp bmUncyBmaXJzdCBjaGlsZCBpcyB0aGUgbmV4dCBzaWJsaW5nCiAgICAgICAgIGVsc2UKICAgICAg ICAgICAgIG5leHRTaWJsaW5nID0gZmlyc3RDaGlsZENvbnNpZGVyaW5nQ29udGludWF0aW9uKGNv bnRpbnVhdGlvbik7Ci0gICAgICAgIAotICAgICAgICAvLyBBZnRlciBjYXNlIDQsIHRoZXJlIGFy ZSBjaGFuY2VzIHRoYXQgbmV4dFNpYmxpbmcgaGFzIHRoZSBzYW1lIG5vZGUgYXMgdGhlIGN1cnJl bnQgcmVuZGVyZXIsCi0gICAgICAgIC8vIHdoaWNoIG1pZ2h0IGxlYWQgdG8gYWRkaW5nIHRoZSBz YW1lIGNoaWxkIHJlcGVhdGVkbHkuCi0gICAgICAgIGlmIChuZXh0U2libGluZyAmJiBuZXh0U2li bGluZy0+bm9kZSgpID09IG1fcmVuZGVyZXItPm5vZGUoKSkgewotICAgICAgICAgICAgaWYgKEFj Y2Vzc2liaWxpdHlPYmplY3QqIG5leHRPYmogPSBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRl KG5leHRTaWJsaW5nKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbmV4dE9iai0+bmV4dFNpYmxp bmcoKTsKLSAgICAgICAgfQogICAgIH0KIAogICAgIGlmICghbmV4dFNpYmxpbmcpCiAgICAgICAg IHJldHVybiBudWxscHRyOwogCisgICAgLy8gQWZ0ZXIgY2FzZSA0LCB0aGVyZSBhcmUgY2hhbmNl cyB0aGF0IG5leHRTaWJsaW5nIGhhcyB0aGUgc2FtZSBub2RlIGFzIHRoZSBjdXJyZW50IHJlbmRl cmVyLAorICAgIC8vIHdoaWNoIG1pZ2h0IGxlYWQgdG8gYWRkaW5nIHRoZSBzYW1lIGNoaWxkIHJl cGVhdGVkbHkuCisgICAgaWYgKG5leHRTaWJsaW5nLT5ub2RlKCkgJiYgbmV4dFNpYmxpbmctPm5v ZGUoKSA9PSBtX3JlbmRlcmVyLT5ub2RlKCkpIHsKKyAgICAgICAgaWYgKGF1dG8qIG5leHRPYmpl Y3QgPSBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKG5leHRTaWJsaW5nKSkKKyAgICAgICAg ICAgIHJldHVybiBuZXh0T2JqZWN0LT5uZXh0U2libGluZygpOworICAgIH0KKwogICAgIGF1dG8q IG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOwogICAgIGlmICghb2JqZWN0Q2FjaGUpCiAg ICAgICAgIHJldHVybiBudWxscHRyOwo= 463366 2022-11-02 10:46:33 -0700 2022-11-05 13:39:12 -0700 Patch bug-247350-20221102104632.patch text/plain 2903 tyler_w RnJvbSBhMzQ4NmVjYzZlNjRjZDVmZTg0YmMwZWNiODQzZGQyM2NlMjc2MmE1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogV2VkLCAyIE5vdiAyMDIyIDEwOjIyOjE2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IFJl bmRlciB0cmVlIGNvbnRpbnVhdGlvbnMgY2FuIGNhdXNlIHBhcnRzIG9mIHRoZSBBWCB0cmVlCiB0 byBiZSBkdXBsaWNhdGVkIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NDczNTAKIHJkYXI6Ly8xMDE1MDY2MDEKTUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0 ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDhiaXQK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKV2UgcGFydGlhbGx5IHNvbHZlZCB0aGlzIGlu IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc4MTgsCmJ1dCB0aGF0 IGNoYW5nZSBpc24ndCBlbm91Z2ggdG8gcHJldmVudCB0aGUgcHJvYmxlbSBpbiBhbGwgY2FzZXMg YmVjYXVzZQppdCB3YXMgc2NvcGVkIHRvbyBuYXJyb3dseSDigJTCoG9ubHkgc2tpcHBpbmcgdGhl IGNvbXB1dGVkIG5leHQgc2libGluZyBpZgpgbV9yZW5kZXJlcmAgaGFkIGEgcGFyZW50IHdpdGgg YW4gaW5saW5lIGNvbnRpbnVhdGlvbi4KCldpdGggdGhpcyBwYXRjaCwgd2Ugbm93IHNraXAgYW55 IGNvbXB1dGVkIG5leHRTaWJsaW5nIHdoZW4gaXQgaGFzIHRoZQpzYW1lIG5vbi1udWxsIG5vZGUg YXMgYG1fcmVuZGVyZXJgLgoKRGVzcGl0ZSBtYW55IGF0dGVtcHRzLCBJIHdhc24ndCBhYmxlIHRv IGNvbnN0cnVjdCBhIHRlc3RjYXNlIGZvciB0aGlzIG9uZSwKYnV0IEkgaGF2ZSBtYW51YWxseSBj b25maXJtZWQgdGhhdCB0aGUgYnVnIGlzIGZpeGVkLgoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgooV2ViQ29yZTo6QWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdDo6bmV4dFNpYmxpbmcgY29uc3QpOgotLS0KIC4uLi9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwICAgIHwgMTQgKysrKysrKy0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAKaW5kZXggNTM4NDQ3OTQ2MzI5Li5hMWU2ZTAwMmVkOTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0LmNwcApAQCAtMzk5LDEzICszOTksNiBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpuZXh0U2libGluZygpIGNvbnN0CiAgICAgICAgIC8vIENh c2UgNWI6IGNvbnRpbnVhdGlvbiBpcyBhbiBpbmxpbmUgLSBpbiB0aGlzIGNhc2UgdGhlIGlubGlu ZSdzIGZpcnN0IGNoaWxkIGlzIHRoZSBuZXh0IHNpYmxpbmcKICAgICAgICAgZWxzZQogICAgICAg ICAgICAgbmV4dFNpYmxpbmcgPSBmaXJzdENoaWxkQ29uc2lkZXJpbmdDb250aW51YXRpb24oY29u dGludWF0aW9uKTsKLSAgICAgICAgCi0gICAgICAgIC8vIEFmdGVyIGNhc2UgNCwgdGhlcmUgYXJl IGNoYW5jZXMgdGhhdCBuZXh0U2libGluZyBoYXMgdGhlIHNhbWUgbm9kZSBhcyB0aGUgY3VycmVu dCByZW5kZXJlciwKLSAgICAgICAgLy8gd2hpY2ggbWlnaHQgbGVhZCB0byBhZGRpbmcgdGhlIHNh bWUgY2hpbGQgcmVwZWF0ZWRseS4KLSAgICAgICAgaWYgKG5leHRTaWJsaW5nICYmIG5leHRTaWJs aW5nLT5ub2RlKCkgPT0gbV9yZW5kZXJlci0+bm9kZSgpKSB7Ci0gICAgICAgICAgICBpZiAoQWNj ZXNzaWJpbGl0eU9iamVjdCogbmV4dE9iaiA9IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUo bmV4dFNpYmxpbmcpKQotICAgICAgICAgICAgICAgIHJldHVybiBuZXh0T2JqLT5uZXh0U2libGlu ZygpOwotICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKCFuZXh0U2libGluZykKQEAgLTQxNSw2 ICs0MDgsMTMgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dDo6bmV4dFNpYmxpbmcoKSBjb25zdAogICAgIGlmICghb2JqZWN0Q2FjaGUpCiAgICAgICAgIHJl dHVybiBudWxscHRyOwogCisgICAgLy8gQWZ0ZXIgY2FzZSA0LCB0aGVyZSBhcmUgY2hhbmNlcyB0 aGF0IG5leHRTaWJsaW5nIGhhcyB0aGUgc2FtZSBub2RlIGFzIHRoZSBjdXJyZW50IHJlbmRlcmVy LAorICAgIC8vIHdoaWNoIG1pZ2h0IGxlYWQgdG8gYWRkaW5nIHRoZSBzYW1lIGNoaWxkIHJlcGVh dGVkbHkuCisgICAgaWYgKG5leHRTaWJsaW5nLT5ub2RlKCkgJiYgbmV4dFNpYmxpbmctPm5vZGUo KSA9PSBtX3JlbmRlcmVyLT5ub2RlKCkpIHsKKyAgICAgICAgaWYgKGF1dG8qIG5leHRPYmplY3Qg PSBvYmplY3RDYWNoZS0+Z2V0T3JDcmVhdGUobmV4dFNpYmxpbmcpKQorICAgICAgICAgICAgcmV0 dXJuIG5leHRPYmplY3QtPm5leHRTaWJsaW5nKCk7CisgICAgfQorCiAgICAgYXV0byogbmV4dE9i amVjdCA9IG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShuZXh0U2libGluZyk7CiAgICAgYXV0byog bmV4dE9iamVjdFBhcmVudCA9IG5leHRPYmplY3QgPyBuZXh0T2JqZWN0LT5wYXJlbnRPYmplY3Qo KSA6IG51bGxwdHI7CiAgICAgYXV0byogdGhpc1BhcmVudCA9IHBhcmVudE9iamVjdCgpOwo=