226239 2021-05-25 13:27:11 -0700 AX: Improve string conversion in AccessibilityController::injectAccessibilityPreference 2021-05-25 17:15:30 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach darin webkit-bug-importer oldest_to_newest 1763652 0 cfleizach 2021-05-25 13:27:11 -0700 Let's improve the string conversion in AccessibilityController::injectAccessibilityPreference 1763653 1 webkit-bug-importer 2021-05-25 13:27:42 -0700 <rdar://problem/78473176> 1763654 2 429687 cfleizach 2021-05-25 13:27:54 -0700 Created attachment 429687 patch 1763656 3 429688 cfleizach 2021-05-25 13:28:36 -0700 Created attachment 429688 patch 1763683 4 429688 darin 2021-05-25 14:15:55 -0700 Comment on attachment 429688 patch This looks great! 1763764 5 ews-feeder 2021-05-25 17:15:29 -0700 Committed r278065 (238146@main): <https://commits.webkit.org/238146@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429688. 429687 2021-05-25 13:27:54 -0700 2021-05-25 13:28:36 -0700 patch file_226239.txt text/plain 6714 cfleizach ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZw0KaW5kZXggNTg3 MzE4ZDIxNmFjLi5mMjliYTE5Nzg2YTAgMTAwNjQ0DQotLS0gYS9Ub29scy9DaGFuZ2VMb2cNCisr KyBiL1Rvb2xzL0NoYW5nZUxvZw0KQEAgLTEsMyArMSwxNiBAQA0KKzIwMjEtMDUtMjUgIENocmlz IEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4NCisNCisgICAgICAgIEFYOiBJbXByb3Zl IHN0cmluZyBjb252ZXJzaW9uIGluIEFjY2Vzc2liaWxpdHlDb250cm9sbGVyOjppbmplY3RBY2Nl c3NpYmlsaXR5UHJlZmVyZW5jZQ0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNjIzOQ0KKw0KKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuDQorDQorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0Fj Y2Vzc2liaWxpdHlDb250cm9sbGVyTWFjLm1tOg0KKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXI6OmluamVjdEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlKToNCisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9XZWJLaXRUZXN0UnVubmVyLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2o6DQorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvY29jb2EvU3RyaW5nRnVuY3Rpb25zQ29j b2EuaDogQWRkZWQuDQorICAgICAgICAoV1RSOjp0b1dLKToNCisNCiAyMDIxLTA1LTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+DQogDQogICAgICAgICBTdG9wIHVzaW5nIFVuY2hl Y2tlZExvY2sgaW4gQ29uZGl0aW9uIEFQSSB0ZXN0cw0KZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlDb250cm9sbGVyTWFj Lm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNjZXNzaWJp bGl0eUNvbnRyb2xsZXJNYWMubW0NCmluZGV4IDFlZDVhMzEyNTY4MS4uMzAyZGU0OGRhYmQ1IDEw MDY0NA0KLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNj ZXNzaWJpbGl0eUNvbnRyb2xsZXJNYWMubW0NCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlDb250cm9sbGVyTWFjLm1tDQpAQCAtOTgs MTEgKzk4LDEwIEBAIHN0YXRpYyBpZCBmaW5kQWNjZXNzaWJsZU9iamVjdEJ5SWQoaWQgb2JqLCBO U1N0cmluZyAqaWRBdHRyaWJ1dGUpDQogdm9pZCBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlcjo6aW5q ZWN0QWNjZXNzaWJpbGl0eVByZWZlcmVuY2UoSlNTdHJpbmdSZWYgZG9tYWluLCBKU1N0cmluZ1Jl ZiBrZXksIEpTU3RyaW5nUmVmIHZhbHVlKQ0KIHsNCiAgICAgYXV0byBwYWdlID0gSW5qZWN0ZWRC dW5kbGU6OnNpbmdsZXRvbigpLnBhZ2UoKS0+cGFnZSgpOw0KLSAgICBhdXRvIGNvbnRleHQgPSBX S0J1bmRsZUZyYW1lR2V0SmF2YVNjcmlwdENvbnRleHQoV0tCdW5kbGVQYWdlR2V0TWFpbkZyYW1l KHBhZ2UpKTsNCiAgICAgTlNOdW1iZXIgKm51bWJlclZhbHVlID0gQChbW05TU3RyaW5nIHN0cmlu Z1dpdGhKU1N0cmluZ1JlZjp2YWx1ZV0gaW50ZWdlclZhbHVlXSk7DQogICAgIE5TRGF0YSAqZW5j b2RlZERhdGEgPSBbTlNLZXllZEFyY2hpdmVyIGFyY2hpdmVkRGF0YVdpdGhSb290T2JqZWN0Om51 bWJlclZhbHVlIHJlcXVpcmluZ1NlY3VyZUNvZGluZzpZRVMgZXJyb3I6bmlsXTsNCiAgICAgTlNT dHJpbmcgKmVuY29kZWRTdHJpbmcgPSBbZW5jb2RlZERhdGEgYmFzZTY0RW5jb2RlZFN0cmluZ1dp dGhPcHRpb25zOjBdOw0KLSAgICBXS0FjY2Vzc2liaWxpdHlUZXN0aW5nSW5qZWN0UHJlZmVyZW5j ZShwYWdlLCB0b1dLU3RyaW5nKGNvbnRleHQsIEpTVmFsdWVNYWtlU3RyaW5nKGNvbnRleHQsIGRv bWFpbikpLmdldCgpLCB0b1dLU3RyaW5nKGNvbnRleHQsIEpTVmFsdWVNYWtlU3RyaW5nKGNvbnRl eHQsIGtleSkpLmdldCgpLCB0b1dLKChTdHJpbmcpZW5jb2RlZFN0cmluZykuZ2V0KCkpOw0KKyAg ICBXS0FjY2Vzc2liaWxpdHlUZXN0aW5nSW5qZWN0UHJlZmVyZW5jZShwYWdlLCB0b1dLKGRvbWFp bikuZ2V0KCksIHRvV0soa2V5KS5nZXQoKSwgdG9XSyhlbmNvZGVkU3RyaW5nKS5nZXQoKSk7DQog fQ0KIA0KIFJlZlB0cjxBY2Nlc3NpYmlsaXR5VUlFbGVtZW50PiBBY2Nlc3NpYmlsaXR5Q29udHJv bGxlcjo6YWNjZXNzaWJsZUVsZW1lbnRCeUlkKEpTU3RyaW5nUmVmIGlkQXR0cmlidXRlKQ0KZGlm ZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvV2ViS2l0VGVzdFJ1bm5lci54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9XZWJLaXRUZXN0UnVu bmVyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oNCmluZGV4IDlkMWZmZjJlOTJkYS4uZDkwZjM5 Y2JkZTM1IDEwMDY0NA0KLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9XZWJLaXRUZXN0UnVu bmVyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oNCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvV2ViS2l0VGVzdFJ1bm5lci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qDQpAQCAtNjcsNiAr NjcsNyBAQA0KIAkJMUNCQTAyOTkxRkQ4N0RGMzAwMTc5QzdEIC8qIEZha2VIZWx2ZXRpY2EtSGVs dmV0aWNhLTQwMC50dGYgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDFDQkEwMjk0MUZEODZFQTEwMDE3OUM3RCAvKiBGYWtlSGVsdmV0aWNhLUhlbHZldGlj YS00MDAudHRmICovOyB9Ow0KIAkJMUNFQTg0REQyMDM3ODJFRDAwNDQwRDA4IC8qIEZha2VIZWx2 ZXRpY2EtQXJtZW5pYW5DaGFyYWN0ZXIudHRmIGluIFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQ0VBODREQzIwMzc4MkVEMDA0NDBEMDggLyogRmFrZUhlbHZl dGljYS1Bcm1lbmlhbkNoYXJhY3Rlci50dGYgKi87IH07DQogCQkyNzdDQ0VERDI1MEYzMDBBMDA1 MEM1NzIgLyogVUlTY3JpcHRDb250cm9sbGVyQ29tbW9uLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI3QTcxOTY5MjUwRjBDRTEwMDkzQTFFMiAvKiBV SVNjcmlwdENvbnRyb2xsZXJDb21tb24uY3BwICovOyB9Ow0KKwkJMjkwNEZBMUUyNjVDQzVEOTAw QTdFQkM5IC8qIFN0cmluZ0Z1bmN0aW9uc0NvY29hLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyOTA0RkExRDI2NUNDNUQ5MDBBN0VCQzkgLyogU3RyaW5n RnVuY3Rpb25zQ29jb2EuaCAqLzsgfTsNCiAJCTI5MjEwRUFFMTQ0Q0FDQjcwMDgzNUJCNSAvKiBB Y2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDI5MjEwRUE5MTQ0Q0FDQjIwMDgzNUJCNSAvKiBBY2Nlc3NpYmlsaXR5 VUlFbGVtZW50LmNwcCAqLzsgfTsNCiAJCTI5MjEwRUIwMTQ0Q0FDQkQwMDgzNUJCNSAvKiBBY2Nl c3NpYmlsaXR5Q29udHJvbGxlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAyOTIxMEVBMjE0NENBQUE1MDA4MzVCQjUgLyogQWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuY3BwICovOyB9Ow0KIAkJMjkyMTBFQjQxNDRDQUNENTAwODM1QkI1IC8qIEFjY2Vz c2liaWxpdHlUZXh0TWFya2VyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDI5MjEwRUIxMTQ0Q0FDRDQwMDgzNUJCNSAvKiBBY2Nlc3NpYmlsaXR5VGV4 dE1hcmtlci5jcHAgKi87IH07DQpAQCAtMjYxLDYgKzI2Miw3IEBADQogCQkyNkQ3NThFNjE2MEJF Q0REMDAyNjg0NzIgLyogR2VvbG9jYXRpb25Qcm92aWRlck1vY2suaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gR2VvbG9jYXRpb25Qcm92aWRlck1vY2suaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsNCiAJCTI3QTcxOTY5MjUwRjBDRTEwMDkzQTFFMiAvKiBVSVNjcmlwdENv bnRyb2xsZXJDb21tb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g VUlTY3JpcHRDb250cm9sbGVyQ29tbW9uLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsN CiAJCTI3QTcxOTZBMjUwRjBDRkYwMDkzQTFFMiAvKiBVSVNjcmlwdENvbnRyb2xsZXJDb21tb24u aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVUlTY3JpcHRDb250cm9sbGVyQ29t bW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07DQorCQkyOTA0RkExRDI2NUNDNUQ5MDBB N0VCQzkgLyogU3RyaW5nRnVuY3Rpb25zQ29jb2EuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gU3RyaW5nRnVu Y3Rpb25zQ29jb2EuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsNCiAJCTI5MjEwRUEyMTQ0 Q0FBQTUwMDgzNUJCNSAvKiBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5jcHAgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5jcHA7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07DQogCQkyOTIxMEVBMzE0NENBQUE1MDA4MzVCQjUgLyog QWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsN CiAJCTI5MjEwRUE4MTQ0Q0FCODgwMDgzNUJCNSAvKiBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5p ZGwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuaWRsOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9Ow0KQEAgLTYyNyw2ICs2MjksNyBAQA0KIAkJCWNoaWxk cmVuID0gKA0KIAkJCQkwRkVCOTBBMjE5MDVCQzZBMDAwRkRCRjMgLyogQ3Jhc2hSZXBvcnRlcklu Zm8uaCAqLywNCiAJCQkJMEZFQjkwQTMxOTA1QkM2QTAwMEZEQkYzIC8qIENyYXNoUmVwb3J0ZXJJ bmZvLm1tICovLA0KKwkJCQkyOTA0RkExRDI2NUNDNUQ5MDBBN0VCQzkgLyogU3RyaW5nRnVuY3Rp b25zQ29jb2EuaCAqLywNCiAJCQkJMkRDRTJDRDExQjg0NTI0NTAwQzdGODMyIC8qIFRlc3RDb250 cm9sbGVyQ29jb2EubW0gKi8sDQogCQkJCTBGODdCNjE0MUJBQ0M0QjkwMDRFQzU3MiAvKiBUZXN0 UnVubmVyV0tXZWJWaWV3LmggKi8sDQogCQkJCTBGODdCNjE1MUJBQ0M0QjkwMDRFQzU3MiAvKiBU ZXN0UnVubmVyV0tXZWJWaWV3Lm1tICovLA0KQEAgLTk3OSw2ICs5ODIsNyBAQA0KIAkJCQkyREI2 MTg3RTFEN0Q1OEQ0MDA5NzhEMTkgLyogQ29yZUdyYXBoaWNzVGVzdFNQSS5oIGluIEhlYWRlcnMg Ki8sDQogCQkJCTJERDRDNDlBMUQ2RTdEM0IwMDA3Mzc5QyAvKiBFdmVudFNlcmlhbGl6ZXJNYWMu aCBpbiBIZWFkZXJzICovLA0KIAkJCQkwRjczQjU1MjFCQTc4OTY4MDA0QjNFRjQgLyogSlNVSVNj cmlwdENvbnRyb2xsZXIuaCBpbiBIZWFkZXJzICovLA0KKwkJCQkyOTA0RkExRTI2NUNDNUQ5MDBB N0VCQzkgLyogU3RyaW5nRnVuY3Rpb25zQ29jb2EuaCBpbiBIZWFkZXJzICovLA0KIAkJCQkyREZB OTg0ODFEN0Y3MENGMDBBRkYyQzkgLyogU2hhcmVkRXZlbnRTdHJlYW1zTWFjLmggaW4gSGVhZGVy cyAqLywNCiAJCQkJMkQwNThFMDkyMkUyRUUyMjAwRTRDMTQ1IC8qIFVJU2NyaXB0Q29udHJvbGxl ckNvY29hLmggaW4gSGVhZGVycyAqLywNCiAJCQkJMkQwNThFMEIyMkUyRUY2RDAwRTRDMTQ1IC8q IFVJU2NyaXB0Q29udHJvbGxlck1hYy5oIGluIEhlYWRlcnMgKi8sDQpkaWZmIC0tZ2l0IGEvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9TdHJpbmdGdW5jdGlvbnNDb2NvYS5oIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9TdHJpbmdGdW5jdGlvbnNDb2NvYS5oDQppbmRleCAxNGY5 ZjRmODE4MTUuLmUwNGE3N2JjM2FkZSAxMDA2NDQNCi0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvY29jb2EvU3RyaW5nRnVuY3Rpb25zQ29jb2EuaA0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9jb2NvYS9TdHJpbmdGdW5jdGlvbnNDb2NvYS5oDQpAQCAtMjUsMyArMjUsMTMgQEANCiAN CiAjcHJhZ21hIG9uY2UNCiANCisjaW5jbHVkZSAiU3RyaW5nRnVuY3Rpb25zLmgiDQorDQorbmFt ZXNwYWNlIFdUUiB7DQorDQoraW5saW5lIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB0b1dLKE5T U3RyaW5nICpzdHJpbmcpDQorew0KKyAgICByZXR1cm4gdG9XSyhzdHJpbmcuY3JlYXRlSlNTdHJp bmdSZWYoKS5nZXQoKSk7DQorfQ0KKw0KK30gLy8gbmFtZXNwYWNlIFdUUg0K 429688 2021-05-25 13:28:36 -0700 2021-05-25 17:15:30 -0700 patch file_226239.txt text/plain 8086 cfleizach ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZw0KaW5kZXggNTg3 MzE4ZDIxNmFjLi5mMjliYTE5Nzg2YTAgMTAwNjQ0DQotLS0gYS9Ub29scy9DaGFuZ2VMb2cNCisr KyBiL1Rvb2xzL0NoYW5nZUxvZw0KQEAgLTEsMyArMSwxNiBAQA0KKzIwMjEtMDUtMjUgIENocmlz IEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4NCisNCisgICAgICAgIEFYOiBJbXByb3Zl IHN0cmluZyBjb252ZXJzaW9uIGluIEFjY2Vzc2liaWxpdHlDb250cm9sbGVyOjppbmplY3RBY2Nl c3NpYmlsaXR5UHJlZmVyZW5jZQ0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNjIzOQ0KKw0KKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuDQorDQorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0Fj Y2Vzc2liaWxpdHlDb250cm9sbGVyTWFjLm1tOg0KKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXI6OmluamVjdEFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlKToNCisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9XZWJLaXRUZXN0UnVubmVyLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2o6DQorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvY29jb2EvU3RyaW5nRnVuY3Rpb25zQ29j b2EuaDogQWRkZWQuDQorICAgICAgICAoV1RSOjp0b1dLKToNCisNCiAyMDIxLTA1LTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+DQogDQogICAgICAgICBTdG9wIHVzaW5nIFVuY2hl Y2tlZExvY2sgaW4gQ29uZGl0aW9uIEFQSSB0ZXN0cw0KZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlDb250cm9sbGVyTWFj Lm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNjZXNzaWJp bGl0eUNvbnRyb2xsZXJNYWMubW0NCmluZGV4IDFlZDVhMzEyNTY4MS4uMzAyZGU0OGRhYmQ1IDEw MDY0NA0KLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNj ZXNzaWJpbGl0eUNvbnRyb2xsZXJNYWMubW0NCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlDb250cm9sbGVyTWFjLm1tDQpAQCAtOTgs MTEgKzk4LDEwIEBAIHN0YXRpYyBpZCBmaW5kQWNjZXNzaWJsZU9iamVjdEJ5SWQoaWQgb2JqLCBO U1N0cmluZyAqaWRBdHRyaWJ1dGUpDQogdm9pZCBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlcjo6aW5q ZWN0QWNjZXNzaWJpbGl0eVByZWZlcmVuY2UoSlNTdHJpbmdSZWYgZG9tYWluLCBKU1N0cmluZ1Jl ZiBrZXksIEpTU3RyaW5nUmVmIHZhbHVlKQ0KIHsNCiAgICAgYXV0byBwYWdlID0gSW5qZWN0ZWRC dW5kbGU6OnNpbmdsZXRvbigpLnBhZ2UoKS0+cGFnZSgpOw0KLSAgICBhdXRvIGNvbnRleHQgPSBX S0J1bmRsZUZyYW1lR2V0SmF2YVNjcmlwdENvbnRleHQoV0tCdW5kbGVQYWdlR2V0TWFpbkZyYW1l KHBhZ2UpKTsNCiAgICAgTlNOdW1iZXIgKm51bWJlclZhbHVlID0gQChbW05TU3RyaW5nIHN0cmlu Z1dpdGhKU1N0cmluZ1JlZjp2YWx1ZV0gaW50ZWdlclZhbHVlXSk7DQogICAgIE5TRGF0YSAqZW5j b2RlZERhdGEgPSBbTlNLZXllZEFyY2hpdmVyIGFyY2hpdmVkRGF0YVdpdGhSb290T2JqZWN0Om51 bWJlclZhbHVlIHJlcXVpcmluZ1NlY3VyZUNvZGluZzpZRVMgZXJyb3I6bmlsXTsNCiAgICAgTlNT dHJpbmcgKmVuY29kZWRTdHJpbmcgPSBbZW5jb2RlZERhdGEgYmFzZTY0RW5jb2RlZFN0cmluZ1dp dGhPcHRpb25zOjBdOw0KLSAgICBXS0FjY2Vzc2liaWxpdHlUZXN0aW5nSW5qZWN0UHJlZmVyZW5j ZShwYWdlLCB0b1dLU3RyaW5nKGNvbnRleHQsIEpTVmFsdWVNYWtlU3RyaW5nKGNvbnRleHQsIGRv bWFpbikpLmdldCgpLCB0b1dLU3RyaW5nKGNvbnRleHQsIEpTVmFsdWVNYWtlU3RyaW5nKGNvbnRl eHQsIGtleSkpLmdldCgpLCB0b1dLKChTdHJpbmcpZW5jb2RlZFN0cmluZykuZ2V0KCkpOw0KKyAg ICBXS0FjY2Vzc2liaWxpdHlUZXN0aW5nSW5qZWN0UHJlZmVyZW5jZShwYWdlLCB0b1dLKGRvbWFp bikuZ2V0KCksIHRvV0soa2V5KS5nZXQoKSwgdG9XSyhlbmNvZGVkU3RyaW5nKS5nZXQoKSk7DQog fQ0KIA0KIFJlZlB0cjxBY2Nlc3NpYmlsaXR5VUlFbGVtZW50PiBBY2Nlc3NpYmlsaXR5Q29udHJv bGxlcjo6YWNjZXNzaWJsZUVsZW1lbnRCeUlkKEpTU3RyaW5nUmVmIGlkQXR0cmlidXRlKQ0KZGlm ZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvV2ViS2l0VGVzdFJ1bm5lci54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9XZWJLaXRUZXN0UnVu bmVyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oNCmluZGV4IDlkMWZmZjJlOTJkYS4uZDkwZjM5 Y2JkZTM1IDEwMDY0NA0KLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9XZWJLaXRUZXN0UnVu bmVyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oNCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvV2ViS2l0VGVzdFJ1bm5lci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qDQpAQCAtNjcsNiAr NjcsNyBAQA0KIAkJMUNCQTAyOTkxRkQ4N0RGMzAwMTc5QzdEIC8qIEZha2VIZWx2ZXRpY2EtSGVs dmV0aWNhLTQwMC50dGYgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDFDQkEwMjk0MUZEODZFQTEwMDE3OUM3RCAvKiBGYWtlSGVsdmV0aWNhLUhlbHZldGlj YS00MDAudHRmICovOyB9Ow0KIAkJMUNFQTg0REQyMDM3ODJFRDAwNDQwRDA4IC8qIEZha2VIZWx2 ZXRpY2EtQXJtZW5pYW5DaGFyYWN0ZXIudHRmIGluIFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQ0VBODREQzIwMzc4MkVEMDA0NDBEMDggLyogRmFrZUhlbHZl dGljYS1Bcm1lbmlhbkNoYXJhY3Rlci50dGYgKi87IH07DQogCQkyNzdDQ0VERDI1MEYzMDBBMDA1 MEM1NzIgLyogVUlTY3JpcHRDb250cm9sbGVyQ29tbW9uLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI3QTcxOTY5MjUwRjBDRTEwMDkzQTFFMiAvKiBV SVNjcmlwdENvbnRyb2xsZXJDb21tb24uY3BwICovOyB9Ow0KKwkJMjkwNEZBMUUyNjVDQzVEOTAw QTdFQkM5IC8qIFN0cmluZ0Z1bmN0aW9uc0NvY29hLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyOTA0RkExRDI2NUNDNUQ5MDBBN0VCQzkgLyogU3RyaW5n RnVuY3Rpb25zQ29jb2EuaCAqLzsgfTsNCiAJCTI5MjEwRUFFMTQ0Q0FDQjcwMDgzNUJCNSAvKiBB Y2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDI5MjEwRUE5MTQ0Q0FDQjIwMDgzNUJCNSAvKiBBY2Nlc3NpYmlsaXR5 VUlFbGVtZW50LmNwcCAqLzsgfTsNCiAJCTI5MjEwRUIwMTQ0Q0FDQkQwMDgzNUJCNSAvKiBBY2Nl c3NpYmlsaXR5Q29udHJvbGxlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAyOTIxMEVBMjE0NENBQUE1MDA4MzVCQjUgLyogQWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuY3BwICovOyB9Ow0KIAkJMjkyMTBFQjQxNDRDQUNENTAwODM1QkI1IC8qIEFjY2Vz c2liaWxpdHlUZXh0TWFya2VyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDI5MjEwRUIxMTQ0Q0FDRDQwMDgzNUJCNSAvKiBBY2Nlc3NpYmlsaXR5VGV4 dE1hcmtlci5jcHAgKi87IH07DQpAQCAtMjYxLDYgKzI2Miw3IEBADQogCQkyNkQ3NThFNjE2MEJF Q0REMDAyNjg0NzIgLyogR2VvbG9jYXRpb25Qcm92aWRlck1vY2suaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gR2VvbG9jYXRpb25Qcm92aWRlck1vY2suaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsNCiAJCTI3QTcxOTY5MjUwRjBDRTEwMDkzQTFFMiAvKiBVSVNjcmlwdENv bnRyb2xsZXJDb21tb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g VUlTY3JpcHRDb250cm9sbGVyQ29tbW9uLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsN CiAJCTI3QTcxOTZBMjUwRjBDRkYwMDkzQTFFMiAvKiBVSVNjcmlwdENvbnRyb2xsZXJDb21tb24u aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gVUlTY3JpcHRDb250cm9sbGVyQ29t bW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07DQorCQkyOTA0RkExRDI2NUNDNUQ5MDBB N0VCQzkgLyogU3RyaW5nRnVuY3Rpb25zQ29jb2EuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gU3RyaW5nRnVu Y3Rpb25zQ29jb2EuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsNCiAJCTI5MjEwRUEyMTQ0 Q0FBQTUwMDgzNUJCNSAvKiBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5jcHAgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5jcHA7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07DQogCQkyOTIxMEVBMzE0NENBQUE1MDA4MzVCQjUgLyog QWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsN CiAJCTI5MjEwRUE4MTQ0Q0FCODgwMDgzNUJCNSAvKiBBY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5p ZGwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuaWRsOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9Ow0KQEAgLTYyNyw2ICs2MjksNyBAQA0KIAkJCWNoaWxk cmVuID0gKA0KIAkJCQkwRkVCOTBBMjE5MDVCQzZBMDAwRkRCRjMgLyogQ3Jhc2hSZXBvcnRlcklu Zm8uaCAqLywNCiAJCQkJMEZFQjkwQTMxOTA1QkM2QTAwMEZEQkYzIC8qIENyYXNoUmVwb3J0ZXJJ bmZvLm1tICovLA0KKwkJCQkyOTA0RkExRDI2NUNDNUQ5MDBBN0VCQzkgLyogU3RyaW5nRnVuY3Rp b25zQ29jb2EuaCAqLywNCiAJCQkJMkRDRTJDRDExQjg0NTI0NTAwQzdGODMyIC8qIFRlc3RDb250 cm9sbGVyQ29jb2EubW0gKi8sDQogCQkJCTBGODdCNjE0MUJBQ0M0QjkwMDRFQzU3MiAvKiBUZXN0 UnVubmVyV0tXZWJWaWV3LmggKi8sDQogCQkJCTBGODdCNjE1MUJBQ0M0QjkwMDRFQzU3MiAvKiBU ZXN0UnVubmVyV0tXZWJWaWV3Lm1tICovLA0KQEAgLTk3OSw2ICs5ODIsNyBAQA0KIAkJCQkyREI2 MTg3RTFEN0Q1OEQ0MDA5NzhEMTkgLyogQ29yZUdyYXBoaWNzVGVzdFNQSS5oIGluIEhlYWRlcnMg Ki8sDQogCQkJCTJERDRDNDlBMUQ2RTdEM0IwMDA3Mzc5QyAvKiBFdmVudFNlcmlhbGl6ZXJNYWMu aCBpbiBIZWFkZXJzICovLA0KIAkJCQkwRjczQjU1MjFCQTc4OTY4MDA0QjNFRjQgLyogSlNVSVNj cmlwdENvbnRyb2xsZXIuaCBpbiBIZWFkZXJzICovLA0KKwkJCQkyOTA0RkExRTI2NUNDNUQ5MDBB N0VCQzkgLyogU3RyaW5nRnVuY3Rpb25zQ29jb2EuaCBpbiBIZWFkZXJzICovLA0KIAkJCQkyREZB OTg0ODFEN0Y3MENGMDBBRkYyQzkgLyogU2hhcmVkRXZlbnRTdHJlYW1zTWFjLmggaW4gSGVhZGVy cyAqLywNCiAJCQkJMkQwNThFMDkyMkUyRUUyMjAwRTRDMTQ1IC8qIFVJU2NyaXB0Q29udHJvbGxl ckNvY29hLmggaW4gSGVhZGVycyAqLywNCiAJCQkJMkQwNThFMEIyMkUyRUY2RDAwRTRDMTQ1IC8q IFVJU2NyaXB0Q29udHJvbGxlck1hYy5oIGluIEhlYWRlcnMgKi8sDQpkaWZmIC0tZ2l0IGEvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9TdHJpbmdGdW5jdGlvbnNDb2NvYS5oIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9TdHJpbmdGdW5jdGlvbnNDb2NvYS5oDQpuZXcgZmlsZSBt b2RlIDEwMDY0NA0KaW5kZXggMDAwMDAwMDAwMDAwLi5lMDRhNzdiYzNhZGUNCi0tLSAvZGV2L251 bGwNCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvU3RyaW5nRnVuY3Rpb25zQ29j b2EuaA0KQEAgLTAsMCArMSwzNyBAQA0KKy8qDQorICogQ29weXJpZ2h0IChDKSAyMDIxIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCisgKg0KKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dA0KKyAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucw0KKyAqIGFyZSBtZXQ6DQorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQNCisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuDQorICogMi4gUmVk aXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5 cmlnaHQNCisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIgaW4gdGhlDQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4NCisgKg0KKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycNCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywNCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSDQorICogUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMg Q09OVFJJQlVUT1JTDQorICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUg0KKyAqIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GDQorICogU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTDQorICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4NCisgKiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQ0KKyAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YNCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuDQorICov DQorDQorI3ByYWdtYSBvbmNlDQorDQorI2luY2x1ZGUgIlN0cmluZ0Z1bmN0aW9ucy5oIg0KKw0K K25hbWVzcGFjZSBXVFIgew0KKw0KK2lubGluZSBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gdG9X SyhOU1N0cmluZyAqc3RyaW5nKQ0KK3sNCisgICAgcmV0dXJuIHRvV0soc3RyaW5nLmNyZWF0ZUpT U3RyaW5nUmVmKCkuZ2V0KCkpOw0KK30NCisNCit9IC8vIG5hbWVzcGFjZSBXVFINCg==