234677 2021-12-24 16:36:13 -0800 Use ICU instead of relying on hard-coded string equality checks in ModalContainerControlClassifier 2022-01-04 15:32:34 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi thorton webkit-bug-importer oldest_to_newest 1826779 0 wenson_hsieh 2021-12-24 16:36:13 -0800 . 1826780 1 447953 wenson_hsieh 2021-12-24 16:48:53 -0800 Created attachment 447953 Patch 1827379 2 webkit-bug-importer 2021-12-31 16:37:19 -0800 <rdar://problem/87036844> 1828101 3 447953 thorton 2022-01-04 14:32:18 -0800 Comment on attachment 447953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447953&action=review > Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm:81 > +class ScopedSpoofChecker { The word "Scoped" seems unnecessary? I don't think every RAII thing needs "Scoped" in the name. ScopedRefPtr? Is just a SpoofChecker. Or StringSpoofChecker or something. 1828102 4 447953 wenson_hsieh 2022-01-04 14:33:34 -0800 Comment on attachment 447953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447953&action=review Thanks for the review! >> Source/WebKit/UIProcess/Cocoa/ModalContainerControlClassifier.mm:81 >> +class ScopedSpoofChecker { > > The word "Scoped" seems unnecessary? I don't think every RAII thing needs "Scoped" in the name. ScopedRefPtr? > > Is just a SpoofChecker. Or StringSpoofChecker or something. Fair point — changed to just `SpoofChecker` 1828111 5 448339 wenson_hsieh 2022-01-04 15:03:11 -0800 Created attachment 448339 Patch for landing 1828118 6 ews-feeder 2022-01-04 15:32:32 -0800 Committed r287592 (245721@main): <https://commits.webkit.org/245721@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448339. 447953 2021-12-24 16:48:53 -0800 2022-01-04 14:32:18 -0800 Patch bug-234677-20211224164852.patch text/plain 7025 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFiMDA5Zjg4ZmUxYzgyMjIw MDY1MWQ1NGRkOGQyNjUyODUzZWQyMTkuLjdmZWYxYTIyMWI2N2QwMzFjODYwOGQzODM1NmMwNGMx OGY0MTcyYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMTItMjQgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIElDVSBpbnN0ZWFk IG9mIHJlbHlpbmcgb24gaGFyZC1jb2RlZCBzdHJpbmcgZXF1YWxpdHkgY2hlY2tzIGluIE1vZGFs Q29udGFpbmVyQ29udHJvbENsYXNzaWZpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzNDY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZvbGxvd3VwIHRvIHIyODc0MjAgLSB1c2UgSUNVIHRvIGNoZWNr IGZvciBtb3JlIHN0cmluZ3MgdGhhdCByZXNlbWJsZSBlaXRoZXIgdGhlIGxvd2VyY2FzZSBvciB1 cHBlcmNhc2UgbGV0dGVyCisgICAgICAgICJ4IiwgcmF0aGVyIHRoYW4gcmVseWluZyBvbiBhIGhh cmQtY29kZWQgc2V0IG9mIHN5bWJvbHMuIE5vdGUgdGhhdCBJQ1UncyAiY29uZnVzYWJsZXMiIGxp c3QgY3VycmVudGx5IGRvZXMgbm90CisgICAgICAgIGNvbnNpZGVyIGJvdGgg4pyWIGFuZCDinJUg dG8gYmUgbG9va2FsaWtlcyB0byB0aGUgbGV0dGVyICJ4Ijsgc2luY2UgdGhlc2Ugc3ltYm9scyBh cmUgYWN0dWFsbHkga25vd24gdG8gYXBwZWFyIGluCisgICAgICAgIG1vZGFsIGNvbnRhaW5lcnMg b24gc2V2ZXJhbCB3ZWJzaXRlcywgd2UnbGwgc3RpbGwgbmVlZCB0byBjaGVjayBmb3IgdGhlc2Ug dHdvIHN5bWJvbHMgc2VwYXJhdGVseS4KKworICAgICAgICBUZXN0OiBNb2RhbENvbnRhaW5lck9i c2VydmF0aW9uLkNsYXNzaWZ5TXVsdGlwbHlTeW1ib2wKKworICAgICAgICAqIFVJUHJvY2Vzcy9D b2NvYS9Nb2RhbENvbnRhaW5lckNvbnRyb2xDbGFzc2lmaWVyLm1tOgorICAgICAgICAoV2ViS2l0 OjpTY29wZWRTcG9vZkNoZWNrZXI6On5TY29wZWRTcG9vZkNoZWNrZXIpOgorCisgICAgICAgIEFk ZCBhIGhlbHBlciBjbGFzcyB0aGF0IHdyYXBzIGNhbGxzIHRvIGB1c3Bvb2ZfYXJlQ29uZnVzYWJs ZVVURjhgLCBhbmQgYWxzbyBlbnN1cmVzIGJhbGFuY2VkIGNhbGxzIHRvCisgICAgICAgIGB1c3Bv b2Zfb3BlbmAgYW5kIGB1c3Bvb2ZfY2xvc2VgIHdoZW4gY3JlYXRpbmcgYSBuZXcgSUNVIHNwb29m IGNoZWNrZXIuIFVzZSB0aGlzIGluIHRoZQorICAgICAgICBXS01vZGFsQ29udGFpbmVyQ2xhc3Np ZmllcklucHV0IGNsYXNzIGJlbG93IHRvIGNoZWNrIGZvciBtb3JlIHR5cGVzIG9mIHN0cmluZ3Mg dGhhdCBsb29rIGxpa2UgdGhlIGxldHRlciAieCIuCisKKyAgICAgICAgKFdlYktpdDo6U2NvcGVk U3Bvb2ZDaGVja2VyOjphcmVDb25mdXNhYmxlKToKKyAgICAgICAgKFdlYktpdDo6U2NvcGVkU3Bv b2ZDaGVja2VyOjpjaGVja2VyKToKKyAgICAgICAgKC1bV0tNb2RhbENvbnRhaW5lckNsYXNzaWZp ZXJJbnB1dCBpbml0V2l0aFRva2VuaXplcjpyYXdJbnB1dDpdKToKKwogMjAyMS0xMi0yMyAgV2Vu c29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBNb2RhbCBjb250 YWluZXIgY29udHJvbCBjbGFzc2lmaWVyIGZhaWxzIG9uIHNvbWUgbmV1dHJhbCBjb250cm9scyB0 aGF0IGNvbnRhaW4gbXVsdGlwbGljYXRpb24gc3ltYm9scwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvTW9kYWxDb250YWluZXJDb250cm9sQ2xhc3NpZmllci5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL01vZGFsQ29udGFpbmVyQ29udHJvbENsYXNz aWZpZXIubW0KaW5kZXggNGJjYzczYzFhYTVlYmQxZTUyOWU5ZGI0NjM3ZjJjYTkwMmE1NzEwMS4u NTBiNTM0Nzk0Y2E0YjczZTc2NDRkNDIyMTRlNmZkMjVkNzg1MzRmYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTW9kYWxDb250YWluZXJDb250cm9sQ2xhc3NpZmll ci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9Nb2RhbENvbnRhaW5lckNv bnRyb2xDbGFzc2lmaWVyLm1tCkBAIC0yNyw2ICsyNyw4IEBACiAjaW1wb3J0ICJNb2RhbENvbnRh aW5lckNvbnRyb2xDbGFzc2lmaWVyLmgiCiAKICNpbXBvcnQgPFdlYkNvcmUvTW9kYWxDb250YWlu ZXJUeXBlcy5oPgorI2ltcG9ydCA8dW5pY29kZS91c3Bvb2YuaD4KKwogI2ltcG9ydCA8cGFsL2Nv Y29hL0NvcmVNTFNvZnRMaW5rLmg+CiAjaW1wb3J0IDxwYWwvY29jb2EvTmF0dXJhbExhbmd1YWdl U29mdExpbmsuaD4KIApAQCAtNzQsNiArNzYsMzYgQEAgLSAoaWQgPE1MRmVhdHVyZVByb3ZpZGVy PilmZWF0dXJlc0F0SW5kZXg6KE5TSW50ZWdlcilpbmRleAogCiBAZW5kCiAKK25hbWVzcGFjZSBX ZWJLaXQgeworCitjbGFzcyBTY29wZWRTcG9vZkNoZWNrZXIgeworICAgIFdURl9NQUtFX0ZBU1Rf QUxMT0NBVEVEOworcHVibGljOgorICAgIH5TY29wZWRTcG9vZkNoZWNrZXIoKQorICAgIHsKKyAg ICAgICAgaWYgKG1fY2hlY2tlcikKKyAgICAgICAgICAgIHVzcG9vZl9jbG9zZShtX2NoZWNrZXIp OworICAgIH0KKworICAgIGJvb2wgYXJlQ29uZnVzYWJsZShOU1N0cmluZyAqcG90ZW50aWFsU3Bv b2ZTdHJpbmcsIGNvbnN0IGNoYXIqIHN0cmluZ1RvU3Bvb2YpCisgICAgeworICAgICAgICByZXR1 cm4gY2hlY2tlcigpICYmIHVzcG9vZl9hcmVDb25mdXNhYmxlVVRGOChjaGVja2VyKCksIHBvdGVu dGlhbFNwb29mU3RyaW5nLlVURjhTdHJpbmcsIC0xLCBzdHJpbmdUb1Nwb29mLCAtMSwgJm1fc3Rh dHVzKTsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgVVNwb29mQ2hlY2tlciogY2hlY2tlcigpCisg ICAgeworICAgICAgICBpZiAoIW1fY2hlY2tlciAmJiBtX3N0YXR1cyA9PSBVX1pFUk9fRVJST1Ip CisgICAgICAgICAgICBtX2NoZWNrZXIgPSB1c3Bvb2Zfb3BlbigmbV9zdGF0dXMpOworICAgICAg ICByZXR1cm4gbV9jaGVja2VyOworICAgIH0KKworICAgIFVFcnJvckNvZGUgbV9zdGF0dXMgeyBV X1pFUk9fRVJST1IgfTsKKyAgICBVU3Bvb2ZDaGVja2VyKiBtX2NoZWNrZXIgeyBudWxscHRyIH07 Cit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKwogQGltcGxlbWVudGF0aW9uIFdLTW9kYWxD b250YWluZXJDbGFzc2lmaWVySW5wdXQgewogICAgIFJldGFpblB0cjxOU1N0cmluZz4gX2Nhbm9u aWNhbElucHV0OwogfQpAQCAtOTUsMTAgKzEyNywxMSBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdp dGhUb2tlbml6ZXI6KE5MVG9rZW5pemVyICopdG9rZW5pemVyIHJhd0lucHV0OihOU1N0cmluZyAq KQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlmIChhdHRyaWJ1dGVzICYgKE5MVG9r ZW5pemVyQXR0cmlidXRlU3ltYm9saWMgfCBOTFRva2VuaXplckF0dHJpYnV0ZUVtb2ppKSkgewot ICAgICAgICAgICAgLy8gV2Ugc2hvdWxkIGNvbnNpZGVyIHVzaW5nIGEgbWVtb3J5LWNvbXBhY3Qg aGFzaCBtYXAgaWYgd2UgbmVlZCB0byBhZGQgYSBsYXJnZSBudW1iZXIgb2YgZW50cmllcyBoZXJl IGluIHRoZSBmdXR1cmUuCi0gICAgICAgICAgICAvLyBGb3Igbm93LCB3ZSBvbmx5IG1ha2UgYW4g ZXhjZXB0aW9uIGZvciB0aGUgZm9sbG93aW5nIHN5bWJvbHMsIHNvIHNpbXBseSBjaGVja2luZyBl YWNoIHN0cmluZyBpcyBzdWZmaWNpZW50LgotICAgICAgICAgICAgaWYgKFtsb3dlcmNhc2VUb2tl biBpc0VxdWFsVG9TdHJpbmc6QCLDlyJdIHx8IFtsb3dlcmNhc2VUb2tlbiBpc0VxdWFsVG9TdHJp bmc6QCLinJUiXSB8fCBbbG93ZXJjYXNlVG9rZW4gaXNFcXVhbFRvU3RyaW5nOkAi4pyWIl0pCisg ICAgICAgICAgICBXZWJLaXQ6OlNjb3BlZFNwb29mQ2hlY2tlciBjaGVja2VyOworICAgICAgICAg ICAgaWYgKFtsb3dlcmNhc2VUb2tlbiBpc0VxdWFsVG9TdHJpbmc6QCLinJUiXSB8fCBbbG93ZXJj YXNlVG9rZW4gaXNFcXVhbFRvU3RyaW5nOkAi4pyWIl0gfHwgY2hlY2tlci5hcmVDb25mdXNhYmxl KGxvd2VyY2FzZVRva2VuLCAieCIpIHx8IGNoZWNrZXIuYXJlQ29uZnVzYWJsZShsb3dlcmNhc2VU b2tlbiwgIlgiKSkgeworICAgICAgICAgICAgICAgIC8vIElDVSBkb2VzIG5vdCBjb25zaWRlciB0 d28gdW5pY29kZSBzeW1ib2xzIHRvIGJlIGNvbmZ1c2FibGUgd2l0aCB0aGUgbGV0dGVyIHgsIGJ1 dCBmb3IgdGhlIHB1cnBvc2VzIG9mIHRoZSBjbGFzc2lmaWVyIHdlIG5lZWQgdG8gdHJlYXQgdGhl bSBhcyBpZiB0aGV5IHdlcmUuCiAgICAgICAgICAgICAgICAgW3Rva2VucyBhZGRPYmplY3Q6QCJ4 Il07CisgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGI2MmExMjNm ODAxMWQ1MDZlZjU1YzUzY2E5M2NkZDM1MWQ1OWY2MjEuLjQ2NzgwYmY4OGUxZWQ4MDg2ZmMzZWNh ZTA3YTU2N2NkZGVmZTAyMjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0xMi0yNCAgV2Vuc29uIEhzaWVoICA8 d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgSUNVIGluc3RlYWQgb2YgcmVs eWluZyBvbiBoYXJkLWNvZGVkIHN0cmluZyBlcXVhbGl0eSBjaGVja3MgaW4gTW9kYWxDb250YWlu ZXJDb250cm9sQ2xhc3NpZmllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM0Njc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQXVnbWVudCB0aGUgZXhpc3RpbmcgQVBJIHRlc3Qgc28gdGhhdCBpdCBhZGRp dGlvbmFsbHkgdGVzdHMgYSBzeW1ib2wgKCJzbWFsbCByb21hbiBudW1lcmFsIHRlbiIpIHRoYXQg d291bGQgbm90CisgICAgICAgIGhhdmUgYmVlbiBjb3ZlcmVkIGFzIG9uZSBvZiB0aGUgdGhyZWUg aGFyZC1jb2RlZCBzeW1ib2wgc3RyaW5ncyBpbiB0aGUgZWFybGllciBmaXguCisKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL01vZGFsQ29udGFpbmVyT2JzZXJ2YXRp b24ubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMS0xMi0yNCAgV2Vu c29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBNb2RhbCBjb250 YWluZXJzIGFyZSBpbmNvcnJlY3RseSBkZXRlY3RlZCBpbiBuYXZpZ2F0aW9uIGVsZW1lbnRzIGFu ZCBmaXhlZCBkb2N1bWVudCBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Nb2RhbENvbnRhaW5lck9ic2VydmF0aW9uLm1tIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Nb2RhbENvbnRhaW5lck9ic2VydmF0aW9u Lm1tCmluZGV4IDRmZjViZDEzMGIyZDgxODE5NDI4M2UwOTUyYTRlYzQxZGQ0MzgyZjAuLmM2MDkx NWZmMjJjNGU0NjRiYWNlNWRhMWY1OTgyNWIzYzAxY2M1ZjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTW9kYWxDb250YWluZXJPYnNlcnZhdGlvbi5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL01vZGFsQ29udGFp bmVyT2JzZXJ2YXRpb24ubW0KQEAgLTIzNCwxMSArMjM0LDE2IEBAIFRFU1QoTW9kYWxDb250YWlu ZXJPYnNlcnZhdGlvbiwgU2hvd01vZGFsQ29udGFpbmVyKQogVEVTVChNb2RhbENvbnRhaW5lck9i c2VydmF0aW9uLCBDbGFzc2lmeU11bHRpcGx5U3ltYm9sKQogewogICAgIGF1dG8gd2ViVmlldyA9 IGNyZWF0ZU1vZGFsQ29udGFpbmVyV2ViVmlldygpOwotICAgIFt3ZWJWaWV3IGxvYWRCdW5kbGVQ YWdlOkAibW9kYWwtY29udGFpbmVyLWN1c3RvbSJdOwotICAgIFt3ZWJWaWV3IGV2YWx1YXRlOkAi c2hvdyhgPHA+SGVsbG8gd29ybGQ8L3A+PGJ1dHRvbj7DlzwvYnV0dG9uPmApIiBhbmREZWNpZGVQ b2xpY3k6X1dLTW9kYWxDb250YWluZXJEZWNpc2lvbkhpZGVBbmRJZ25vcmVdOwotCi0gICAgRVhQ RUNUX0ZBTFNFKFtbd2ViVmlldyBjb250ZW50c0FzU3RyaW5nXSBjb250YWluc1N0cmluZzpAIkhl bGxvIHdvcmxkIl0pOwotICAgIEVYUEVDVF9FUShbd2ViVmlldyBsYXN0TW9kYWxDb250YWluZXJJ bmZvXS5hdmFpbGFibGVUeXBlcywgX1dLTW9kYWxDb250YWluZXJDb250cm9sVHlwZU5ldXRyYWwp OworICAgIGF1dG8gcnVuVGVzdCA9IFsmXSAoTlNTdHJpbmcgKnN5bWJvbCkgeworICAgICAgICBb d2ViVmlldyBsb2FkQnVuZGxlUGFnZTpAIm1vZGFsLWNvbnRhaW5lci1jdXN0b20iXTsKKyAgICAg ICAgTlNTdHJpbmcgKnNjcmlwdFRvRXZhbHVhdGUgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1h dDpAInNob3coYDxwPkhlbGxvIHdvcmxkPC9wPjxidXR0b24+JUA8L2J1dHRvbj5gKSIsIHN5bWJv bF07CisgICAgICAgIFt3ZWJWaWV3IGV2YWx1YXRlOnNjcmlwdFRvRXZhbHVhdGUgYW5kRGVjaWRl UG9saWN5Ol9XS01vZGFsQ29udGFpbmVyRGVjaXNpb25IaWRlQW5kSWdub3JlXTsKKworICAgICAg ICBFWFBFQ1RfRkFMU0UoW1t3ZWJWaWV3IGNvbnRlbnRzQXNTdHJpbmddIGNvbnRhaW5zU3RyaW5n OkAiSGVsbG8gd29ybGQiXSk7CisgICAgICAgIEVYUEVDVF9FUShbd2ViVmlldyBsYXN0TW9kYWxD b250YWluZXJJbmZvXS5hdmFpbGFibGVUeXBlcywgX1dLTW9kYWxDb250YWluZXJDb250cm9sVHlw ZU5ldXRyYWwpOworICAgIH07CisgICAgcnVuVGVzdChAIuKclSIpOworICAgIHJ1blRlc3QoQCLi qK8iKTsKIH0KIAogVEVTVChNb2RhbENvbnRhaW5lck9ic2VydmF0aW9uLCBEZXRlY3RTZWFyY2hU ZXJtSW5Cb2xkVGFnKQo= 448339 2022-01-04 15:03:11 -0800 2022-01-04 15:32:33 -0800 Patch for landing bug-234677-20220104150310.patch text/plain 6868 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFmNmU3NzAwMDI3MWY4MDY3 YjE1NjQ4ZWZhYjlmYTYyMTUwZTExMmIuLjNhYTViYThkMjAzNjhhY2ExYzEzZjBlNTY5MjY3YTg4 Y2ZhODNjZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjItMDEtMDQgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIElDVSBpbnN0ZWFk IG9mIHJlbHlpbmcgb24gaGFyZC1jb2RlZCBzdHJpbmcgZXF1YWxpdHkgY2hlY2tzIGluIE1vZGFs Q29udGFpbmVyQ29udHJvbENsYXNzaWZpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzNDY3NworCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0 b24uCisKKyAgICAgICAgRm9sbG93dXAgdG8gcjI4NzQyMCAtIHVzZSBJQ1UgdG8gY2hlY2sgZm9y IG1vcmUgc3RyaW5ncyB0aGF0IHJlc2VtYmxlIGVpdGhlciB0aGUgbG93ZXJjYXNlIG9yIHVwcGVy Y2FzZSBsZXR0ZXIKKyAgICAgICAgIngiLCByYXRoZXIgdGhhbiByZWx5aW5nIG9uIGEgaGFyZC1j b2RlZCBzZXQgb2Ygc3ltYm9scy4gTm90ZSB0aGF0IElDVSdzICJjb25mdXNhYmxlcyIgbGlzdCBj dXJyZW50bHkgZG9lcyBub3QKKyAgICAgICAgY29uc2lkZXIgYm90aCDinJYgYW5kIOKclSB0byBi ZSBsb29rYWxpa2VzIHRvIHRoZSBsZXR0ZXIgIngiOyBzaW5jZSB0aGVzZSBzeW1ib2xzIGFyZSBh Y3R1YWxseSBrbm93biB0byBhcHBlYXIgaW4KKyAgICAgICAgbW9kYWwgY29udGFpbmVycyBvbiBz ZXZlcmFsIHdlYnNpdGVzLCB3ZSdsbCBzdGlsbCBuZWVkIHRvIGNoZWNrIGZvciB0aGVzZSB0d28g c3ltYm9scyBzZXBhcmF0ZWx5LgorCisgICAgICAgIFRlc3Q6IE1vZGFsQ29udGFpbmVyT2JzZXJ2 YXRpb24uQ2xhc3NpZnlNdWx0aXBseVN5bWJvbAorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29h L01vZGFsQ29udGFpbmVyQ29udHJvbENsYXNzaWZpZXIubW06CisgICAgICAgIChXZWJLaXQ6OlNw b29mQ2hlY2tlcjo6flNwb29mQ2hlY2tlcik6CisKKyAgICAgICAgQWRkIGEgaGVscGVyIGNsYXNz IHRoYXQgd3JhcHMgY2FsbHMgdG8gYHVzcG9vZl9hcmVDb25mdXNhYmxlVVRGOGAsIGFuZCBhbHNv IGVuc3VyZXMgYmFsYW5jZWQgY2FsbHMgdG8KKyAgICAgICAgYHVzcG9vZl9vcGVuYCBhbmQgYHVz cG9vZl9jbG9zZWAgd2hlbiBjcmVhdGluZyBhIG5ldyBJQ1Ugc3Bvb2YgY2hlY2tlci4gVXNlIHRo aXMgaW4gdGhlCisgICAgICAgIFdLTW9kYWxDb250YWluZXJDbGFzc2lmaWVySW5wdXQgY2xhc3Mg YmVsb3cgdG8gY2hlY2sgZm9yIG1vcmUgdHlwZXMgb2Ygc3RyaW5ncyB0aGF0IGxvb2sgbGlrZSB0 aGUgbGV0dGVyICJ4Ii4KKworICAgICAgICAoV2ViS2l0OjpTcG9vZkNoZWNrZXI6OmFyZUNvbmZ1 c2FibGUpOgorICAgICAgICAoV2ViS2l0OjpTcG9vZkNoZWNrZXI6OmNoZWNrZXIpOgorICAgICAg ICAoLVtXS01vZGFsQ29udGFpbmVyQ2xhc3NpZmllcklucHV0IGluaXRXaXRoVG9rZW5pemVyOnJh d0lucHV0Ol0pOgorCiAyMDIyLTAxLTA0ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbaU9TXVtXUF0gQWRkIHRlbGVtZXRyeSBmb3Igc3lzY2FsbCB2aW9s YXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9Nb2RhbENv bnRhaW5lckNvbnRyb2xDbGFzc2lmaWVyLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvTW9kYWxDb250YWluZXJDb250cm9sQ2xhc3NpZmllci5tbQppbmRleCA0YmNjNzNjMWFhNWVi ZDFlNTI5ZTlkYjQ2MzdmMmNhOTAyYTU3MTAxLi4yZjAzNzQ4YjdjYjE4ZmFhODkyYTljMmVhY2Qz YjcxNjU5YTNmY2ExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9N b2RhbENvbnRhaW5lckNvbnRyb2xDbGFzc2lmaWVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL01vZGFsQ29udGFpbmVyQ29udHJvbENsYXNzaWZpZXIubW0KQEAgLTI3LDYg KzI3LDggQEAKICNpbXBvcnQgIk1vZGFsQ29udGFpbmVyQ29udHJvbENsYXNzaWZpZXIuaCIKIAog I2ltcG9ydCA8V2ViQ29yZS9Nb2RhbENvbnRhaW5lclR5cGVzLmg+CisjaW1wb3J0IDx1bmljb2Rl L3VzcG9vZi5oPgorCiAjaW1wb3J0IDxwYWwvY29jb2EvQ29yZU1MU29mdExpbmsuaD4KICNpbXBv cnQgPHBhbC9jb2NvYS9OYXR1cmFsTGFuZ3VhZ2VTb2Z0TGluay5oPgogCkBAIC03NCw2ICs3Niwz NiBAQCBzdGF0aWMgTlNTdHJpbmcgKmNvbnN0IGNsYXNzaWZpZXJPdXRwdXRGZWF0dXJlS2V5ID0g QCJsYWJlbCI7CiAKIEBlbmQKIAorbmFtZXNwYWNlIFdlYktpdCB7CisKK2NsYXNzIFNwb29mQ2hl Y2tlciB7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6CisgICAgflNwb29m Q2hlY2tlcigpCisgICAgeworICAgICAgICBpZiAobV9jaGVja2VyKQorICAgICAgICAgICAgdXNw b29mX2Nsb3NlKG1fY2hlY2tlcik7CisgICAgfQorCisgICAgYm9vbCBhcmVDb25mdXNhYmxlKE5T U3RyaW5nICpwb3RlbnRpYWxTcG9vZlN0cmluZywgY29uc3QgY2hhciogc3RyaW5nVG9TcG9vZikK KyAgICB7CisgICAgICAgIHJldHVybiBjaGVja2VyKCkgJiYgdXNwb29mX2FyZUNvbmZ1c2FibGVV VEY4KGNoZWNrZXIoKSwgcG90ZW50aWFsU3Bvb2ZTdHJpbmcuVVRGOFN0cmluZywgLTEsIHN0cmlu Z1RvU3Bvb2YsIC0xLCAmbV9zdGF0dXMpOworICAgIH0KKworcHJpdmF0ZToKKyAgICBVU3Bvb2ZD aGVja2VyKiBjaGVja2VyKCkKKyAgICB7CisgICAgICAgIGlmICghbV9jaGVja2VyICYmIG1fc3Rh dHVzID09IFVfWkVST19FUlJPUikKKyAgICAgICAgICAgIG1fY2hlY2tlciA9IHVzcG9vZl9vcGVu KCZtX3N0YXR1cyk7CisgICAgICAgIHJldHVybiBtX2NoZWNrZXI7CisgICAgfQorCisgICAgVUVy cm9yQ29kZSBtX3N0YXR1cyB7IFVfWkVST19FUlJPUiB9OworICAgIFVTcG9vZkNoZWNrZXIqIG1f Y2hlY2tlciB7IG51bGxwdHIgfTsKK307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCiBAaW1w bGVtZW50YXRpb24gV0tNb2RhbENvbnRhaW5lckNsYXNzaWZpZXJJbnB1dCB7CiAgICAgUmV0YWlu UHRyPE5TU3RyaW5nPiBfY2Fub25pY2FsSW5wdXQ7CiB9CkBAIC05NSwxMCArMTI3LDExIEBAIHN0 YXRpYyBOU1N0cmluZyAqY29uc3QgY2xhc3NpZmllck91dHB1dEZlYXR1cmVLZXkgPSBAImxhYmVs IjsKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAoYXR0cmlidXRlcyAmIChOTFRv a2VuaXplckF0dHJpYnV0ZVN5bWJvbGljIHwgTkxUb2tlbml6ZXJBdHRyaWJ1dGVFbW9qaSkpIHsK LSAgICAgICAgICAgIC8vIFdlIHNob3VsZCBjb25zaWRlciB1c2luZyBhIG1lbW9yeS1jb21wYWN0 IGhhc2ggbWFwIGlmIHdlIG5lZWQgdG8gYWRkIGEgbGFyZ2UgbnVtYmVyIG9mIGVudHJpZXMgaGVy ZSBpbiB0aGUgZnV0dXJlLgotICAgICAgICAgICAgLy8gRm9yIG5vdywgd2Ugb25seSBtYWtlIGFu IGV4Y2VwdGlvbiBmb3IgdGhlIGZvbGxvd2luZyBzeW1ib2xzLCBzbyBzaW1wbHkgY2hlY2tpbmcg ZWFjaCBzdHJpbmcgaXMgc3VmZmljaWVudC4KLSAgICAgICAgICAgIGlmIChbbG93ZXJjYXNlVG9r ZW4gaXNFcXVhbFRvU3RyaW5nOkAiw5ciXSB8fCBbbG93ZXJjYXNlVG9rZW4gaXNFcXVhbFRvU3Ry aW5nOkAi4pyVIl0gfHwgW2xvd2VyY2FzZVRva2VuIGlzRXF1YWxUb1N0cmluZzpAIuKcliJdKQor ICAgICAgICAgICAgV2ViS2l0OjpTcG9vZkNoZWNrZXIgY2hlY2tlcjsKKyAgICAgICAgICAgIGlm IChbbG93ZXJjYXNlVG9rZW4gaXNFcXVhbFRvU3RyaW5nOkAi4pyVIl0gfHwgW2xvd2VyY2FzZVRv a2VuIGlzRXF1YWxUb1N0cmluZzpAIuKcliJdIHx8IGNoZWNrZXIuYXJlQ29uZnVzYWJsZShsb3dl cmNhc2VUb2tlbiwgIngiKSB8fCBjaGVja2VyLmFyZUNvbmZ1c2FibGUobG93ZXJjYXNlVG9rZW4s ICJYIikpIHsKKyAgICAgICAgICAgICAgICAvLyBJQ1UgZG9lcyBub3QgY29uc2lkZXIgdHdvIHVu aWNvZGUgc3ltYm9scyB0byBiZSBjb25mdXNhYmxlIHdpdGggdGhlIGxldHRlciB4LCBidXQgZm9y IHRoZSBwdXJwb3NlcyBvZiB0aGUgY2xhc3NpZmllciB3ZSBuZWVkIHRvIHRyZWF0IHRoZW0gYXMg aWYgdGhleSB3ZXJlLgogICAgICAgICAgICAgICAgIFt0b2tlbnMgYWRkT2JqZWN0OkAieCJdOwor ICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2NWIwNzY3NjVjMjRh M2IzNjYzZWViOGNjMTJlZDQyZWE2MmE2MjU4Li40ZGU4OGU4M2JmMzg0NTY0ZmQ5OTlkZjYwY2Nj MDgyYjMyMGMwOGViIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDEtMDQgIFdlbnNvbiBIc2llaCAgPHdlbnNv bl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIElDVSBpbnN0ZWFkIG9mIHJlbHlpbmcg b24gaGFyZC1jb2RlZCBzdHJpbmcgZXF1YWxpdHkgY2hlY2tzIGluIE1vZGFsQ29udGFpbmVyQ29u dHJvbENsYXNzaWZpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNDY3NworCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAg ICAgQXVnbWVudCB0aGUgZXhpc3RpbmcgQVBJIHRlc3Qgc28gdGhhdCBpdCBhZGRpdGlvbmFsbHkg dGVzdHMgYSBzeW1ib2wgKCJzbWFsbCByb21hbiBudW1lcmFsIHRlbiIpIHRoYXQgd291bGQgbm90 CisgICAgICAgIGhhdmUgYmVlbiBjb3ZlcmVkIGFzIG9uZSBvZiB0aGUgdGhyZWUgaGFyZC1jb2Rl ZCBzeW1ib2wgc3RyaW5ncyBpbiB0aGUgZWFybGllciBmaXguCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL01vZGFsQ29udGFpbmVyT2JzZXJ2YXRpb24ubW06Cisg ICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMi0wMS0wNCAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBNb2RhbENvbnRhaW5lck9ic2Vy dmVyIHNob3VsZCBzZWFyY2ggZm9yIHRleHQgaW4gc3ViZnJhbWVzCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL01vZGFsQ29udGFpbmVyT2JzZXJ2YXRp b24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL01vZGFsQ29udGFp bmVyT2JzZXJ2YXRpb24ubW0KaW5kZXggNDk3ZWNkNGEyNmQ2OGE5ZGMxMjhlZTJjYTg0MmVkYzky MGVjMGM5OS4uYjE4Y2E5MjgwMWJmYTAzNDUxMDRlNjFlZGJiYjZkMGY4NTQ2N2JkMSAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Nb2RhbENvbnRhaW5l ck9ic2VydmF0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvTW9kYWxDb250YWluZXJPYnNlcnZhdGlvbi5tbQpAQCAtMjM0LDExICsyMzQsMTYgQEAgVEVT VChNb2RhbENvbnRhaW5lck9ic2VydmF0aW9uLCBTaG93TW9kYWxDb250YWluZXIpCiBURVNUKE1v ZGFsQ29udGFpbmVyT2JzZXJ2YXRpb24sIENsYXNzaWZ5TXVsdGlwbHlTeW1ib2wpCiB7CiAgICAg YXV0byB3ZWJWaWV3ID0gY3JlYXRlTW9kYWxDb250YWluZXJXZWJWaWV3KCk7Ci0gICAgW3dlYlZp ZXcgbG9hZEJ1bmRsZVBhZ2U6QCJtb2RhbC1jb250YWluZXItY3VzdG9tIl07Ci0gICAgW3dlYlZp ZXcgZXZhbHVhdGU6QCJzaG93KGA8cD5IZWxsbyB3b3JsZDwvcD48YnV0dG9uPsOXPC9idXR0b24+ YCkiIGFuZERlY2lkZVBvbGljeTpfV0tNb2RhbENvbnRhaW5lckRlY2lzaW9uSGlkZUFuZElnbm9y ZV07Ci0KLSAgICBFWFBFQ1RfRkFMU0UoW1t3ZWJWaWV3IGNvbnRlbnRzQXNTdHJpbmddIGNvbnRh aW5zU3RyaW5nOkAiSGVsbG8gd29ybGQiXSk7Ci0gICAgRVhQRUNUX0VRKFt3ZWJWaWV3IGxhc3RN b2RhbENvbnRhaW5lckluZm9dLmF2YWlsYWJsZVR5cGVzLCBfV0tNb2RhbENvbnRhaW5lckNvbnRy b2xUeXBlTmV1dHJhbCk7CisgICAgYXV0byBydW5UZXN0ID0gWyZdIChOU1N0cmluZyAqc3ltYm9s KSB7CisgICAgICAgIFt3ZWJWaWV3IGxvYWRCdW5kbGVQYWdlOkAibW9kYWwtY29udGFpbmVyLWN1 c3RvbSJdOworICAgICAgICBOU1N0cmluZyAqc2NyaXB0VG9FdmFsdWF0ZSA9IFtOU1N0cmluZyBz dHJpbmdXaXRoRm9ybWF0OkAic2hvdyhgPHA+SGVsbG8gd29ybGQ8L3A+PGJ1dHRvbj4lQDwvYnV0 dG9uPmApIiwgc3ltYm9sXTsKKyAgICAgICAgW3dlYlZpZXcgZXZhbHVhdGU6c2NyaXB0VG9FdmFs dWF0ZSBhbmREZWNpZGVQb2xpY3k6X1dLTW9kYWxDb250YWluZXJEZWNpc2lvbkhpZGVBbmRJZ25v cmVdOworCisgICAgICAgIEVYUEVDVF9GQUxTRShbW3dlYlZpZXcgY29udGVudHNBc1N0cmluZ10g Y29udGFpbnNTdHJpbmc6QCJIZWxsbyB3b3JsZCJdKTsKKyAgICAgICAgRVhQRUNUX0VRKFt3ZWJW aWV3IGxhc3RNb2RhbENvbnRhaW5lckluZm9dLmF2YWlsYWJsZVR5cGVzLCBfV0tNb2RhbENvbnRh aW5lckNvbnRyb2xUeXBlTmV1dHJhbCk7CisgICAgfTsKKyAgICBydW5UZXN0KEAi4pyVIik7Cisg ICAgcnVuVGVzdChAIuKoryIpOwogfQogCiBURVNUKE1vZGFsQ29udGFpbmVyT2JzZXJ2YXRpb24s IERldGVjdFNlYXJjaFRlcm1JbkJvbGRUYWcpCg==