237933 2022-03-15 16:55:39 -0700 Avoid calls to [CLLocationManager authorizationStatus] & [CLLocationManager locationServicesEnabled] 2022-03-18 14:55:04 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ggaren sam webkit-bug-importer oldest_to_newest 1851589 0 cdumez 2022-03-15 16:55:39 -0700 Avoid calls to [CLLocationManager authorizationStatus] & [CLLocationManager locationServicesEnabled] for performance reason since those APIs are synchronous. Instead, rely on the locationManagerDidChangeAuthorization delegate function to get the authorization asynchronously. 1851590 1 cdumez 2022-03-15 16:55:50 -0700 <rdar://89931043> 1851594 2 454778 cdumez 2022-03-15 17:05:02 -0700 Created attachment 454778 Patch 1852281 3 cdumez 2022-03-17 07:40:42 -0700 Patch is ready for review. The EWS failure is unrelated. 1852790 4 454778 ggaren 2022-03-18 11:58:20 -0700 Comment on attachment 454778 Patch r=me Looks like a nice simplification too. 1852791 5 454778 cdumez 2022-03-18 11:58:44 -0700 Comment on attachment 454778 Patch Thanks for reviewing. 1852845 6 ews-feeder 2022-03-18 14:54:59 -0700 Committed r291496 (248608@main): <https://commits.webkit.org/248608@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454778. 454778 2022-03-15 17:05:02 -0700 2022-03-18 14:55:02 -0700 Patch bug-237933-20220315170501.patch text/plain 11610 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5M2M5NDg4ZTRiOWMx MDQ3NDM2MTM5ZTA4YzAzODQzZDhmMWNmNy4uNGQ2YzU4YzYxMDJlNWU4OTkyMzY2ODg5OTk0YWE1 OGM0ZDYxYWM4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIyLTAzLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgY2FsbHMgdG8gW0NM TG9jYXRpb25NYW5hZ2VyIGF1dGhvcml6YXRpb25TdGF0dXNdICYgW0NMTG9jYXRpb25NYW5hZ2Vy IGxvY2F0aW9uU2VydmljZXNFbmFibGVkXQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM3OTMzCisgICAgICAgIDxyZGFyOi8vODk5MzEwNDM+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgY2FsbHMg dG8gW0NMTG9jYXRpb25NYW5hZ2VyIGF1dGhvcml6YXRpb25TdGF0dXNdICYgW0NMTG9jYXRpb25N YW5hZ2VyIGxvY2F0aW9uU2VydmljZXNFbmFibGVkXQorICAgICAgICBmb3IgcGVyZm9ybWFuY2Ug cmVhc29ucyBzaW5jZSB0aG9zZSBhcmUgc3luY2hyb25vdXMsIHBvdGVudGlhbGx5IHNsb3cgYW5k IGNhbGxlZCBvbiB0aGUgVUlQcm9jZXNzCisgICAgICAgIG1haW4gdGhyZWFkLgorCisgICAgICAg IEluc3RlYWQsIHJlbHkgb24gdGhlIGZhY3QgdGhhdCB0aGUgbG9jYXRpb25NYW5hZ2VyRGlkQ2hh bmdlQXV0aG9yaXphdGlvbiBhbHdheXMgZ2V0cyBjYWxsZWQKKyAgICAgICAgYXN5bmNocm9ub3Vz bHkgcmlnaHQgYWZ0ZXIgY29uc3RydWN0aW5nIHRoZSBDTExvY2F0aW9uTWFuYWdlciB3aXRoIHRo ZSBhY3R1YWwgYXV0aG9yaXphdGlvbi4KKyAgICAgICAgVGhpcyBzaW1wbGlmaWVzIG91ciBsb2dp YyBhIGJpdCB0b28uCisKKyAgICAgICAgV2Ugbm93IG9ubHkgY2FsbCBbQ0xMb2NhdGlvbk1hbmFn ZXIgcmVxdWVzdFdoZW5JblVzZUF1dGhvcml6YXRpb25dIHdoZW4gbG9jYXRpb25NYW5hZ2VyRGlk Q2hhbmdlQXV0aG9yaXphdGlvbgorICAgICAgICBnZXRzIGNhbGxlZCB3aXRoIGtDTEF1dGhvcml6 YXRpb25TdGF0dXNOb3REZXRlcm1pbmVkIGFzeW5jaHJvbm91c2x5IGFmdGVyIGNvbnN0cnVjdGlv bi4KKyAgICAgICAgSWYgbG9jYXRpb25NYW5hZ2VyRGlkQ2hhbmdlQXV0aG9yaXphdGlvbiBnZXRz IGNhbGxlZCB3aXRoIGFuIGF1dGhvcml6ZWQgZW51bSB2YWx1ZSwgd2UKKyAgICAgICAgY2FsbCBb Q0xMb2NhdGlvbk1hbmFnZXIgc3RhcnRVcGRhdGluZ0xvY2F0aW9uXSB0aGVuIChpZiB0aGUgY2xp ZW50IGlzIGludGVyZXN0ZWQgaW4gbG9jYXRpb25zLCBhbmQgbm90CisgICAgICAgIG1lcmVseSBp biB0aGUgYXV0aG9yaXphdGlvbikuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9Db3JlTG9j YXRpb25HZW9sb2NhdGlvblByb3ZpZGVyLmg6CisgICAgICAgICogcGxhdGZvcm0vY29jb2EvQ29y ZUxvY2F0aW9uR2VvbG9jYXRpb25Qcm92aWRlci5tbToKKyAgICAgICAgKC1bV2ViQ0xMb2NhdGlv bk1hbmFnZXIgaW5pdFdpdGhXZWJzaXRlSWRlbnRpZmllcjpjbGllbnQ6bW9kZTpdKToKKyAgICAg ICAgKC1bV2ViQ0xMb2NhdGlvbk1hbmFnZXIgbG9jYXRpb25NYW5hZ2VyRGlkQ2hhbmdlQXV0aG9y aXphdGlvbjpdKToKKyAgICAgICAgKFdlYkNvcmU6OkNvcmVMb2NhdGlvbkdlb2xvY2F0aW9uUHJv dmlkZXI6OkNvcmVMb2NhdGlvbkdlb2xvY2F0aW9uUHJvdmlkZXIpOgorICAgICAgICAoaXNBdXRo b3JpemF0aW9uR3JhbnRlZCk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkNMTG9jYXRpb25NYW5h Z2VyIGluaXRXaXRoV2Vic2l0ZUlkZW50aWZpZXI6Y2xpZW50Ol0pOiBEZWxldGVkLgorICAgICAg ICAoLVtXZWJDTExvY2F0aW9uTWFuYWdlciBzdGFydF0pOiBEZWxldGVkLgorICAgICAgICAoLVtX ZWJDTExvY2F0aW9uTWFuYWdlciByZXF1ZXN0R2VvbG9jYXRpb25BdXRob3JpemF0aW9uXSk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDb3JlTG9jYXRpb25HZW9sb2NhdGlvblByb3ZpZGVy OjpzdGFydCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDb3JlTG9jYXRpb25HZW9sb2Nh dGlvblByb3ZpZGVyOjpzdG9wKTogRGVsZXRlZC4KKwogMjAyMi0wMy0xNSAgUGF0cmljayBHcmlm ZmlzICA8cGdyaWZmaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBBZGQgaW5pdGlhbCBpbXBsZW1l bnRhdGlvbiBvZiBGZXRjaCBNZXRhZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA1MDE0MjA2NzZlNDY0ZGYyMjkw NzZkOTBkMGM2OTNlNzNkMjRmOTk2Li5kNjkwMGI0ODczNTIwZmZhNmU1MTk1NTVhNjI3MjlmZmY1 MWVlNGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAzLTE1ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgY2FsbHMgdG8gW0NMTG9jYXRp b25NYW5hZ2VyIGF1dGhvcml6YXRpb25TdGF0dXNdICYgW0NMTG9jYXRpb25NYW5hZ2VyIGxvY2F0 aW9uU2VydmljZXNFbmFibGVkXQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM3OTMzCisgICAgICAgIDxyZGFyOi8vODk5MzEwNDM+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWlub3IgY2hhbmdlcyB0byBy ZWZsZWN0IEFQSSBjaGFuZ2VzIGZvciBvdXIgQ29yZUxvY2F0aW9uIGxvY2F0aW9uIG1hbmFnZXIu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6cHJvdmlkZXJTdGFy dFVwZGF0aW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHk6 OnByb3ZpZGVyU3RvcFVwZGF0aW5nKToKKwogMjAyMi0wMy0xNSAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBsb2dnaW5nIGluIEdQVVByb2Nlc3NQcm94eTo6 ZGlkQ3JlYXRlQ29udGV4dEZvclZpc2liaWxpdHlQcm9wYWdhdGlvbigpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Db3JlTG9jYXRpb25HZW9sb2NhdGlvblByb3Zp ZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Db3JlTG9jYXRpb25HZW9sb2Nh dGlvblByb3ZpZGVyLmgKaW5kZXggM2M1NzBkNjRjYjc0MTgyMjc1NDNkOWJiNzE1NjhkZGM0ZDE0 MTM5NC4uYzY5NmI4NDFhM2ZjNDNkYWM0ZDA2NmU2ZGMxMmRjOWI2ZWNhNzJlOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29yZUxvY2F0aW9uR2VvbG9jYXRpb25Q cm92aWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0NvcmVMb2NhdGlv bkdlb2xvY2F0aW9uUHJvdmlkZXIuaApAQCAtNTEsMTIgKzUxLDEwIEBAIHB1YmxpYzoKICAgICAg ICAgdmlydHVhbCB2b2lkIHJlc2V0R2VvbG9jYXRpb24oY29uc3QgU3RyaW5nJiB3ZWJzaXRlSWRl bnRpZmllcikgPSAwOwogICAgIH07CiAKLSAgICBDb3JlTG9jYXRpb25HZW9sb2NhdGlvblByb3Zp ZGVyKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiwgQ2xpZW50Jik7CisgICAgZW51bSBjbGFzcyBN b2RlIDogYm9vbCB7IEF1dGhvcml6YXRpb25Pbmx5LCBBdXRob3JpemF0aW9uQW5kTG9jYXRpb25V cGRhdGVzIH07CisgICAgQ29yZUxvY2F0aW9uR2VvbG9jYXRpb25Qcm92aWRlcihjb25zdCBSZWdp c3RyYWJsZURvbWFpbiYsIENsaWVudCYsIE1vZGUgPSBNb2RlOjpBdXRob3JpemF0aW9uQW5kTG9j YXRpb25VcGRhdGVzKTsKICAgICB+Q29yZUxvY2F0aW9uR2VvbG9jYXRpb25Qcm92aWRlcigpOwog Ci0gICAgdm9pZCBzdGFydCgpOwotICAgIHZvaWQgc3RvcCgpOwotCiAgICAgdm9pZCBzZXRFbmFi bGVIaWdoQWNjdXJhY3koYm9vbCk7CiAKICAgICBzdGF0aWMgdm9pZCByZXF1ZXN0QXV0aG9yaXph dGlvbihjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9v bCk+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29yZUxv Y2F0aW9uR2VvbG9jYXRpb25Qcm92aWRlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nv Y29hL0NvcmVMb2NhdGlvbkdlb2xvY2F0aW9uUHJvdmlkZXIubW0KaW5kZXggYjdjMGQ0YmM0ZTlk NGVjNTM5OWQ1YzI5Nzc2MTQ2MmVjYzRkZmNmYy4uMGU1ZWFhYjY3Y2NjMDVjMDRkNjIwNDJmMDA4 NmIyYWNiMDVjMTVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2Ev Q29yZUxvY2F0aW9uR2VvbG9jYXRpb25Qcm92aWRlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jb2NvYS9Db3JlTG9jYXRpb25HZW9sb2NhdGlvblByb3ZpZGVyLm1tCkBAIC00OSwx NSArNDksNiBAQCBTT0ZUX0xJTktfQ09OU1RBTlQoQ29yZUxvY2F0aW9uLCBrQ0xMb2NhdGlvbkFj Y3VyYWN5SHVuZHJlZE1ldGVycywgZG91YmxlKQogI2RlZmluZSBrQ0xMb2NhdGlvbkFjY3VyYWN5 QmVzdCBnZXRrQ0xMb2NhdGlvbkFjY3VyYWN5QmVzdCgpCiAjZGVmaW5lIGtDTExvY2F0aW9uQWNj dXJhY3lIdW5kcmVkTWV0ZXJzIGdldGtDTExvY2F0aW9uQWNjdXJhY3lIdW5kcmVkTWV0ZXJzKCkK IAotc3RhdGljIGJvb2wgaXNBdXRob3JpemF0aW9uR3JhbnRlZChDTEF1dGhvcml6YXRpb25TdGF0 dXMgc3RhdHVzKQotewotICAgIHJldHVybiBzdGF0dXMgPT0ga0NMQXV0aG9yaXphdGlvblN0YXR1 c0F1dGhvcml6ZWRBbHdheXMKLSNpZiBIQVZFKENPUkVfTE9DQVRJT05fQVVUSE9SSVpFRF9XSEVO X0lOX1VTRSkKLSAgICAgICAgfHwgc3RhdHVzID09IGtDTEF1dGhvcml6YXRpb25TdGF0dXNBdXRo b3JpemVkV2hlbkluVXNlCi0jZW5kaWYKLSAgICAgICAgOwotfQotCiBAaW50ZXJmYWNlIFdlYkNM TG9jYXRpb25NYW5hZ2VyIDogTlNPYmplY3Q8Q0xMb2NhdGlvbk1hbmFnZXJEZWxlZ2F0ZT4KIEBl bmQKIApAQCAtNjYsMTQgKzU3LDE4IEBAIEBpbXBsZW1lbnRhdGlvbiBXZWJDTExvY2F0aW9uTWFu YWdlciB7CiAgICAgV2ViQ29yZTo6Q29yZUxvY2F0aW9uR2VvbG9jYXRpb25Qcm92aWRlcjo6Q2xp ZW50KiBfY2xpZW50OwogICAgIFN0cmluZyBfd2Vic2l0ZUlkZW50aWZpZXI7CiAgICAgQk9PTCBf aXNXYWl0aW5nRm9yQXV0aG9yaXphdGlvbjsKKyAgICBXZWJDb3JlOjpDb3JlTG9jYXRpb25HZW9s b2NhdGlvblByb3ZpZGVyOjpNb2RlIF9tb2RlOwogfQogCi0tIChpbnN0YW5jZXR5cGUpaW5pdFdp dGhXZWJzaXRlSWRlbnRpZmllcjooY29uc3QgU3RyaW5nJil3ZWJzaXRlSWRlbnRpZmllciBjbGll bnQ6KFdlYkNvcmU6OkNvcmVMb2NhdGlvbkdlb2xvY2F0aW9uUHJvdmlkZXI6OkNsaWVudCYpY2xp ZW50CistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhXZWJzaXRlSWRlbnRpZmllcjooY29uc3QgU3Ry aW5nJil3ZWJzaXRlSWRlbnRpZmllciBjbGllbnQ6KFdlYkNvcmU6OkNvcmVMb2NhdGlvbkdlb2xv Y2F0aW9uUHJvdmlkZXI6OkNsaWVudCYpY2xpZW50IG1vZGU6KFdlYkNvcmU6OkNvcmVMb2NhdGlv bkdlb2xvY2F0aW9uUHJvdmlkZXI6Ok1vZGUpbW9kZQogewogICAgIHNlbGYgPSBbc3VwZXIgaW5p dF07CiAgICAgaWYgKCFzZWxmKQogICAgICAgICByZXR1cm4gbmlsOwogCisgICAgX2lzV2FpdGlu Z0ZvckF1dGhvcml6YXRpb24gPSBZRVM7CisgICAgX21vZGUgPSBtb2RlOworCiAjaWYgVVNFKEFQ UExFX0lOVEVSTkFMX1NESykgJiYgSEFWRShDT1JFX0xPQ0FUSU9OX1dFQlNJVEVfSURFTlRJRklF UlMpICYmIGRlZmluZWQoQ0xfSEFTX1JBREFSXzg4ODM0MzAxKQogICAgIGlmICghd2Vic2l0ZUlk ZW50aWZpZXIuaXNFbXB0eSgpKQogICAgICAgICBfbG9jYXRpb25NYW5hZ2VyID0gYWRvcHROUyhb YWxsb2NDTExvY2F0aW9uTWFuYWdlckluc3RhbmNlKCkgaW5pdFdpdGhXZWJzaXRlSWRlbnRpZmll cjp3ZWJzaXRlSWRlbnRpZmllcl0pOwpAQCAtOTQsMTcgKzg5LDYgQEAgLSAodm9pZClkZWFsbG9j CiAgICAgW3N1cGVyIGRlYWxsb2NdOwogfQogCi0tICh2b2lkKXN0YXJ0Ci17Ci0gICAgaWYgKCFb Z2V0Q0xMb2NhdGlvbk1hbmFnZXJDbGFzcygpIGxvY2F0aW9uU2VydmljZXNFbmFibGVkXSB8fCAh aXNBdXRob3JpemF0aW9uR3JhbnRlZChbX2xvY2F0aW9uTWFuYWdlciBhdXRob3JpemF0aW9uU3Rh dHVzXSkpIHsKLSAgICAgICAgW19sb2NhdGlvbk1hbmFnZXIgc3RvcFVwZGF0aW5nTG9jYXRpb25d OwotICAgICAgICBfY2xpZW50LT5yZXNldEdlb2xvY2F0aW9uKF93ZWJzaXRlSWRlbnRpZmllcik7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBbX2xvY2F0aW9uTWFuYWdlciBzdGFydFVw ZGF0aW5nTG9jYXRpb25dOwotfQotCiAtICh2b2lkKXN0b3AKIHsKICAgICBbX2xvY2F0aW9uTWFu YWdlciBzdG9wVXBkYXRpbmdMb2NhdGlvbl07CkBAIC0xMTUsNDEgKzk5LDEzIEBAIC0gKHZvaWQp c2V0RW5hYmxlSGlnaEFjY3VyYWN5OihCT09MKWhpZ2hBY2N1cmFjeUVuYWJsZWQKICAgICBbX2xv Y2F0aW9uTWFuYWdlciBzZXREZXNpcmVkQWNjdXJhY3k6aGlnaEFjY3VyYWN5RW5hYmxlZCA/IGtD TExvY2F0aW9uQWNjdXJhY3lCZXN0IDoga0NMTG9jYXRpb25BY2N1cmFjeUh1bmRyZWRNZXRlcnNd OwogfQogCi0tICh2b2lkKXJlcXVlc3RHZW9sb2NhdGlvbkF1dGhvcml6YXRpb24KLXsKLSAgICBp ZiAoIVtnZXRDTExvY2F0aW9uTWFuYWdlckNsYXNzKCkgbG9jYXRpb25TZXJ2aWNlc0VuYWJsZWRd KSB7Ci0gICAgICAgIF9jbGllbnQtPmdlb2xvY2F0aW9uQXV0aG9yaXphdGlvbkRlbmllZChfd2Vi c2l0ZUlkZW50aWZpZXIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgc3dpdGNoIChb X2xvY2F0aW9uTWFuYWdlciBhdXRob3JpemF0aW9uU3RhdHVzXSkgewotICAgIGNhc2Uga0NMQXV0 aG9yaXphdGlvblN0YXR1c05vdERldGVybWluZWQ6IHsKLSAgICAgICAgaWYgKCFfaXNXYWl0aW5n Rm9yQXV0aG9yaXphdGlvbikgewotICAgICAgICAgICAgX2lzV2FpdGluZ0ZvckF1dGhvcml6YXRp b24gPSBZRVM7Ci0gICAgICAgICAgICBbX2xvY2F0aW9uTWFuYWdlciByZXF1ZXN0V2hlbkluVXNl QXV0aG9yaXphdGlvbl07Ci0gICAgICAgIH0KLSAgICAgICAgYnJlYWs7Ci0gICAgfQotICAgIGNh c2Uga0NMQXV0aG9yaXphdGlvblN0YXR1c0F1dGhvcml6ZWRBbHdheXM6Ci0jaWYgSEFWRShDT1JF X0xPQ0FUSU9OX0FVVEhPUklaRURfV0hFTl9JTl9VU0UpCi0gICAgY2FzZSBrQ0xBdXRob3JpemF0 aW9uU3RhdHVzQXV0aG9yaXplZFdoZW5JblVzZToKLSNlbmRpZgotICAgICAgICBfY2xpZW50LT5n ZW9sb2NhdGlvbkF1dGhvcml6YXRpb25HcmFudGVkKF93ZWJzaXRlSWRlbnRpZmllcik7Ci0gICAg ICAgIGJyZWFrOwotICAgIGNhc2Uga0NMQXV0aG9yaXphdGlvblN0YXR1c1Jlc3RyaWN0ZWQ6Ci0g ICAgY2FzZSBrQ0xBdXRob3JpemF0aW9uU3RhdHVzRGVuaWVkOgotICAgICAgICBfY2xpZW50LT5n ZW9sb2NhdGlvbkF1dGhvcml6YXRpb25EZW5pZWQoX3dlYnNpdGVJZGVudGlmaWVyKTsKLSAgICAg ICAgYnJlYWs7Ci0gICAgfQotfQotCiAtICh2b2lkKWxvY2F0aW9uTWFuYWdlckRpZENoYW5nZUF1 dGhvcml6YXRpb246KENMTG9jYXRpb25NYW5hZ2VyICopbWFuYWdlcgogewogICAgIGF1dG8gc3Rh dHVzID0gW19sb2NhdGlvbk1hbmFnZXIgYXV0aG9yaXphdGlvblN0YXR1c107CiAgICAgaWYgKF9p c1dhaXRpbmdGb3JBdXRob3JpemF0aW9uKSB7CiAgICAgICAgIHN3aXRjaCAoc3RhdHVzKSB7CiAg ICAgICAgIGNhc2Uga0NMQXV0aG9yaXphdGlvblN0YXR1c05vdERldGVybWluZWQ6Ci0gICAgICAg ICAgICAvLyBUaGlzIGNhbiBoYXBwZW4gYWZ0ZXIgcmVzdW1lIGlmIHRoZSB1c2VyIGhhcyBzdGls bCBub3QgYW5zd2VyZWQgdGhlIGRpYWxvZy4gV2UganVzdCBoYXZlIHRvIHdhaXQgZm9yIHRoZSBw ZXJtaXNzaW9uLgorICAgICAgICAgICAgW19sb2NhdGlvbk1hbmFnZXIgcmVxdWVzdFdoZW5JblVz ZUF1dGhvcml6YXRpb25dOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Uga0NMQXV0 aG9yaXphdGlvblN0YXR1c0RlbmllZDoKICAgICAgICAgY2FzZSBrQ0xBdXRob3JpemF0aW9uU3Rh dHVzUmVzdHJpY3RlZDoKQEAgLTE2Miw2ICsxMTgsOCBAQCAtICh2b2lkKWxvY2F0aW9uTWFuYWdl ckRpZENoYW5nZUF1dGhvcml6YXRpb246KENMTG9jYXRpb25NYW5hZ2VyICopbWFuYWdlcgogI2Vu ZGlmCiAgICAgICAgICAgICBfaXNXYWl0aW5nRm9yQXV0aG9yaXphdGlvbiA9IE5POwogICAgICAg ICAgICAgX2NsaWVudC0+Z2VvbG9jYXRpb25BdXRob3JpemF0aW9uR3JhbnRlZChfd2Vic2l0ZUlk ZW50aWZpZXIpOworICAgICAgICAgICAgaWYgKF9tb2RlICE9IFdlYkNvcmU6OkNvcmVMb2NhdGlv bkdlb2xvY2F0aW9uUHJvdmlkZXI6Ok1vZGU6OkF1dGhvcml6YXRpb25Pbmx5KQorICAgICAgICAg ICAgICAgIFtfbG9jYXRpb25NYW5hZ2VyIHN0YXJ0VXBkYXRpbmdMb2NhdGlvbl07CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CkBAIC0xOTcsMTEgKzE1NSw5IEBA IEBlbmQKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1Db3JlTG9jYXRpb25HZW9sb2NhdGlvblBy b3ZpZGVyOjpDb3JlTG9jYXRpb25HZW9sb2NhdGlvblByb3ZpZGVyKGNvbnN0IFJlZ2lzdHJhYmxl RG9tYWluJiByZWdpc3RyYWJsZURvbWFpbiwgQ2xpZW50JiBjbGllbnQpCi0gICAgOiBtX2xvY2F0 aW9uTWFuYWdlcihhZG9wdE5TKFtbV2ViQ0xMb2NhdGlvbk1hbmFnZXIgYWxsb2NdIGluaXRXaXRo V2Vic2l0ZUlkZW50aWZpZXI6cmVnaXN0cmFibGVEb21haW4uc3RyaW5nKCkgY2xpZW50OmNsaWVu dF0pKQorQ29yZUxvY2F0aW9uR2VvbG9jYXRpb25Qcm92aWRlcjo6Q29yZUxvY2F0aW9uR2VvbG9j YXRpb25Qcm92aWRlcihjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21haW4s IENsaWVudCYgY2xpZW50LCBNb2RlIG1vZGUpCisgICAgOiBtX2xvY2F0aW9uTWFuYWdlcihhZG9w dE5TKFtbV2ViQ0xMb2NhdGlvbk1hbmFnZXIgYWxsb2NdIGluaXRXaXRoV2Vic2l0ZUlkZW50aWZp ZXI6cmVnaXN0cmFibGVEb21haW4uc3RyaW5nKCkgY2xpZW50OmNsaWVudCBtb2RlOm1vZGVdKSkK IHsKLSAgICAvLyBSZXF1ZXN0IHBlcm1pc3Npb24gZm9yIHRoZSBhcHAgdG8gdXNlIGdlb2xvY2F0 aW9uIChpZiBpdCBkb2Vzbid0IGFscmVhZHkpLgotICAgIFttX2xvY2F0aW9uTWFuYWdlciByZXF1 ZXN0R2VvbG9jYXRpb25BdXRob3JpemF0aW9uXTsKIH0KIAogQ29yZUxvY2F0aW9uR2VvbG9jYXRp b25Qcm92aWRlcjo6fkNvcmVMb2NhdGlvbkdlb2xvY2F0aW9uUHJvdmlkZXIoKQpAQCAtMjA5LDE2 ICsxNjUsNiBAQCBDb3JlTG9jYXRpb25HZW9sb2NhdGlvblByb3ZpZGVyOjp+Q29yZUxvY2F0aW9u R2VvbG9jYXRpb25Qcm92aWRlcigpCiAgICAgW21fbG9jYXRpb25NYW5hZ2VyIHN0b3BdOwogfQog Ci12b2lkIENvcmVMb2NhdGlvbkdlb2xvY2F0aW9uUHJvdmlkZXI6OnN0YXJ0KCkKLXsKLSAgICBb bV9sb2NhdGlvbk1hbmFnZXIgc3RhcnRdOwotfQotCi12b2lkIENvcmVMb2NhdGlvbkdlb2xvY2F0 aW9uUHJvdmlkZXI6OnN0b3AoKQotewotICAgIFttX2xvY2F0aW9uTWFuYWdlciBzdG9wXTsKLX0K LQogdm9pZCBDb3JlTG9jYXRpb25HZW9sb2NhdGlvblByb3ZpZGVyOjpzZXRFbmFibGVIaWdoQWNj dXJhY3koYm9vbCBoaWdoQWNjdXJhY3lFbmFibGVkKQogewogICAgIFttX2xvY2F0aW9uTWFuYWdl ciBzZXRFbmFibGVIaWdoQWNjdXJhY3k6aGlnaEFjY3VyYWN5RW5hYmxlZF07CkBAIC0yMzQsNyAr MTgwLDcgQEAgcHVibGljOgogICAgIHZvaWQgY2hlY2soY29uc3QgUmVnaXN0cmFibGVEb21haW4m IHJlZ2lzdHJhYmxlRG9tYWluLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBs ZXRpb25IYW5kbGVyKQogICAgIHsKICAgICAgICAgbV9jb21wbGV0aW9uSGFuZGxlciA9IFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpOwotICAgICAgICBtX3Byb3ZpZGVyID0gbWFrZVVuaXF1ZTxD b3JlTG9jYXRpb25HZW9sb2NhdGlvblByb3ZpZGVyPihyZWdpc3RyYWJsZURvbWFpbiwgKnRoaXMp OworICAgICAgICBtX3Byb3ZpZGVyID0gbWFrZVVuaXF1ZTxDb3JlTG9jYXRpb25HZW9sb2NhdGlv blByb3ZpZGVyPihyZWdpc3RyYWJsZURvbWFpbiwgKnRoaXMsIENvcmVMb2NhdGlvbkdlb2xvY2F0 aW9uUHJvdmlkZXI6Ok1vZGU6OkF1dGhvcml6YXRpb25Pbmx5KTsKICAgICB9CiAKIHByaXZhdGU6 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJHZW9sb2NhdGlvbk1hbmFn ZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJHZW9sb2NhdGlvbk1hbmFn ZXJQcm94eS5jcHAKaW5kZXggNTY2NTc0ZDNlNzEyMzI4NTVkZGNjNmMxZGU0MDM3YzEzNjY0NDY1 Yi4uZmI0MTkyMjlmN2M5ZTRlNWNmZTdhYWE4YmM2ZjE4ZjM4OTRkNmRiOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5LmNw cApAQCAtMjU2LDcgKzI1Niw2IEBAIHZvaWQgV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHk6OnBy b3ZpZGVyU3RhcnRVcGRhdGluZyhQZXJEb21haW5EYXRhJiBwZXJEb21haW5ECiAgICAgICAgIEFT U0VSVCghcGVyRG9tYWluRGF0YS5wcm92aWRlcik7CiAgICAgICAgIHBlckRvbWFpbkRhdGEucHJv dmlkZXIgPSBtYWtlVW5pcXVlPFdlYkNvcmU6OkNvcmVMb2NhdGlvbkdlb2xvY2F0aW9uUHJvdmlk ZXI+KHJlZ2lzdHJhYmxlRG9tYWluLCAqdGhpcyk7CiAgICAgICAgIHBlckRvbWFpbkRhdGEucHJv dmlkZXItPnNldEVuYWJsZUhpZ2hBY2N1cmFjeSghcGVyRG9tYWluRGF0YS53YXRjaGVyc05lZWRp bmdIaWdoQWNjdXJhY3kuY29tcHV0ZXNFbXB0eSgpKTsKLSAgICAgICAgcGVyRG9tYWluRGF0YS5w cm92aWRlci0+c3RhcnQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICNlbHNlCkBAIC0yNzMs NyArMjcyLDcgQEAgdm9pZCBXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6cHJvdmlkZXJTdG9w VXBkYXRpbmcoUGVyRG9tYWluRGF0YSYgcGVyRG9tYWluRGEKIHsKICNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQogICAgIGlmICghbV9jbGllbnRQcm92aWRlcikgewotICAgICAgICBwZXJEb21haW5E YXRhLnByb3ZpZGVyLT5zdG9wKCk7CisgICAgICAgIHBlckRvbWFpbkRhdGEucHJvdmlkZXIgPSBu dWxscHRyOwogICAgICAgICByZXR1cm47CiAgICAgfQogI2Vsc2UK