235950 2022-02-01 07:13:10 -0800 Check AccessibilityRenderObject::m_renderer for null before using it. 2022-02-01 18:48:55 -0800 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 tyler_w webkit-bug-importer oldest_to_newest 1835948 0 andresg_22 2022-02-01 07:13:10 -0800 Check AccessibilityRenderObject::m_renderer for null before using it. 1835949 1 webkit-bug-importer 2022-02-01 07:13:21 -0800 <rdar://problem/88326438> 1835956 2 450524 andresg_22 2022-02-01 07:24:05 -0800 Created attachment 450524 Patch 1835962 3 450524 tyler_w 2022-02-01 07:48:19 -0800 Comment on attachment 450524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450524&action=review > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:-1269 > - AXTRACE("AccessibilityRenderObject::computeAccessibilityIsIgnored"); Did you intend to include this change in this patch? 1836014 4 450540 andresg_22 2022-02-01 09:22:07 -0800 Created attachment 450540 Patch 1836017 5 andresg_22 2022-02-01 09:23:43 -0800 (In reply to Tyler Wilcock from comment #3) > Comment on attachment 450524 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=450524&action=review > > > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:-1269 > > - AXTRACE("AccessibilityRenderObject::computeAccessibilityIsIgnored"); > > Did you intend to include this change in this patch? It was intentional, but I shouldn't since it is not related to the actual change :-). So I removed it from the patch. 1836038 6 450540 cfleizach 2022-02-01 10:09:13 -0800 Comment on attachment 450540 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450540&action=review > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:496 > + if (m_renderer && isWebArea()) can we put this m_renderer check in isWebArea()? 1836065 7 andresg_22 2022-02-01 11:07:37 -0800 (In reply to chris fleizach from comment #6) > Comment on attachment 450540 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=450540&action=review > > > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:496 > > + if (m_renderer && isWebArea()) > > can we put this m_renderer check in isWebArea()? the WebArea AX object is not an AccessibilityRenderObject, as far as I can tell. We create the WebArea object in: AccessibilityObject* AccessibilityScrollView::webAreaObject() const { ... Document* document = downcast<FrameView>(*m_scrollView).frame().document(); ... return cache->getOrCreate(document); ... } and this results in instantiating an AXNodeObject not an AxRenderObject, so it would have no m_renderer. 1836295 8 ews-feeder 2022-02-01 18:48:51 -0800 Committed r288937 (246667@main): <https://commits.webkit.org/246667@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450540. 450524 2022-02-01 07:24:05 -0800 2022-02-01 09:22:04 -0800 Patch bug-235950-20220201102404.patch text/plain 6100 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFiYmFhYzI0MDc4Mjg5 YmYzYTBhMjcwNjU2MjU1MWRjZGUzMjMwNi4uMDZmZTczYmI4NGE0MGI4OThlMGQyNmY4ZDIyNjUz N2I4OTg4YjljZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAyLTAxICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBDaGVjayBBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0OjptX3JlbmRlcmVyIGZvciBudWxsIGJlZm9yZSB1c2luZyBp dC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTk1 MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODgzMjY0Mzg+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 bV9yZW5kZXJlciBpcyBhIFdlYWtQdHIgdGhhdCBjYW4gYmVjb21lIG51bGwKKyAgICAgICAgZHVl IHRvIGEgdmFyaWV0eSBvZiBjaGFuZ2VzIGluIHRoZSByZW5kZXIgdHJlZS4gVGhpcyBwYXRjaCBm aXhlcyBhCisgICAgICAgIG51bWJlciBvZiBjYXNlcyB3aGVyZSBBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0OjptX3JlbmRlcmVyIHdhcyBiZWluZworICAgICAgICB1c2VkIHdpdGhvdXQgY2hlY2tp bmcgZm9yIG51bGwgd2hpY2ggbGVhZHMgdG8gY3Jhc2hlcyBzdWNoIGFzOgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1OTQ1CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU4MjcKKworICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpwYXJlbnRPYmplY3RJZkV4aXN0cyBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpjb21wdXRl QWNjZXNzaWJpbGl0eUlzSWdub3JlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0OjpzZWxlY3Rpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2V0U2VsZWN0ZWRUZXh0UmFuZ2UpOgorICAgICAg ICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZG9jdW1lbnRMaW5rcyk6Cisg ICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxlY3RlZFZp c2libGVQb3NpdGlvblJhbmdlIGNvbnN0KToKKwogMjAyMi0wMi0wMSAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gW0dUS11b V1BFXSBGaXggY29tcGlsZSB3YXJuaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCBlNDMxYzg0 ZWYwZWViNjliMGExMDJjYmVmMWFmZmZlYWFkNTZlNDc2Li45NGQ5YzYwZjY1MmY2ZDgxYzMyYzkx NzU5MzNkOTkyODBkYThlZTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKQEAgLTQ5MSwxMSArNDkx LDEwIEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnBh cmVudE9iamVjdElmRXhpc3RzKCkgY29uc3QKICAgICBBWE9iamVjdENhY2hlKiBjYWNoZSA9IGF4 T2JqZWN0Q2FjaGUoKTsKICAgICBpZiAoIWNhY2hlKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK LSAgICAKKwogICAgIC8vIFdlYkFyZWEncyBwYXJlbnQgc2hvdWxkIGJlIHRoZSBzY3JvbGwgdmll dyBjb250YWluaW5nIGl0LgotICAgIGlmIChpc1dlYkFyZWEoKSkKKyAgICBpZiAobV9yZW5kZXJl ciAmJiBpc1dlYkFyZWEoKSkKICAgICAgICAgcmV0dXJuIGNhY2hlLT5nZXQoJm1fcmVuZGVyZXIt PnZpZXcoKS5mcmFtZVZpZXcoKSk7Ci0KICAgICByZXR1cm4gY2FjaGUtPmdldChyZW5kZXJQYXJl bnRPYmplY3QoKSk7CiB9CiAgICAgCkBAIC0xMjY2LDcgKzEyNjUsNiBAQCBzdGF0aWMgYm9vbCB3 ZWJBcmVhSXNQcmVzZW50YXRpb25hbChSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogICAgIAogYm9v bCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpjb21wdXRlQWNjZXNzaWJpbGl0eUlzSWdub3Jl ZCgpIGNvbnN0CiB7Ci0gICAgQVhUUkFDRSgiQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y29t cHV0ZUFjY2Vzc2liaWxpdHlJc0lnbm9yZWQiKTsKICNpZm5kZWYgTkRFQlVHCiAgICAgQVNTRVJU KG1faW5pdGlhbGl6ZWQpOwogI2VuZGlmCkBAIC0xNjEyLDcgKzE2MTAsNyBAQCBTdHJpbmcgQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNzS2V5KCkgY29uc3QKIAogVmlzaWJsZVNlbGVj dGlvbiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZWxlY3Rpb24oKSBjb25zdAogewotICAg IHJldHVybiBtX3JlbmRlcmVyLT5mcmFtZSgpLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpOworICAg IHJldHVybiBtX3JlbmRlcmVyID8gbV9yZW5kZXJlci0+ZnJhbWUoKS5zZWxlY3Rpb24oKS5zZWxl Y3Rpb24oKSA6IFZpc2libGVTZWxlY3Rpb24oKTsKIH0KIAogUGxhaW5UZXh0UmFuZ2UgQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdDo6c2VsZWN0ZWRUZXh0UmFuZ2UoKSBjb25zdApAQCAtMTY4Miwx MyArMTY4MCwxNCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVk VGV4dFJhbmdlKGNvbnN0IFBsYWluVGV4dFJhbmdlJiByYW5nZQogewogICAgIHNldFRleHRTZWxl Y3Rpb25JbnRlbnQoYXhPYmplY3RDYWNoZSgpLCByYW5nZS5sZW5ndGggPyBBWFRleHRTdGF0ZUNo YW5nZVR5cGVTZWxlY3Rpb25FeHRlbmQgOiBBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25N b3ZlKTsKIAotICAgIGlmIChhdXRvIGNsaWVudCA9IG1fcmVuZGVyZXItPmRvY3VtZW50KCkuZWRp dG9yKCkuY2xpZW50KCkpCisgICAgYXV0byogY2xpZW50ID0gbV9yZW5kZXJlciA/IG1fcmVuZGVy ZXItPmRvY3VtZW50KCkuZWRpdG9yKCkuY2xpZW50KCkgOiBudWxscHRyOworICAgIGlmIChjbGll bnQpCiAgICAgICAgIGNsaWVudC0+d2lsbENoYW5nZVNlbGVjdGlvbkZvckFjY2Vzc2liaWxpdHko KTsKIAogICAgIGlmIChpc05hdGl2ZVRleHRDb250cm9sKCkpIHsKICAgICAgICAgSFRNTFRleHRG b3JtQ29udHJvbEVsZW1lbnQmIHRleHRDb250cm9sID0gZG93bmNhc3Q8UmVuZGVyVGV4dENvbnRy b2w+KCptX3JlbmRlcmVyKS50ZXh0Rm9ybUNvbnRyb2xFbGVtZW50KCk7CiAgICAgICAgIHRleHRD b250cm9sLnNldFNlbGVjdGlvblJhbmdlKHJhbmdlLnN0YXJ0LCByYW5nZS5zdGFydCArIHJhbmdl Lmxlbmd0aCk7Ci0gICAgfSBlbHNlIHsKKyAgICB9IGVsc2UgaWYgKG1fcmVuZGVyZXIpIHsKICAg ICAgICAgQVNTRVJUKG5vZGUoKSk7CiAgICAgICAgIGF1dG8mIG5vZGUgPSAqdGhpcy0+bm9kZSgp OwogICAgICAgICBhdXRvIGVsZW1lbnRSYW5nZSA9IHRoaXMtPmVsZW1lbnRSYW5nZSgpOwpAQCAt MTcwMCwxMCArMTY5OSwxMCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNl bGVjdGVkVGV4dFJhbmdlKGNvbnN0IFBsYWluVGV4dFJhbmdlJiByYW5nZQogICAgICAgICAgICAg ZW5kID0gbWFrZUNvbnRhaW5lck9mZnNldFBvc2l0aW9uKGVsZW1lbnRSYW5nZS0+c3RhcnQpOwog ICAgICAgICBtX3JlbmRlcmVyLT5mcmFtZSgpLnNlbGVjdGlvbigpLnNldFNlbGVjdGlvbihWaXNp YmxlU2VsZWN0aW9uKHN0YXJ0LCBlbmQpLCBGcmFtZVNlbGVjdGlvbjo6ZGVmYXVsdFNldFNlbGVj dGlvbk9wdGlvbnMoVXNlclRyaWdnZXJlZCkpOwogICAgIH0KLSAgICAKKwogICAgIGNsZWFyVGV4 dFNlbGVjdGlvbkludGVudChheE9iamVjdENhY2hlKCkpOwogCi0gICAgaWYgKGF1dG8gY2xpZW50 ID0gbV9yZW5kZXJlci0+ZG9jdW1lbnQoKS5lZGl0b3IoKS5jbGllbnQoKSkKKyAgICBpZiAoY2xp ZW50KQogICAgICAgICBjbGllbnQtPmRpZENoYW5nZVNlbGVjdGlvbkZvckFjY2Vzc2liaWxpdHko KTsKIH0KIApAQCAtMTk4OCw2ICsxOTg3LDkgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNzaWJpbGl0eVBhcmVudEZvckltYWdlTWFwKEgKIAog QVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6ZG9jdW1lbnRMaW5rcygpCiB7CisgICAgaWYgKCFtX3JlbmRlcmVyKQorICAg ICAgICByZXR1cm4geyB9OworCiAgICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHJlc3Vs dDsKICAgICBEb2N1bWVudCYgZG9jdW1lbnQgPSBtX3JlbmRlcmVyLT5kb2N1bWVudCgpOwogICAg IFJlZjxIVE1MQ29sbGVjdGlvbj4gbGlua3MgPSBkb2N1bWVudC5saW5rcygpOwpAQCAtMjI4MSw3 ICsyMjgzLDggQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxlY3RlZFZp c2libGVQb3NpdGlvblJhbmdlKGNvbnN0IFZpc2libGVQb3MKICAgICAgICAgJiYgaXNWaXNpYmxl UG9zaXRpb25SYW5nZUluRGlmZmVyZW50RG9jdW1lbnQocmFuZ2UpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBpZiAoYXV0byBjbGllbnQgPSBtX3JlbmRlcmVyLT5kb2N1bWVudCgpLmVkaXRvcigp LmNsaWVudCgpKQorICAgIGF1dG8qIGNsaWVudCA9IG1fcmVuZGVyZXIgPyBtX3JlbmRlcmVyLT5k b2N1bWVudCgpLmVkaXRvcigpLmNsaWVudCgpIDogbnVsbHB0cjsKKyAgICBpZiAoY2xpZW50KQog ICAgICAgICBjbGllbnQtPndpbGxDaGFuZ2VTZWxlY3Rpb25Gb3JBY2Nlc3NpYmlsaXR5KCk7CiAK ICAgICBpZiAoaXNOYXRpdmVUZXh0Q29udHJvbCgpKSB7CkBAIC0yMzE2LDcgKzIzMTksNyBAQCB2 b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVmlzaWJsZVBvc2l0aW9u UmFuZ2UoY29uc3QgVmlzaWJsZVBvcwogCiAgICAgICAgIHNldFRleHRTZWxlY3Rpb25JbnRlbnQo YXhPYmplY3RDYWNoZSgpLCBzdGFydCA9PSBlbmQgPyBBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxl Y3Rpb25Nb3ZlIDogQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uRXh0ZW5kKTsKICAgICAg ICAgdGV4dENvbnRyb2wtPnNldFNlbGVjdGlvblJhbmdlKHN0YXJ0LCBlbmQpOwotICAgIH0gZWxz ZSB7CisgICAgfSBlbHNlIGlmIChtX3JlbmRlcmVyKSB7CiAgICAgICAgIC8vIE1ha2Ugc2VsZWN0 aW9uIGFuZCB0ZWxsIHRoZSBkb2N1bWVudCB0byB1c2UgaXQuIElmIGl0J3MgemVybyBsZW5ndGgs IHRoZW4gbW92ZSB0byB0aGF0IHBvc2l0aW9uLgogICAgICAgICBpZiAocmFuZ2Uuc3RhcnQgPT0g cmFuZ2UuZW5kKSB7CiAgICAgICAgICAgICBzZXRUZXh0U2VsZWN0aW9uSW50ZW50KGF4T2JqZWN0 Q2FjaGUoKSwgQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uTW92ZSk7CkBAIC0yMzM4LDcg KzIzNDEsNyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVmlz aWJsZVBvc2l0aW9uUmFuZ2UoY29uc3QgVmlzaWJsZVBvcwogCiAgICAgY2xlYXJUZXh0U2VsZWN0 aW9uSW50ZW50KGF4T2JqZWN0Q2FjaGUoKSk7CiAKLSAgICBpZiAoYXV0byBjbGllbnQgPSBtX3Jl bmRlcmVyLT5kb2N1bWVudCgpLmVkaXRvcigpLmNsaWVudCgpKQorICAgIGlmIChjbGllbnQpCiAg ICAgICAgIGNsaWVudC0+ZGlkQ2hhbmdlU2VsZWN0aW9uRm9yQWNjZXNzaWJpbGl0eSgpOwogfQog Cg== 450540 2022-02-01 09:22:07 -0800 2022-02-01 18:48:53 -0800 Patch bug-235950-20220201122206.patch text/plain 5746 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjRjMzQ4NjllOGRmMmYy MDIxZTQzNDllMTg1NDFjMDY0MWEwMTQ3Zi4uZWJlZTJjMjI2ZGVkMDMwM2NmMzMzZGYxZjhkNDkw ZDY3YWYxMDJkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAyLTAxICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBDaGVjayBBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0OjptX3JlbmRlcmVyIGZvciBudWxsIGJlZm9yZSB1c2luZyBp dC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTk1 MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODgzMjY0Mzg+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 bV9yZW5kZXJlciBpcyBhIFdlYWtQdHIgdGhhdCBjYW4gYmVjb21lIG51bGwKKyAgICAgICAgZHVl IHRvIGEgdmFyaWV0eSBvZiBjaGFuZ2VzIGluIHRoZSByZW5kZXIgdHJlZS4gVGhpcyBwYXRjaCBm aXhlcyBhCisgICAgICAgIG51bWJlciBvZiBjYXNlcyB3aGVyZSBBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0OjptX3JlbmRlcmVyIHdhcyBiZWluZworICAgICAgICB1c2VkIHdpdGhvdXQgY2hlY2tp bmcgZm9yIG51bGwgd2hpY2ggbGVhZHMgdG8gY3Jhc2hlcyBzdWNoIGFzOgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1OTQ1CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU4MjcKKworICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpwYXJlbnRPYmplY3RJZkV4aXN0cyBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZWxlY3Rp b24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 c2V0U2VsZWN0ZWRUZXh0UmFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6ZG9jdW1lbnRMaW5rcyk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxlY3RlZFZpc2libGVQb3NpdGlvblJhbmdlIGNvbnN0KToK KwogMjAyMi0wMi0wMSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgQVg6IG51bGxwdHIgY3Jhc2ggdW5kZXIgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y29t cHV0ZUFjY2Vzc2liaWxpdHlJc0lnbm9yZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCmluZGV4IGRiZTc0 NzJjOTFkNjJiNTVjZGRmZTk1NGJkOTA2ZDQzZTc5ZjI2NjEuLjE3NWMyOTViMjYyYTJkYzE4ZDZh MmI4YWVlYmZkZDQxYjkyY2FkMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcApAQCAtNDkxLDkgKzQ5 MSw5IEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnBh cmVudE9iamVjdElmRXhpc3RzKCkgY29uc3QKICAgICBBWE9iamVjdENhY2hlKiBjYWNoZSA9IGF4 T2JqZWN0Q2FjaGUoKTsKICAgICBpZiAoIWNhY2hlKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK LSAgICAKKwogICAgIC8vIFdlYkFyZWEncyBwYXJlbnQgc2hvdWxkIGJlIHRoZSBzY3JvbGwgdmll dyBjb250YWluaW5nIGl0LgotICAgIGlmIChpc1dlYkFyZWEoKSkKKyAgICBpZiAobV9yZW5kZXJl ciAmJiBpc1dlYkFyZWEoKSkKICAgICAgICAgcmV0dXJuIGNhY2hlLT5nZXQoJm1fcmVuZGVyZXIt PnZpZXcoKS5mcmFtZVZpZXcoKSk7CiAKICAgICByZXR1cm4gY2FjaGUtPmdldChyZW5kZXJQYXJl bnRPYmplY3QoKSk7CkBAIC0xNjE3LDcgKzE2MTcsNyBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6YWNjZXNzS2V5KCkgY29uc3QKIAogVmlzaWJsZVNlbGVjdGlvbiBBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0OjpzZWxlY3Rpb24oKSBjb25zdAogewotICAgIHJldHVybiBtX3Jl bmRlcmVyLT5mcmFtZSgpLnNlbGVjdGlvbigpLnNlbGVjdGlvbigpOworICAgIHJldHVybiBtX3Jl bmRlcmVyID8gbV9yZW5kZXJlci0+ZnJhbWUoKS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKSA6IFZp c2libGVTZWxlY3Rpb24oKTsKIH0KIAogUGxhaW5UZXh0UmFuZ2UgQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6c2VsZWN0ZWRUZXh0UmFuZ2UoKSBjb25zdApAQCAtMTY4NywxMyArMTY4NywxNCBA QCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVGV4dFJhbmdlKGNv bnN0IFBsYWluVGV4dFJhbmdlJiByYW5nZQogewogICAgIHNldFRleHRTZWxlY3Rpb25JbnRlbnQo YXhPYmplY3RDYWNoZSgpLCByYW5nZS5sZW5ndGggPyBBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxl Y3Rpb25FeHRlbmQgOiBBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25Nb3ZlKTsKIAotICAg IGlmIChhdXRvIGNsaWVudCA9IG1fcmVuZGVyZXItPmRvY3VtZW50KCkuZWRpdG9yKCkuY2xpZW50 KCkpCisgICAgYXV0byogY2xpZW50ID0gbV9yZW5kZXJlciA/IG1fcmVuZGVyZXItPmRvY3VtZW50 KCkuZWRpdG9yKCkuY2xpZW50KCkgOiBudWxscHRyOworICAgIGlmIChjbGllbnQpCiAgICAgICAg IGNsaWVudC0+d2lsbENoYW5nZVNlbGVjdGlvbkZvckFjY2Vzc2liaWxpdHkoKTsKIAogICAgIGlm IChpc05hdGl2ZVRleHRDb250cm9sKCkpIHsKICAgICAgICAgSFRNTFRleHRGb3JtQ29udHJvbEVs ZW1lbnQmIHRleHRDb250cm9sID0gZG93bmNhc3Q8UmVuZGVyVGV4dENvbnRyb2w+KCptX3JlbmRl cmVyKS50ZXh0Rm9ybUNvbnRyb2xFbGVtZW50KCk7CiAgICAgICAgIHRleHRDb250cm9sLnNldFNl bGVjdGlvblJhbmdlKHJhbmdlLnN0YXJ0LCByYW5nZS5zdGFydCArIHJhbmdlLmxlbmd0aCk7Ci0g ICAgfSBlbHNlIHsKKyAgICB9IGVsc2UgaWYgKG1fcmVuZGVyZXIpIHsKICAgICAgICAgQVNTRVJU KG5vZGUoKSk7CiAgICAgICAgIGF1dG8mIG5vZGUgPSAqdGhpcy0+bm9kZSgpOwogICAgICAgICBh dXRvIGVsZW1lbnRSYW5nZSA9IHRoaXMtPmVsZW1lbnRSYW5nZSgpOwpAQCAtMTcwNSwxMCArMTcw NiwxMCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVGV4dFJh bmdlKGNvbnN0IFBsYWluVGV4dFJhbmdlJiByYW5nZQogICAgICAgICAgICAgZW5kID0gbWFrZUNv bnRhaW5lck9mZnNldFBvc2l0aW9uKGVsZW1lbnRSYW5nZS0+c3RhcnQpOwogICAgICAgICBtX3Jl bmRlcmVyLT5mcmFtZSgpLnNlbGVjdGlvbigpLnNldFNlbGVjdGlvbihWaXNpYmxlU2VsZWN0aW9u KHN0YXJ0LCBlbmQpLCBGcmFtZVNlbGVjdGlvbjo6ZGVmYXVsdFNldFNlbGVjdGlvbk9wdGlvbnMo VXNlclRyaWdnZXJlZCkpOwogICAgIH0KLSAgICAKKwogICAgIGNsZWFyVGV4dFNlbGVjdGlvbklu dGVudChheE9iamVjdENhY2hlKCkpOwogCi0gICAgaWYgKGF1dG8gY2xpZW50ID0gbV9yZW5kZXJl ci0+ZG9jdW1lbnQoKS5lZGl0b3IoKS5jbGllbnQoKSkKKyAgICBpZiAoY2xpZW50KQogICAgICAg ICBjbGllbnQtPmRpZENoYW5nZVNlbGVjdGlvbkZvckFjY2Vzc2liaWxpdHkoKTsKIH0KIApAQCAt MTk5Myw2ICsxOTk0LDkgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6YWNjZXNzaWJpbGl0eVBhcmVudEZvckltYWdlTWFwKEgKIAogQVhDb3JlT2JqZWN0 OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 ZG9jdW1lbnRMaW5rcygpCiB7CisgICAgaWYgKCFtX3JlbmRlcmVyKQorICAgICAgICByZXR1cm4g eyB9OworCiAgICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHJlc3VsdDsKICAgICBEb2N1 bWVudCYgZG9jdW1lbnQgPSBtX3JlbmRlcmVyLT5kb2N1bWVudCgpOwogICAgIFJlZjxIVE1MQ29s bGVjdGlvbj4gbGlua3MgPSBkb2N1bWVudC5saW5rcygpOwpAQCAtMjI4Niw3ICsyMjkwLDggQEAg dm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxlY3RlZFZpc2libGVQb3NpdGlv blJhbmdlKGNvbnN0IFZpc2libGVQb3MKICAgICAgICAgJiYgaXNWaXNpYmxlUG9zaXRpb25SYW5n ZUluRGlmZmVyZW50RG9jdW1lbnQocmFuZ2UpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAo YXV0byBjbGllbnQgPSBtX3JlbmRlcmVyLT5kb2N1bWVudCgpLmVkaXRvcigpLmNsaWVudCgpKQor ICAgIGF1dG8qIGNsaWVudCA9IG1fcmVuZGVyZXIgPyBtX3JlbmRlcmVyLT5kb2N1bWVudCgpLmVk aXRvcigpLmNsaWVudCgpIDogbnVsbHB0cjsKKyAgICBpZiAoY2xpZW50KQogICAgICAgICBjbGll bnQtPndpbGxDaGFuZ2VTZWxlY3Rpb25Gb3JBY2Nlc3NpYmlsaXR5KCk7CiAKICAgICBpZiAoaXNO YXRpdmVUZXh0Q29udHJvbCgpKSB7CkBAIC0yMzIxLDcgKzIzMjYsNyBAQCB2b2lkIEFjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVmlzaWJsZVBvc2l0aW9uUmFuZ2UoY29uc3Qg VmlzaWJsZVBvcwogCiAgICAgICAgIHNldFRleHRTZWxlY3Rpb25JbnRlbnQoYXhPYmplY3RDYWNo ZSgpLCBzdGFydCA9PSBlbmQgPyBBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25Nb3ZlIDog QVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uRXh0ZW5kKTsKICAgICAgICAgdGV4dENvbnRy b2wtPnNldFNlbGVjdGlvblJhbmdlKHN0YXJ0LCBlbmQpOwotICAgIH0gZWxzZSB7CisgICAgfSBl bHNlIGlmIChtX3JlbmRlcmVyKSB7CiAgICAgICAgIC8vIE1ha2Ugc2VsZWN0aW9uIGFuZCB0ZWxs IHRoZSBkb2N1bWVudCB0byB1c2UgaXQuIElmIGl0J3MgemVybyBsZW5ndGgsIHRoZW4gbW92ZSB0 byB0aGF0IHBvc2l0aW9uLgogICAgICAgICBpZiAocmFuZ2Uuc3RhcnQgPT0gcmFuZ2UuZW5kKSB7 CiAgICAgICAgICAgICBzZXRUZXh0U2VsZWN0aW9uSW50ZW50KGF4T2JqZWN0Q2FjaGUoKSwgQVhU ZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uTW92ZSk7CkBAIC0yMzQzLDcgKzIzNDgsNyBAQCB2 b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVmlzaWJsZVBvc2l0aW9u UmFuZ2UoY29uc3QgVmlzaWJsZVBvcwogCiAgICAgY2xlYXJUZXh0U2VsZWN0aW9uSW50ZW50KGF4 T2JqZWN0Q2FjaGUoKSk7CiAKLSAgICBpZiAoYXV0byBjbGllbnQgPSBtX3JlbmRlcmVyLT5kb2N1 bWVudCgpLmVkaXRvcigpLmNsaWVudCgpKQorICAgIGlmIChjbGllbnQpCiAgICAgICAgIGNsaWVu dC0+ZGlkQ2hhbmdlU2VsZWN0aW9uRm9yQWNjZXNzaWJpbGl0eSgpOwogfQogCg==