209208 2020-03-17 18:41:39 -0700 Remove unneeded and incorrect respondsToSelector check. 2020-03-18 12:19:34 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner commit-queue darin thorton oldest_to_newest 1630980 0 megan_gardner 2020-03-17 18:41:39 -0700 Remove unneeded and incorrect respondsToSelector check. 1630981 1 393807 megan_gardner 2020-03-17 18:42:41 -0700 Created attachment 393807 Patch 1630983 2 393807 thorton 2020-03-17 18:55:01 -0700 Comment on attachment 393807 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393807&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:8703 > return NO; You should remove this extra return NO. Also, there's another similar respondsToSelector check nearby that can be removed 1630985 3 393807 thorton 2020-03-17 18:59:10 -0700 Comment on attachment 393807 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393807&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:8703 >> return NO; > > You should remove this extra return NO. > > Also, there's another similar respondsToSelector check nearby that can be removed Actually, maybe this method doesn't need a return value anymore? Does that perhaps simplify the calling code too? That might be nice. 1631001 4 393815 megan_gardner 2020-03-17 19:39:57 -0700 Created attachment 393815 Patch 1631190 5 393867 megan_gardner 2020-03-18 09:11:58 -0700 Created attachment 393867 Patch 1631237 6 megan_gardner 2020-03-18 10:34:13 -0700 <rdar://problem/60512470> 1631261 7 393867 commit-queue 2020-03-18 11:15:48 -0700 Comment on attachment 393867 Patch Clearing flags on attachment: 393867 Committed r258653: <https://trac.webkit.org/changeset/258653> 1631262 8 commit-queue 2020-03-18 11:15:50 -0700 All reviewed patches have been landed. Closing bug. 1631283 9 darin 2020-03-18 12:05:37 -0700 One small probably-unimportant pedantic question: if these were incorrect, why is there no behavior change? 1631290 10 thorton 2020-03-18 12:19:34 -0700 (In reply to Darin Adler from comment #9) > One small probably-unimportant pedantic question: if these were incorrect, > why is there no behavior change? Because the selector it checked and the selector we used happened to be introduced at the same time :) 393807 2020-03-17 18:42:41 -0700 2020-03-17 19:39:55 -0700 Patch bug-209208-20200317184241.patch text/plain 2886 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA4NDM4YmMwNTFhZDcyMDRl ZmEwZDEzOTg4OTgyNTcxM2UwNGNjZTYuLjIzZDYxOWE4Yjg5NDIyMGI1YTQ4M2ZiOWFlNDk4ZmVl NjQ4ZTEyNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMTcgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdW5uZWVk ZWQgYW5kIGluY29ycmVjdCByZXNwb25kc1RvU2VsZWN0b3IgY2hlY2suCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkyMDgKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBiZWhhdmlvdXIgY2hhbmdlLCBu byB0ZXN0cyBuZWVkZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjb250aW51ZUNvbnRleHRN ZW51SW50ZXJhY3Rpb25XaXRoRGF0YURldGVjdG9yczpdKToKKwogMjAyMC0wMy0xNiAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIENyYXNoIHVuZGVyIFdlYkNvb2tp ZUNhY2hlOjpjbGVhckZvckhvc3QoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggMjlkOTMxODNmY2ZiMzg1 ZTA2ODNiZTJmNDZhMjhhMDhhMGZkNTk0OS4uMGVhYjE5NGMzMjc0OTE0OTBkYWE2ZmYyNmU1ZDk3 NWNjNWI2YTIzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC04NjkxLDE1ICs4NjkxLDEzIEBAIC0gKEJP T0wpY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uV2l0aERhdGFEZXRlY3RvcnM6KHZvaWQo XikoVUlDb250ZXh0TWVudUNvCiB7CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOwog ICAgIGF1dG8gZGRDb250ZXh0TWVudUFjdGlvbkNsYXNzID0gZ2V0RERDb250ZXh0TWVudUFjdGlv bkNsYXNzKCk7Ci0gICAgaWYgKFtkZENvbnRleHRNZW51QWN0aW9uQ2xhc3MgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3Rvcihjb250ZXh0TWVudUNvbmZpZ3VyYXRpb25XaXRoVVJMOmluVmlldzpj b250ZXh0Om1lbnVJZGVudGlmaWVyOildKSB7Ci0gICAgICAgIFVSTCBsaW5rVVJMID0gX3Bvc2l0 aW9uSW5mb3JtYXRpb24udXJsOwotICAgICAgICBOU0RpY3Rpb25hcnkgKmNvbnRleHQgPSBbc2Vs ZiBkYXRhRGV0ZWN0aW9uQ29udGV4dEZvclBvc2l0aW9uSW5mb3JtYXRpb246X3Bvc2l0aW9uSW5m b3JtYXRpb25dOwotICAgICAgICBVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqY29uZmlndXJh dGlvbkZyb21ERCA9IFtkZENvbnRleHRNZW51QWN0aW9uQ2xhc3MgY29udGV4dE1lbnVDb25maWd1 cmF0aW9uRm9yVVJMOmxpbmtVUkwgaWRlbnRpZmllcjpfcG9zaXRpb25JbmZvcm1hdGlvbi5kYXRh RGV0ZWN0b3JJZGVudGlmaWVyIHNlbGVjdGVkVGV4dDpbc2VsZiBzZWxlY3RlZFRleHRdIHJlc3Vs dHM6X3Bvc2l0aW9uSW5mb3JtYXRpb24uZGF0YURldGVjdG9yUmVzdWx0cy5nZXQoKSBpblZpZXc6 c2VsZiBjb250ZXh0OmNvbnRleHQgbWVudUlkZW50aWZpZXI6bmlsXTsKLSAgICAgICAgX2NvbnRl eHRNZW51QWN0aW9uUHJvdmlkZXJEZWxlZ2F0ZU5lZWRzT3ZlcnJpZGUgPSBZRVM7Ci0gICAgICAg IF9wYWdlLT5zdGFydEludGVyYWN0aW9uV2l0aFBvc2l0aW9uSW5mb3JtYXRpb24oX3Bvc2l0aW9u SW5mb3JtYXRpb24pOwotICAgICAgICBjb250aW51ZVdpdGhDb250ZXh0TWVudUNvbmZpZ3VyYXRp b24oY29uZmlndXJhdGlvbkZyb21ERCk7Ci0gICAgICAgIHJldHVybiBZRVM7Ci0gICAgfQorICAg IFVSTCBsaW5rVVJMID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24udXJsOworICAgIE5TRGljdGlvbmFy eSAqY29udGV4dCA9IFtzZWxmIGRhdGFEZXRlY3Rpb25Db250ZXh0Rm9yUG9zaXRpb25JbmZvcm1h dGlvbjpfcG9zaXRpb25JbmZvcm1hdGlvbl07CisgICAgVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRp b24gKmNvbmZpZ3VyYXRpb25Gcm9tREQgPSBbZGRDb250ZXh0TWVudUFjdGlvbkNsYXNzIGNvbnRl eHRNZW51Q29uZmlndXJhdGlvbkZvclVSTDpsaW5rVVJMIGlkZW50aWZpZXI6X3Bvc2l0aW9uSW5m b3JtYXRpb24uZGF0YURldGVjdG9ySWRlbnRpZmllciBzZWxlY3RlZFRleHQ6W3NlbGYgc2VsZWN0 ZWRUZXh0XSByZXN1bHRzOl9wb3NpdGlvbkluZm9ybWF0aW9uLmRhdGFEZXRlY3RvclJlc3VsdHMu Z2V0KCkgaW5WaWV3OnNlbGYgY29udGV4dDpjb250ZXh0IG1lbnVJZGVudGlmaWVyOm5pbF07Cisg ICAgX2NvbnRleHRNZW51QWN0aW9uUHJvdmlkZXJEZWxlZ2F0ZU5lZWRzT3ZlcnJpZGUgPSBZRVM7 CisgICAgX3BhZ2UtPnN0YXJ0SW50ZXJhY3Rpb25XaXRoUG9zaXRpb25JbmZvcm1hdGlvbihfcG9z aXRpb25JbmZvcm1hdGlvbik7CisgICAgY29udGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0 aW9uKGNvbmZpZ3VyYXRpb25Gcm9tREQpOworICAgIHJldHVybiBZRVM7CiAgICAgRU5EX0JMT0NL X09CSkNfRVhDRVBUSU9OUzsKIAogICAgIHJldHVybiBOTzsK 393815 2020-03-17 19:39:57 -0700 2020-03-18 09:11:57 -0700 Patch bug-209208-20200317193956.patch text/plain 6732 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA4NDM4YmMwNTFhZDcyMDRl ZmEwZDEzOTg4OTgyNTcxM2UwNGNjZTYuLmNlNDBhZDUyMWM2ZGY5YmQ2NDdkN2U4YTAyYjE4OGVl ZjFjY2E0YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDMtMTcgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdW5uZWVk ZWQgYW5kIGluY29ycmVjdCByZXNwb25kc1RvU2VsZWN0b3IgY2hlY2tzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MjA4CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82MDUxMjQ3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBiZWhhdmlvdXIgY2hhbmdlLCBubyB0ZXN0cyBuZWVkZWQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBjb250aW51ZUNvbnRleHRNZW51SW50ZXJhY3Rpb25XaXRoRGF0 YURldGVjdG9yczpdKToKKwogMjAyMC0wMy0xNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIENyYXNoIHVuZGVyIFdlYkNvb2tpZUNhY2hlOjpjbGVhckZvckhvc3Qo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KaW5kZXggMjlkOTMxODNmY2ZiMzg1ZTA2ODNiZTJmNDZhMjhhMDhhMGZk NTk0OS4uNmU1Y2Y3YjZhMmU0ZmM0ODkzNTg0MDY4YWY5ZWQ4ZDQxNWM1ZTU2MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCkBAIC04NDMyLDE4ICs4NDMyLDE2IEBAIC0gKHZvaWQpYXNzaWduTGVnYWN5RGF0YUZv ckNvbnRleHRNZW51SW50ZXJhY3Rpb24KICAgICAgICAgLy8gYW5kIGNyZWF0ZSBvbmUuIFdlIG5l ZWQgdG8gcmVwbGljYXRlIHRoaXMgY29kZSBmb3IgdGhlIG5ldyBBUEkuCiAgICAgICAgIGlmICgh cHJldmlld1ZpZXdDb250cm9sbGVyIHx8IFsoTlNVUkwgKil1cmwgaVR1bmVzU3RvcmVVUkxdKSB7 CiAgICAgICAgICAgICBhdXRvIGRkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyA9IGdldEREQ29udGV4 dE1lbnVBY3Rpb25DbGFzcygpOwotICAgICAgICAgICAgaWYgKFtkZENvbnRleHRNZW51QWN0aW9u Q2xhc3MgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihjb250ZXh0TWVudUNvbmZpZ3VyYXRp b25Gb3JVUkw6aWRlbnRpZmllcjpzZWxlY3RlZFRleHQ6cmVzdWx0czppblZpZXc6Y29udGV4dDpt ZW51SWRlbnRpZmllcjopXSkgewotICAgICAgICAgICAgICAgIEJFR0lOX0JMT0NLX09CSkNfRVhD RVBUSU9OUzsKLSAgICAgICAgICAgICAgICBOU0RpY3Rpb25hcnkgKmNvbnRleHQgPSBbc2VsZiBk YXRhRGV0ZWN0aW9uQ29udGV4dEZvclBvc2l0aW9uSW5mb3JtYXRpb246X3Bvc2l0aW9uSW5mb3Jt YXRpb25dOwotICAgICAgICAgICAgICAgIFJldGFpblB0cjxVSUNvbnRleHRNZW51Q29uZmlndXJh dGlvbj4gZGF0YURldGVjdG9yc1Jlc3VsdCA9IFtkZENvbnRleHRNZW51QWN0aW9uQ2xhc3MgY29u dGV4dE1lbnVDb25maWd1cmF0aW9uRm9yVVJMOnVybCBpZGVudGlmaWVyOl9wb3NpdGlvbkluZm9y bWF0aW9uLmRhdGFEZXRlY3RvcklkZW50aWZpZXIgc2VsZWN0ZWRUZXh0OnNlbGYuc2VsZWN0ZWRU ZXh0IHJlc3VsdHM6X3Bvc2l0aW9uSW5mb3JtYXRpb24uZGF0YURldGVjdG9yUmVzdWx0cy5nZXQo KSBpblZpZXc6c2VsZiBjb250ZXh0OmNvbnRleHQgbWVudUlkZW50aWZpZXI6bmlsXTsKLSAgICAg ICAgICAgICAgICBpZiAoX3Nob3dMaW5rUHJldmlld3MgJiYgZGF0YURldGVjdG9yc1Jlc3VsdCAm JiBkYXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLnByZXZpZXdQcm92aWRlcikKLSAgICAgICAgICAg ICAgICAgICAgX2NvbnRleHRNZW51TGVnYWN5UHJldmlld0NvbnRyb2xsZXIgPSBkYXRhRGV0ZWN0 b3JzUmVzdWx0LmdldCgpLnByZXZpZXdQcm92aWRlcigpOwotICAgICAgICAgICAgICAgIGlmIChk YXRhRGV0ZWN0b3JzUmVzdWx0ICYmIGRhdGFEZXRlY3RvcnNSZXN1bHQuZ2V0KCkuYWN0aW9uUHJv dmlkZXIpIHsKLSAgICAgICAgICAgICAgICAgICAgYXV0byBtZW51RWxlbWVudHMgPSBtZW51RWxl bWVudHNGcm9tRGVmYXVsdEFjdGlvbnMoZGVmYXVsdEFjdGlvbnNGcm9tQXNzaXN0YW50LCBlbGVt ZW50SW5mbyk7Ci0gICAgICAgICAgICAgICAgICAgIF9jb250ZXh0TWVudUxlZ2FjeU1lbnUgPSBk YXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLmFjdGlvblByb3ZpZGVyKG1lbnVFbGVtZW50cyk7Ci0g ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElP TlM7CisgICAgICAgICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisgICAgICAgICAg ICBOU0RpY3Rpb25hcnkgKmNvbnRleHQgPSBbc2VsZiBkYXRhRGV0ZWN0aW9uQ29udGV4dEZvclBv c2l0aW9uSW5mb3JtYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb25dOworICAgICAgICAgICAgUmV0 YWluUHRyPFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uPiBkYXRhRGV0ZWN0b3JzUmVzdWx0ID0g W2RkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyBjb250ZXh0TWVudUNvbmZpZ3VyYXRpb25Gb3JVUkw6 dXJsIGlkZW50aWZpZXI6X3Bvc2l0aW9uSW5mb3JtYXRpb24uZGF0YURldGVjdG9ySWRlbnRpZmll ciBzZWxlY3RlZFRleHQ6c2VsZi5zZWxlY3RlZFRleHQgcmVzdWx0czpfcG9zaXRpb25JbmZvcm1h dGlvbi5kYXRhRGV0ZWN0b3JSZXN1bHRzLmdldCgpIGluVmlldzpzZWxmIGNvbnRleHQ6Y29udGV4 dCBtZW51SWRlbnRpZmllcjpuaWxdOworICAgICAgICAgICAgaWYgKF9zaG93TGlua1ByZXZpZXdz ICYmIGRhdGFEZXRlY3RvcnNSZXN1bHQgJiYgZGF0YURldGVjdG9yc1Jlc3VsdC5nZXQoKS5wcmV2 aWV3UHJvdmlkZXIpCisgICAgICAgICAgICAgICAgX2NvbnRleHRNZW51TGVnYWN5UHJldmlld0Nv bnRyb2xsZXIgPSBkYXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLnByZXZpZXdQcm92aWRlcigpOwor ICAgICAgICAgICAgaWYgKGRhdGFEZXRlY3RvcnNSZXN1bHQgJiYgZGF0YURldGVjdG9yc1Jlc3Vs dC5nZXQoKS5hY3Rpb25Qcm92aWRlcikgeworICAgICAgICAgICAgICAgIGF1dG8gbWVudUVsZW1l bnRzID0gbWVudUVsZW1lbnRzRnJvbURlZmF1bHRBY3Rpb25zKGRlZmF1bHRBY3Rpb25zRnJvbUFz c2lzdGFudCwgZWxlbWVudEluZm8pOworICAgICAgICAgICAgICAgIF9jb250ZXh0TWVudUxlZ2Fj eU1lbnUgPSBkYXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLmFjdGlvblByb3ZpZGVyKG1lbnVFbGVt ZW50cyk7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJ T05TOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTg1ODYsOCArODU4NCw4 IEBAIC0gKHZvaWQpY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uOih2b2lkKF4pKFVJQ29u dGV4dE1lbnVDb25maWd1cmF0aW9uICopKWNvCiAKICNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJT04p CiAgICAgaWYgKFsoTlNVUkwgKilsaW5rVVJMIGlUdW5lc1N0b3JlVVJMXSkgewotICAgICAgICBp ZiAoW3NlbGYgY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uV2l0aERhdGFEZXRlY3RvcnM6 Y29udGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uXSkKLSAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgW3NlbGYgY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uV2l0aERhdGFE ZXRlY3RvcnM6Y29udGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uXTsKKyAgICAgICAg cmV0dXJuOwogICAgIH0KICNlbmRpZgogCkBAIC04NjQ5LDggKzg2NDcsOCBAQCAtICh2b2lkKWNv bnRpbnVlQ29udGV4dE1lbnVJbnRlcmFjdGlvbjoodm9pZCheKShVSUNvbnRleHRNZW51Q29uZmln dXJhdGlvbiAqKSljbwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAg aWYgKFtzdHJvbmdTZWxmIGNvbnRpbnVlQ29udGV4dE1lbnVJbnRlcmFjdGlvbldpdGhEYXRhRGV0 ZWN0b3JzOmNvbnRpbnVlV2l0aENvbnRleHRNZW51Q29uZmlndXJhdGlvbi5nZXQoKV0pCi0gICAg ICAgICAgICByZXR1cm47CisgICAgICAgIFtzdHJvbmdTZWxmIGNvbnRpbnVlQ29udGV4dE1lbnVJ bnRlcmFjdGlvbldpdGhEYXRhRGV0ZWN0b3JzOmNvbnRpbnVlV2l0aENvbnRleHRNZW51Q29uZmln dXJhdGlvbi5nZXQoKV07CisgICAgICAgIHJldHVybjsKICNlbmRpZgogICAgICAgICBjb250aW51 ZVdpdGhDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24obmlsKTsKICAgICB9KTsKQEAgLTg2ODcsMjIg Kzg2ODUsMTcgQEAgLSAodm9pZCljb250aW51ZUNvbnRleHRNZW51SW50ZXJhY3Rpb246KHZvaWQo XikoVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKikpY28KIH0KIAogI2lmIEVOQUJMRShEQVRB X0RFVEVDVElPTikKLS0gKEJPT0wpY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uV2l0aERh dGFEZXRlY3RvcnM6KHZvaWQoXikoVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKikpY29udGlu dWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uCistICh2b2lkKWNvbnRpbnVlQ29udGV4dE1l bnVJbnRlcmFjdGlvbldpdGhEYXRhRGV0ZWN0b3JzOih2b2lkKF4pKFVJQ29udGV4dE1lbnVDb25m aWd1cmF0aW9uICopKWNvbnRpbnVlV2l0aENvbnRleHRNZW51Q29uZmlndXJhdGlvbgogewogICAg IEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKICAgICBhdXRvIGRkQ29udGV4dE1lbnVBY3Rp b25DbGFzcyA9IGdldEREQ29udGV4dE1lbnVBY3Rpb25DbGFzcygpOwotICAgIGlmIChbZGRDb250 ZXh0TWVudUFjdGlvbkNsYXNzIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoY29udGV4dE1l bnVDb25maWd1cmF0aW9uV2l0aFVSTDppblZpZXc6Y29udGV4dDptZW51SWRlbnRpZmllcjopXSkg ewotICAgICAgICBVUkwgbGlua1VSTCA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLnVybDsKLSAgICAg ICAgTlNEaWN0aW9uYXJ5ICpjb250ZXh0ID0gW3NlbGYgZGF0YURldGVjdGlvbkNvbnRleHRGb3JQ b3NpdGlvbkluZm9ybWF0aW9uOl9wb3NpdGlvbkluZm9ybWF0aW9uXTsKLSAgICAgICAgVUlDb250 ZXh0TWVudUNvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb25Gcm9tREQgPSBbZGRDb250ZXh0TWVu dUFjdGlvbkNsYXNzIGNvbnRleHRNZW51Q29uZmlndXJhdGlvbkZvclVSTDpsaW5rVVJMIGlkZW50 aWZpZXI6X3Bvc2l0aW9uSW5mb3JtYXRpb24uZGF0YURldGVjdG9ySWRlbnRpZmllciBzZWxlY3Rl ZFRleHQ6W3NlbGYgc2VsZWN0ZWRUZXh0XSByZXN1bHRzOl9wb3NpdGlvbkluZm9ybWF0aW9uLmRh dGFEZXRlY3RvclJlc3VsdHMuZ2V0KCkgaW5WaWV3OnNlbGYgY29udGV4dDpjb250ZXh0IG1lbnVJ ZGVudGlmaWVyOm5pbF07Ci0gICAgICAgIF9jb250ZXh0TWVudUFjdGlvblByb3ZpZGVyRGVsZWdh dGVOZWVkc092ZXJyaWRlID0gWUVTOwotICAgICAgICBfcGFnZS0+c3RhcnRJbnRlcmFjdGlvbldp dGhQb3NpdGlvbkluZm9ybWF0aW9uKF9wb3NpdGlvbkluZm9ybWF0aW9uKTsKLSAgICAgICAgY29u dGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uKGNvbmZpZ3VyYXRpb25Gcm9tREQpOwot ICAgICAgICByZXR1cm4gWUVTOwotICAgIH0KKyAgICBVUkwgbGlua1VSTCA9IF9wb3NpdGlvbklu Zm9ybWF0aW9uLnVybDsKKyAgICBOU0RpY3Rpb25hcnkgKmNvbnRleHQgPSBbc2VsZiBkYXRhRGV0 ZWN0aW9uQ29udGV4dEZvclBvc2l0aW9uSW5mb3JtYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb25d OworICAgIFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICpjb25maWd1cmF0aW9uRnJvbUREID0g W2RkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyBjb250ZXh0TWVudUNvbmZpZ3VyYXRpb25Gb3JVUkw6 bGlua1VSTCBpZGVudGlmaWVyOl9wb3NpdGlvbkluZm9ybWF0aW9uLmRhdGFEZXRlY3RvcklkZW50 aWZpZXIgc2VsZWN0ZWRUZXh0OltzZWxmIHNlbGVjdGVkVGV4dF0gcmVzdWx0czpfcG9zaXRpb25J bmZvcm1hdGlvbi5kYXRhRGV0ZWN0b3JSZXN1bHRzLmdldCgpIGluVmlldzpzZWxmIGNvbnRleHQ6 Y29udGV4dCBtZW51SWRlbnRpZmllcjpuaWxdOworICAgIF9jb250ZXh0TWVudUFjdGlvblByb3Zp ZGVyRGVsZWdhdGVOZWVkc092ZXJyaWRlID0gWUVTOworICAgIF9wYWdlLT5zdGFydEludGVyYWN0 aW9uV2l0aFBvc2l0aW9uSW5mb3JtYXRpb24oX3Bvc2l0aW9uSW5mb3JtYXRpb24pOworICAgIGNv bnRpbnVlV2l0aENvbnRleHRNZW51Q29uZmlndXJhdGlvbihjb25maWd1cmF0aW9uRnJvbUREKTsK ICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotCi0gICAgcmV0dXJuIE5POwogfQogI2Vu ZGlmCiAK 393867 2020-03-18 09:11:58 -0700 2020-03-18 11:15:48 -0700 Patch bug-209208-20200318091157.patch text/plain 6810 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA4NDM4YmMwNTFhZDcyMDRl ZmEwZDEzOTg4OTgyNTcxM2UwNGNjZTYuLmNlNDBhZDUyMWM2ZGY5YmQ2NDdkN2U4YTAyYjE4OGVl ZjFjY2E0YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDMtMTcgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdW5uZWVk ZWQgYW5kIGluY29ycmVjdCByZXNwb25kc1RvU2VsZWN0b3IgY2hlY2tzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MjA4CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82MDUxMjQ3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBiZWhhdmlvdXIgY2hhbmdlLCBubyB0ZXN0cyBuZWVkZWQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBjb250aW51ZUNvbnRleHRNZW51SW50ZXJhY3Rpb25XaXRoRGF0 YURldGVjdG9yczpdKToKKwogMjAyMC0wMy0xNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIENyYXNoIHVuZGVyIFdlYkNvb2tpZUNhY2hlOjpjbGVhckZvckhvc3Qo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KaW5kZXggMjlkOTMxODNmY2ZiMzg1ZTA2ODNiZTJmNDZhMjhhMDhhMGZk NTk0OS4uMmVlNTkxZGMwZDhlMDJiZDU4NGUzZmQxZmMwZTdjMDM1MDJkZmQzMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCkBAIC04NDMyLDE4ICs4NDMyLDE2IEBAIC0gKHZvaWQpYXNzaWduTGVnYWN5RGF0YUZv ckNvbnRleHRNZW51SW50ZXJhY3Rpb24KICAgICAgICAgLy8gYW5kIGNyZWF0ZSBvbmUuIFdlIG5l ZWQgdG8gcmVwbGljYXRlIHRoaXMgY29kZSBmb3IgdGhlIG5ldyBBUEkuCiAgICAgICAgIGlmICgh cHJldmlld1ZpZXdDb250cm9sbGVyIHx8IFsoTlNVUkwgKil1cmwgaVR1bmVzU3RvcmVVUkxdKSB7 CiAgICAgICAgICAgICBhdXRvIGRkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyA9IGdldEREQ29udGV4 dE1lbnVBY3Rpb25DbGFzcygpOwotICAgICAgICAgICAgaWYgKFtkZENvbnRleHRNZW51QWN0aW9u Q2xhc3MgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihjb250ZXh0TWVudUNvbmZpZ3VyYXRp b25Gb3JVUkw6aWRlbnRpZmllcjpzZWxlY3RlZFRleHQ6cmVzdWx0czppblZpZXc6Y29udGV4dDpt ZW51SWRlbnRpZmllcjopXSkgewotICAgICAgICAgICAgICAgIEJFR0lOX0JMT0NLX09CSkNfRVhD RVBUSU9OUzsKLSAgICAgICAgICAgICAgICBOU0RpY3Rpb25hcnkgKmNvbnRleHQgPSBbc2VsZiBk YXRhRGV0ZWN0aW9uQ29udGV4dEZvclBvc2l0aW9uSW5mb3JtYXRpb246X3Bvc2l0aW9uSW5mb3Jt YXRpb25dOwotICAgICAgICAgICAgICAgIFJldGFpblB0cjxVSUNvbnRleHRNZW51Q29uZmlndXJh dGlvbj4gZGF0YURldGVjdG9yc1Jlc3VsdCA9IFtkZENvbnRleHRNZW51QWN0aW9uQ2xhc3MgY29u dGV4dE1lbnVDb25maWd1cmF0aW9uRm9yVVJMOnVybCBpZGVudGlmaWVyOl9wb3NpdGlvbkluZm9y bWF0aW9uLmRhdGFEZXRlY3RvcklkZW50aWZpZXIgc2VsZWN0ZWRUZXh0OnNlbGYuc2VsZWN0ZWRU ZXh0IHJlc3VsdHM6X3Bvc2l0aW9uSW5mb3JtYXRpb24uZGF0YURldGVjdG9yUmVzdWx0cy5nZXQo KSBpblZpZXc6c2VsZiBjb250ZXh0OmNvbnRleHQgbWVudUlkZW50aWZpZXI6bmlsXTsKLSAgICAg ICAgICAgICAgICBpZiAoX3Nob3dMaW5rUHJldmlld3MgJiYgZGF0YURldGVjdG9yc1Jlc3VsdCAm JiBkYXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLnByZXZpZXdQcm92aWRlcikKLSAgICAgICAgICAg ICAgICAgICAgX2NvbnRleHRNZW51TGVnYWN5UHJldmlld0NvbnRyb2xsZXIgPSBkYXRhRGV0ZWN0 b3JzUmVzdWx0LmdldCgpLnByZXZpZXdQcm92aWRlcigpOwotICAgICAgICAgICAgICAgIGlmIChk YXRhRGV0ZWN0b3JzUmVzdWx0ICYmIGRhdGFEZXRlY3RvcnNSZXN1bHQuZ2V0KCkuYWN0aW9uUHJv dmlkZXIpIHsKLSAgICAgICAgICAgICAgICAgICAgYXV0byBtZW51RWxlbWVudHMgPSBtZW51RWxl bWVudHNGcm9tRGVmYXVsdEFjdGlvbnMoZGVmYXVsdEFjdGlvbnNGcm9tQXNzaXN0YW50LCBlbGVt ZW50SW5mbyk7Ci0gICAgICAgICAgICAgICAgICAgIF9jb250ZXh0TWVudUxlZ2FjeU1lbnUgPSBk YXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLmFjdGlvblByb3ZpZGVyKG1lbnVFbGVtZW50cyk7Ci0g ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElP TlM7CisgICAgICAgICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisgICAgICAgICAg ICBOU0RpY3Rpb25hcnkgKmNvbnRleHQgPSBbc2VsZiBkYXRhRGV0ZWN0aW9uQ29udGV4dEZvclBv c2l0aW9uSW5mb3JtYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb25dOworICAgICAgICAgICAgUmV0 YWluUHRyPFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uPiBkYXRhRGV0ZWN0b3JzUmVzdWx0ID0g W2RkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyBjb250ZXh0TWVudUNvbmZpZ3VyYXRpb25Gb3JVUkw6 dXJsIGlkZW50aWZpZXI6X3Bvc2l0aW9uSW5mb3JtYXRpb24uZGF0YURldGVjdG9ySWRlbnRpZmll ciBzZWxlY3RlZFRleHQ6c2VsZi5zZWxlY3RlZFRleHQgcmVzdWx0czpfcG9zaXRpb25JbmZvcm1h dGlvbi5kYXRhRGV0ZWN0b3JSZXN1bHRzLmdldCgpIGluVmlldzpzZWxmIGNvbnRleHQ6Y29udGV4 dCBtZW51SWRlbnRpZmllcjpuaWxdOworICAgICAgICAgICAgaWYgKF9zaG93TGlua1ByZXZpZXdz ICYmIGRhdGFEZXRlY3RvcnNSZXN1bHQgJiYgZGF0YURldGVjdG9yc1Jlc3VsdC5nZXQoKS5wcmV2 aWV3UHJvdmlkZXIpCisgICAgICAgICAgICAgICAgX2NvbnRleHRNZW51TGVnYWN5UHJldmlld0Nv bnRyb2xsZXIgPSBkYXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLnByZXZpZXdQcm92aWRlcigpOwor ICAgICAgICAgICAgaWYgKGRhdGFEZXRlY3RvcnNSZXN1bHQgJiYgZGF0YURldGVjdG9yc1Jlc3Vs dC5nZXQoKS5hY3Rpb25Qcm92aWRlcikgeworICAgICAgICAgICAgICAgIGF1dG8gbWVudUVsZW1l bnRzID0gbWVudUVsZW1lbnRzRnJvbURlZmF1bHRBY3Rpb25zKGRlZmF1bHRBY3Rpb25zRnJvbUFz c2lzdGFudCwgZWxlbWVudEluZm8pOworICAgICAgICAgICAgICAgIF9jb250ZXh0TWVudUxlZ2Fj eU1lbnUgPSBkYXRhRGV0ZWN0b3JzUmVzdWx0LmdldCgpLmFjdGlvblByb3ZpZGVyKG1lbnVFbGVt ZW50cyk7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJ T05TOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTg1ODYsOCArODU4NCw4 IEBAIC0gKHZvaWQpY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uOih2b2lkKF4pKFVJQ29u dGV4dE1lbnVDb25maWd1cmF0aW9uICopKWNvCiAKICNpZiBFTkFCTEUoREFUQV9ERVRFQ1RJT04p CiAgICAgaWYgKFsoTlNVUkwgKilsaW5rVVJMIGlUdW5lc1N0b3JlVVJMXSkgewotICAgICAgICBp ZiAoW3NlbGYgY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uV2l0aERhdGFEZXRlY3RvcnM6 Y29udGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uXSkKLSAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgW3NlbGYgY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uV2l0aERhdGFE ZXRlY3RvcnM6Y29udGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uXTsKKyAgICAgICAg cmV0dXJuOwogICAgIH0KICNlbmRpZgogCkBAIC04NjQ5LDEwICs4NjQ3LDExIEBAIC0gKHZvaWQp Y29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uOih2b2lkKF4pKFVJQ29udGV4dE1lbnVDb25m aWd1cmF0aW9uICopKWNvCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAg ICBpZiAoW3N0cm9uZ1NlbGYgY29udGludWVDb250ZXh0TWVudUludGVyYWN0aW9uV2l0aERhdGFE ZXRlY3RvcnM6Y29udGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uLmdldCgpXSkKLSAg ICAgICAgICAgIHJldHVybjsKLSNlbmRpZgorICAgICAgICBbc3Ryb25nU2VsZiBjb250aW51ZUNv bnRleHRNZW51SW50ZXJhY3Rpb25XaXRoRGF0YURldGVjdG9yczpjb250aW51ZVdpdGhDb250ZXh0 TWVudUNvbmZpZ3VyYXRpb24uZ2V0KCldOworICAgICAgICByZXR1cm47CisjZWxzZQogICAgICAg ICBjb250aW51ZVdpdGhDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24obmlsKTsKKyNlbmRpZgogICAg IH0pOwogCiAgICAgX2NvbnRleHRNZW51QWN0aW9uUHJvdmlkZXJEZWxlZ2F0ZU5lZWRzT3ZlcnJp ZGUgPSBOTzsKQEAgLTg2ODcsMjIgKzg2ODYsMTcgQEAgLSAodm9pZCljb250aW51ZUNvbnRleHRN ZW51SW50ZXJhY3Rpb246KHZvaWQoXikoVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKikpY28K IH0KIAogI2lmIEVOQUJMRShEQVRBX0RFVEVDVElPTikKLS0gKEJPT0wpY29udGludWVDb250ZXh0 TWVudUludGVyYWN0aW9uV2l0aERhdGFEZXRlY3RvcnM6KHZvaWQoXikoVUlDb250ZXh0TWVudUNv bmZpZ3VyYXRpb24gKikpY29udGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uCistICh2 b2lkKWNvbnRpbnVlQ29udGV4dE1lbnVJbnRlcmFjdGlvbldpdGhEYXRhRGV0ZWN0b3JzOih2b2lk KF4pKFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopKWNvbnRpbnVlV2l0aENvbnRleHRNZW51 Q29uZmlndXJhdGlvbgogewogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKICAgICBh dXRvIGRkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyA9IGdldEREQ29udGV4dE1lbnVBY3Rpb25DbGFz cygpOwotICAgIGlmIChbZGRDb250ZXh0TWVudUFjdGlvbkNsYXNzIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IoY29udGV4dE1lbnVDb25maWd1cmF0aW9uV2l0aFVSTDppblZpZXc6Y29udGV4 dDptZW51SWRlbnRpZmllcjopXSkgewotICAgICAgICBVUkwgbGlua1VSTCA9IF9wb3NpdGlvbklu Zm9ybWF0aW9uLnVybDsKLSAgICAgICAgTlNEaWN0aW9uYXJ5ICpjb250ZXh0ID0gW3NlbGYgZGF0 YURldGVjdGlvbkNvbnRleHRGb3JQb3NpdGlvbkluZm9ybWF0aW9uOl9wb3NpdGlvbkluZm9ybWF0 aW9uXTsKLSAgICAgICAgVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb25G cm9tREQgPSBbZGRDb250ZXh0TWVudUFjdGlvbkNsYXNzIGNvbnRleHRNZW51Q29uZmlndXJhdGlv bkZvclVSTDpsaW5rVVJMIGlkZW50aWZpZXI6X3Bvc2l0aW9uSW5mb3JtYXRpb24uZGF0YURldGVj dG9ySWRlbnRpZmllciBzZWxlY3RlZFRleHQ6W3NlbGYgc2VsZWN0ZWRUZXh0XSByZXN1bHRzOl9w b3NpdGlvbkluZm9ybWF0aW9uLmRhdGFEZXRlY3RvclJlc3VsdHMuZ2V0KCkgaW5WaWV3OnNlbGYg Y29udGV4dDpjb250ZXh0IG1lbnVJZGVudGlmaWVyOm5pbF07Ci0gICAgICAgIF9jb250ZXh0TWVu dUFjdGlvblByb3ZpZGVyRGVsZWdhdGVOZWVkc092ZXJyaWRlID0gWUVTOwotICAgICAgICBfcGFn ZS0+c3RhcnRJbnRlcmFjdGlvbldpdGhQb3NpdGlvbkluZm9ybWF0aW9uKF9wb3NpdGlvbkluZm9y bWF0aW9uKTsKLSAgICAgICAgY29udGludWVXaXRoQ29udGV4dE1lbnVDb25maWd1cmF0aW9uKGNv bmZpZ3VyYXRpb25Gcm9tREQpOwotICAgICAgICByZXR1cm4gWUVTOwotICAgIH0KKyAgICBVUkwg bGlua1VSTCA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLnVybDsKKyAgICBOU0RpY3Rpb25hcnkgKmNv bnRleHQgPSBbc2VsZiBkYXRhRGV0ZWN0aW9uQ29udGV4dEZvclBvc2l0aW9uSW5mb3JtYXRpb246 X3Bvc2l0aW9uSW5mb3JtYXRpb25dOworICAgIFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICpj b25maWd1cmF0aW9uRnJvbUREID0gW2RkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyBjb250ZXh0TWVu dUNvbmZpZ3VyYXRpb25Gb3JVUkw6bGlua1VSTCBpZGVudGlmaWVyOl9wb3NpdGlvbkluZm9ybWF0 aW9uLmRhdGFEZXRlY3RvcklkZW50aWZpZXIgc2VsZWN0ZWRUZXh0OltzZWxmIHNlbGVjdGVkVGV4 dF0gcmVzdWx0czpfcG9zaXRpb25JbmZvcm1hdGlvbi5kYXRhRGV0ZWN0b3JSZXN1bHRzLmdldCgp IGluVmlldzpzZWxmIGNvbnRleHQ6Y29udGV4dCBtZW51SWRlbnRpZmllcjpuaWxdOworICAgIF9j b250ZXh0TWVudUFjdGlvblByb3ZpZGVyRGVsZWdhdGVOZWVkc092ZXJyaWRlID0gWUVTOworICAg IF9wYWdlLT5zdGFydEludGVyYWN0aW9uV2l0aFBvc2l0aW9uSW5mb3JtYXRpb24oX3Bvc2l0aW9u SW5mb3JtYXRpb24pOworICAgIGNvbnRpbnVlV2l0aENvbnRleHRNZW51Q29uZmlndXJhdGlvbihj b25maWd1cmF0aW9uRnJvbUREKTsKICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotCi0g ICAgcmV0dXJuIE5POwogfQogI2VuZGlmCiAK