197523 2019-05-02 11:30:48 -0700 NSAttributedString conversion in a loop returns nil and WKUnknownError every other time 2019-05-02 16:22:47 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bdakin commit-queue darin thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1532367 0 timothy 2019-05-02 11:30:48 -0700 This only happens on iOSMac for some reason. <rdar://problem/50285662> 1532407 1 368812 timothy 2019-05-02 13:12:15 -0700 Created attachment 368812 Patch 1532461 2 368812 darin 2019-05-02 14:50:31 -0700 Comment on attachment 368812 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368812&action=review > Source/WebKit/ChangeLog:12 > + would be confused with the real content loading. Ultimatly this wasn't needed > + since a process swap will likely happen, and cached views are closed quickly. > + It also avoids extra work and speeds up conversions a bit. Typo: Ultimatly The word "likely" here does not inspire confidence in me that this code is correct. How can something that will "likely" happen make something not needed. It seems that it will make it "likely not needed", which is not good enough for correctness. There must be some other reason it’s not needed. > Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:211 > + result.string = attributedStringFromRange(rangeOfContents(*m_page->mainFrame().document()->documentElement()), &documentAttributes); I think the old code would fail cleanly if documentElement() was null, so maybe we want to preserve that property. Or is there a guarantee that documentElement() is non-null? 1532494 3 368830 timothy 2019-05-02 15:43:54 -0700 Created attachment 368830 Patch 1532496 4 368812 timothy 2019-05-02 15:47:43 -0700 Comment on attachment 368812 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368812&action=review >> Source/WebKit/ChangeLog:12 >> + It also avoids extra work and speeds up conversions a bit. > > Typo: Ultimatly > > The word "likely" here does not inspire confidence in me that this code is correct. How can something that will "likely" happen make something not needed. It seems that it will make it "likely not needed", which is not good enough for correctness. > > There must be some other reason it’s not needed. A process swap might not happen if a same origin conversion happens. But that isn't what fixed this issue, a process swap just makes the extra work I was trying to do to clean things up with an about:blank load pointless. I reworded this in the new patch. >> Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:211 >> + result.string = attributedStringFromRange(rangeOfContents(*m_page->mainFrame().document()->documentElement()), &documentAttributes); > > I think the old code would fail cleanly if documentElement() was null, so maybe we want to preserve that property. Or is there a guarantee that documentElement() is non-null? Good point. I didn't hit a null case, but it could be. I added a null check on documentElement. I'm still using rangeOfContents() for its simplicity. 1532514 5 368830 commit-queue 2019-05-02 16:22:45 -0700 Comment on attachment 368830 Patch Clearing flags on attachment: 368830 Committed r244893: <https://trac.webkit.org/changeset/244893> 1532515 6 commit-queue 2019-05-02 16:22:47 -0700 All reviewed patches have been landed. Closing bug. 368812 2019-05-02 13:12:15 -0700 2019-05-02 15:43:53 -0700 Patch bug-197523-20190502131214.patch text/plain 4740 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0ODA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFjYTdhMjJkNWE3YzYx ODk1MDNhZDhmMjliYjIzMWRmYmI1ZjU0Zi4uODU2MWU2MmU0YWVmNzhiMTVlYjVjYzRkZDM5Mzhm NWEzMjViMDI2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA1LTAyICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBOU0F0dHJpYnV0ZWRT dHJpbmcgY29udmVyc2lvbiBpbiBhIGxvb3AgcmV0dXJucyBuaWwgYW5kIFdLVW5rbm93bkVycm9y IGV2ZXJ5IG90aGVyIHRpbWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTc1MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGVkaXRpbmcvY29jb2EvSFRNTENvbnZlcnRlci5tbToKKyAgICAgICAgKEhU TUxDb252ZXJ0ZXI6OmNvbnZlcnQpOiBEb24ndCByZXR1cm4gZWFybHkgaWYgbV9kYXRhU291cmNl IGlzIG5pbC4gVGhpcyBpcyBhbHJlYWR5IG51bGwKKyAgICAgICAgY2hlY2tlZCBsYXRlciBhbmQg b25seSBuZWVkZWQgaW4gc3BlY2lmaWMgY2FzZXMsIGl0IHNob3VsZG4ndCBmYWlsIHRoZSB3aG9s ZSBjb252ZXJzaW9uLgorCiAyMDE5LTA0LTMwICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVA d2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjQ0NzczLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwppbmRleCAxZjZjYjQ0ZTE3ZjQ1NWM5NmNjMGJhMjIxYzY3ZDhmNmJlYmM2NzVjLi5jZTk4 YTc3YzJiMmQyM2NkNzQwMzFiZGY3MDExZTgwZDhjMmFkZTk1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDIyIEBACisyMDE5LTA1LTAyICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4K KworICAgICAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgY29udmVyc2lvbiBpbiBhIGxvb3AgcmV0dXJu cyBuaWwgYW5kIFdLVW5rbm93bkVycm9yIGV2ZXJ5IG90aGVyIHRpbWUuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc1MjMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWNoaW5nIHRoZSBXS1dlYlZpZXcg d2FzIGxvYWRpbmcgYWJvdXQ6YmxhbmsgdG8gdW5sb2FkIGFueSBwcmV2aW91cyBjb250ZW50Lgor ICAgICAgICBUaGlzIHdhcyBjYXVzaW5nIHN1YnNlcXVlbnQgcmFwaWQgY29udmVyc2lvbnMgdG8g ZmFpbCBzaW5jZSB0aGUgYmxhbmsgbG9hZAorICAgICAgICB3b3VsZCBiZSBjb25mdXNlZCB3aXRo IHRoZSByZWFsIGNvbnRlbnQgbG9hZGluZy4gVWx0aW1hdGx5IHRoaXMgd2Fzbid0IG5lZWRlZAor ICAgICAgICBzaW5jZSBhIHByb2Nlc3Mgc3dhcCB3aWxsIGxpa2VseSBoYXBwZW4sIGFuZCBjYWNo ZWQgdmlld3MgYXJlIGNsb3NlZCBxdWlja2x5LgorICAgICAgICBJdCBhbHNvIGF2b2lkcyBleHRy YSB3b3JrIGFuZCBzcGVlZHMgdXAgY29udmVyc2lvbnMgYSBiaXQuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL05TQXR0cmlidXRlZFN0cmluZy5tbToKKyAgICAgICAgKCtbX1dLQXR0 cmlidXRlZFN0cmluZ1dlYlZpZXdDYWNoZSBjYWNoZVdlYlZpZXc6XSk6IERvbid0IGxvYWQgYWJv dXQ6Ymxhbmsgd2hlbiBjYWNoaW5nLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9Db2Nv YS9XZWJQYWdlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmdldENvbnRlbnRz QXNBdHRyaWJ1dGVkU3RyaW5nKTogVXNlIHJhbmdlT2ZDb250ZW50cygpIGZvciBhIGZhaWwKKyAg ICAgICAgc2FmZSB3YXkgdG8gZ2V0IHRoZSByYW5nZSBuZWVkZWQuCisKIDIwMTktMDQtMzAgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uKFBTT04p IFVSTCBzY2hlbWUgaGFuZGxlcnMgY2FuIG5vIGxvbmdlciByZXNwb25kIGFzeW5jaHJvbm91c2x5 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0hUTUxDb252ZXJ0ZXIu bW0gYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0hUTUxDb252ZXJ0ZXIubW0KaW5kZXgg YjdhYjg5MGJmMjJhZGU4NWU2NDg4YThlZDlkY2FjZmUwNDgyYzViNy4uMWYzODAxOWYyNTNmODgy MmU3NTE2YmY0YzY4ODI2NWI5MTVjMWY3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRp dGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv Y29jb2EvSFRNTENvbnZlcnRlci5tbQpAQCAtNDA3LDggKzQwNyw2IEBAIE5TQXR0cmlidXRlZFN0 cmluZyAqSFRNTENvbnZlcnRlcjo6Y29udmVydChOU0RpY3Rpb25hcnkqKiBkb2N1bWVudEF0dHJp YnV0ZXMpCiAgICAgQVNTRVJUKGNvbW1vbkFuY2VzdG9yQ29udGFpbmVyKTsKIAogICAgIG1fZGF0 YVNvdXJjZSA9IGNvbW1vbkFuY2VzdG9yQ29udGFpbmVyLT5kb2N1bWVudCgpLmZyYW1lKCktPmxv YWRlcigpLmRvY3VtZW50TG9hZGVyKCk7Ci0gICAgaWYgKCFtX2RhdGFTb3VyY2UpCi0gICAgICAg IHJldHVybiBuaWw7CiAKICAgICBEb2N1bWVudCYgZG9jdW1lbnQgPSBjb21tb25BbmNlc3RvckNv bnRhaW5lci0+ZG9jdW1lbnQoKTsKICAgICBpZiAoYXV0byogYm9keSA9IGRvY3VtZW50LmJvZHlP ckZyYW1lc2V0KCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9OU0F0dHJpYnV0ZWRTdHJpbmcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvTlNBdHRyaWJ1dGVkU3RyaW5nLm1tCmluZGV4IDEwYTc2OTUyMzcwZmIzYmJjYzQ1MWY0 NWFkN2FhNzRmYWUwN2I2YWMuLjc4ZjVhM2EwYmE5NmZkYzljYzhlZTYwZGRkMTMwZmRlMWE5Y2Jk MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9OU0F0dHJp YnV0ZWRTdHJpbmcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL05T QXR0cmlidXRlZFN0cmluZy5tbQpAQCAtMTcwLDkgKzE3MCw2IEBAICsgKHZvaWQpY2FjaGVXZWJW aWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3CiAgICAgICAgIHJldHVybjsKIAogICAgIFtjYWNoZSBh ZGRPYmplY3Q6d2ViVmlld107Ci0KLSAgICAvLyBMb2FkIGEgYmxhbmsgcGFnZSB0byBjbGVhciBh bnl0aGluZyBsb2FkZWQgd2hpbGUgaW4gdGhlIGNhY2hlLgotICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJh Ym91dDpibGFuayJdXV07CiB9CiAKICsgKHZvaWQpcmVzZXRQdXJnZURlbGF5CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0g Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0K aW5kZXggYWMwNDI0NjAyODBhYmYxMGUyNDk4MTg5NjNkYjE5YzVmZjk5ODUxMS4uODhmNTVhMmY2 MWMwNWUyODE4ZjhiN2NmYTUxYjZlNTBjOTg1NDMxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQpAQCAtMjA1LDE4 ICsyMDUsMTAgQEAgV2ViUGF5bWVudENvb3JkaW5hdG9yKiBXZWJQYWdlOjpwYXltZW50Q29vcmRp bmF0b3IoKQogCiB2b2lkIFdlYlBhZ2U6OmdldENvbnRlbnRzQXNBdHRyaWJ1dGVkU3RyaW5nKENv bXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgQXR0cmlidXRlZFN0cmluZyYpPiYmIGNvbXBsZXRp b25IYW5kbGVyKQogewotICAgIEZyYW1lJiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7Ci0K LSAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUZyb21Mb2NhdGlv bkFuZExlbmd0aChmcmFtZS5kb2N1bWVudCgpLT5kb2N1bWVudEVsZW1lbnQoKSwgMCwgSU5UX01B WCk7Ci0gICAgaWYgKCFyYW5nZSkgewotICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgTlNEaWN0aW9uYXJ5KiBkb2N1bWVudEF0dHJp YnV0ZXMgPSBuaWw7CiAKICAgICBBdHRyaWJ1dGVkU3RyaW5nIHJlc3VsdDsKLSAgICByZXN1bHQu c3RyaW5nID0gYXR0cmlidXRlZFN0cmluZ0Zyb21SYW5nZSgqcmFuZ2UsICZkb2N1bWVudEF0dHJp YnV0ZXMpOworICAgIHJlc3VsdC5zdHJpbmcgPSBhdHRyaWJ1dGVkU3RyaW5nRnJvbVJhbmdlKHJh bmdlT2ZDb250ZW50cygqbV9wYWdlLT5tYWluRnJhbWUoKS5kb2N1bWVudCgpLT5kb2N1bWVudEVs ZW1lbnQoKSksICZkb2N1bWVudEF0dHJpYnV0ZXMpOwogICAgIHJlc3VsdC5kb2N1bWVudEF0dHJp YnV0ZXMgPSBkb2N1bWVudEF0dHJpYnV0ZXM7CiAKICAgICBjb21wbGV0aW9uSGFuZGxlcih7IHJl c3VsdCB9KTsK 368830 2019-05-02 15:43:54 -0700 2019-05-02 16:22:45 -0700 Patch bug-197523-20190502154353.patch text/plain 5181 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0ODA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFjYTdhMjJkNWE3YzYx ODk1MDNhZDhmMjliYjIzMWRmYmI1ZjU0Zi4uYmFmY2I1OGU4NWEwYzYzZjg1NjFmM2VmYzQyODU5 OGM0ZDY3OTFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA1LTAyICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBOU0F0dHJpYnV0ZWRT dHJpbmcgY29udmVyc2lvbiBpbiBhIGxvb3AgcmV0dXJucyBuaWwgYW5kIFdLVW5rbm93bkVycm9y IGV2ZXJ5IG90aGVyIHRpbWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTc1MjMKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKwor ICAgICAgICAqIGVkaXRpbmcvY29jb2EvSFRNTENvbnZlcnRlci5tbToKKyAgICAgICAgKEhUTUxD b252ZXJ0ZXI6OmNvbnZlcnQpOiBEb24ndCByZXR1cm4gZWFybHkgaWYgbV9kYXRhU291cmNlIGlz IG5pbC4gVGhpcyBpcyBhbHJlYWR5IG51bGwKKyAgICAgICAgY2hlY2tlZCBsYXRlciBhbmQgb25s eSBuZWVkZWQgaW4gc3BlY2lmaWMgY2FzZXMsIGl0IHNob3VsZG4ndCBmYWlsIHRoZSB3aG9sZSBj b252ZXJzaW9uLgorCiAyMDE5LTA0LTMwICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjQ0NzczLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwppbmRleCAxZjZjYjQ0ZTE3ZjQ1NWM5NmNjMGJhMjIxYzY3ZDhmNmJlYmM2NzVjLi4xNzdhZGEx MWViNzYzZDkzMmUzY2JhYjMxYjIxOTZlNTJhNWRlNTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE5LTA1LTAyICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKwor ICAgICAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgY29udmVyc2lvbiBpbiBhIGxvb3AgcmV0dXJucyBu aWwgYW5kIFdLVW5rbm93bkVycm9yIGV2ZXJ5IG90aGVyIHRpbWUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc1MjMKKworICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBDYWNoaW5nIHRoZSBXS1dlYlZpZXcgd2FzIGxv YWRpbmcgYWJvdXQ6YmxhbmsgdG8gdW5sb2FkIHRoZSBwcmV2aW91cyBjb250ZW50LgorICAgICAg ICBUaGlzIHdhcyBjYXVzaW5nIHN1YnNlcXVlbnQgcmFwaWQgY29udmVyc2lvbnMgdG8gZmFpbCBz aW5jZSB0aGUgYmxhbmsgbG9hZAorICAgICAgICB3b3VsZCBiZSBjb25mdXNlZCB3aXRoIHRoZSBy ZWFsIGNvbnRlbnQgbG9hZGluZy4gTG9hZGluZyBhIGJsYW5rIHBhZ2Ugd2Fzbid0CisgICAgICAg IHJlYWxseSBuZWVkZWQsIGl0IGp1c3QgaGVscGVkIGtlZXAgdGhlIGNhY2hlZCB2aWV3IGluIGEg Y2xlYW5lciBzdGF0ZS4gSW5zdGVhZAorICAgICAgICBvZiBhZGRpbmcgY29tcGxleGl0eSB0byB0 cmFjayB0aGUgZXh0cmEgbmF2aWdhdGlvbiwgd2UgY2FuIGVsaW1pbmF0ZSB0aGUgYmxhbmsgbG9h ZC4KKyAgICAgICAgVWx0aW1hdGVseSBhIHByb2Nlc3Mgc3dhcCB3aWxsIGxpa2VseSBoYXBwZW4g b24gdGhlIG5leHQgbmF2aWdhdGlvbiwgYW5kIHVudXNlZAorICAgICAgICBjYWNoZWQgdmlld3Mg YXJlIGNsb3NlZCBxdWlja2x5IC0tIHNvIHN0YWxlIGNvbnRlbnQgaXNuJ3QgaGVsZCBhcm91bmQg dG9vIGxvbmcuCisgICAgICAgIFRoaXMgYWxzbyBhdm9pZHMgZXh0cmEgd29yayBhbmQgc3BlZWRz IHVwIGNvbnZlcnNpb25zIGEgYml0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9O U0F0dHJpYnV0ZWRTdHJpbmcubW06CisgICAgICAgICgrW19XS0F0dHJpYnV0ZWRTdHJpbmdXZWJW aWV3Q2FjaGUgY2FjaGVXZWJWaWV3Ol0pOiBEb24ndCBsb2FkIGFib3V0OmJsYW5rIHdoZW4gY2Fj aGluZy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1t OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnZXRDb250ZW50c0FzQXR0cmlidXRlZFN0cmlu Zyk6IFVzZSByYW5nZU9mQ29udGVudHMoKSBmb3IgYSBmYWlsCisgICAgICAgIHNhZmUgd2F5IHRv IGdldCB0aGUgcmFuZ2UgbmVlZGVkLgorCiAyMDE5LTA0LTMwICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVncmVzc2lvbihQU09OKSBVUkwgc2NoZW1lIGhhbmRs ZXJzIGNhbiBubyBsb25nZXIgcmVzcG9uZCBhc3luY2hyb25vdXNseQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tIGIvU291cmNlL1dlYkNv cmUvZWRpdGluZy9jb2NvYS9IVE1MQ29udmVydGVyLm1tCmluZGV4IGI3YWI4OTBiZjIyYWRlODVl NjQ4OGE4ZWQ5ZGNhY2ZlMDQ4MmM1YjcuLjFmMzgwMTlmMjUzZjg4MjJlNzUxNmJmNGM2ODgyNjVi OTE1YzFmNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvSFRNTENv bnZlcnRlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0hUTUxDb252ZXJ0 ZXIubW0KQEAgLTQwNyw4ICs0MDcsNiBAQCBOU0F0dHJpYnV0ZWRTdHJpbmcgKkhUTUxDb252ZXJ0 ZXI6OmNvbnZlcnQoTlNEaWN0aW9uYXJ5KiogZG9jdW1lbnRBdHRyaWJ1dGVzKQogICAgIEFTU0VS VChjb21tb25BbmNlc3RvckNvbnRhaW5lcik7CiAKICAgICBtX2RhdGFTb3VyY2UgPSBjb21tb25B bmNlc3RvckNvbnRhaW5lci0+ZG9jdW1lbnQoKS5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExv YWRlcigpOwotICAgIGlmICghbV9kYXRhU291cmNlKQotICAgICAgICByZXR1cm4gbmlsOwogCiAg ICAgRG9jdW1lbnQmIGRvY3VtZW50ID0gY29tbW9uQW5jZXN0b3JDb250YWluZXItPmRvY3VtZW50 KCk7CiAgICAgaWYgKGF1dG8qIGJvZHkgPSBkb2N1bWVudC5ib2R5T3JGcmFtZXNldCgpKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvTlNBdHRyaWJ1dGVk U3RyaW5nLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL05TQXR0cmlidXRl ZFN0cmluZy5tbQppbmRleCAxMGE3Njk1MjM3MGZiM2JiY2M0NTFmNDVhZDdhYTc0ZmFlMDdiNmFj Li43OGY1YTNhMGJhOTZmZGM5Y2M4ZWU2MGRkZDEzMGZkZTFhOWNiZDJhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvTlNBdHRyaWJ1dGVkU3RyaW5nLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9OU0F0dHJpYnV0ZWRTdHJpbmcu bW0KQEAgLTE3MCw5ICsxNzAsNiBAQCArICh2b2lkKWNhY2hlV2ViVmlldzooV0tXZWJWaWV3ICop d2ViVmlldwogICAgICAgICByZXR1cm47CiAKICAgICBbY2FjaGUgYWRkT2JqZWN0OndlYlZpZXdd OwotCi0gICAgLy8gTG9hZCBhIGJsYW5rIHBhZ2UgdG8gY2xlYXIgYW55dGhpbmcgbG9hZGVkIHdo aWxlIGluIHRoZSBjYWNoZS4KLSAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0 IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiYWJvdXQ6YmxhbmsiXV1dOwog fQogCiArICh2b2lkKXJlc2V0UHVyZ2VEZWxheQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29hLm1tCmluZGV4IGFjMDQyNDYwMjgw YWJmMTBlMjQ5ODE4OTYzZGIxOWM1ZmY5OTg1MTEuLjNiNThkYzEzZjhjYTQ1ZDdmMGYwMzA5N2M1 NGZlNTQxNzMyOWJkYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0KQEAgLTIwNSwxMCArMjA1LDggQEAgV2ViUGF5 bWVudENvb3JkaW5hdG9yKiBXZWJQYWdlOjpwYXltZW50Q29vcmRpbmF0b3IoKQogCiB2b2lkIFdl YlBhZ2U6OmdldENvbnRlbnRzQXNBdHRyaWJ1dGVkU3RyaW5nKENvbXBsZXRpb25IYW5kbGVyPHZv aWQoY29uc3QgQXR0cmlidXRlZFN0cmluZyYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAg IEZyYW1lJiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7Ci0KLSAgICBSZWZQdHI8UmFuZ2U+ IHJhbmdlID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUZyb21Mb2NhdGlvbkFuZExlbmd0aChmcmFtZS5k b2N1bWVudCgpLT5kb2N1bWVudEVsZW1lbnQoKSwgMCwgSU5UX01BWCk7Ci0gICAgaWYgKCFyYW5n ZSkgeworICAgIGF1dG8qIGRvY3VtZW50RWxlbWVudCA9IG1fcGFnZS0+bWFpbkZyYW1lKCkuZG9j dW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCk7CisgICAgaWYgKCFkb2N1bWVudEVsZW1lbnQpIHsK ICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoeyB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K QEAgLTIxNiw3ICsyMTQsNyBAQCB2b2lkIFdlYlBhZ2U6OmdldENvbnRlbnRzQXNBdHRyaWJ1dGVk U3RyaW5nKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgQXR0cmlidQogICAgIE5TRGljdGlv bmFyeSogZG9jdW1lbnRBdHRyaWJ1dGVzID0gbmlsOwogCiAgICAgQXR0cmlidXRlZFN0cmluZyBy ZXN1bHQ7Ci0gICAgcmVzdWx0LnN0cmluZyA9IGF0dHJpYnV0ZWRTdHJpbmdGcm9tUmFuZ2UoKnJh bmdlLCAmZG9jdW1lbnRBdHRyaWJ1dGVzKTsKKyAgICByZXN1bHQuc3RyaW5nID0gYXR0cmlidXRl ZFN0cmluZ0Zyb21SYW5nZShyYW5nZU9mQ29udGVudHMoKmRvY3VtZW50RWxlbWVudCksICZkb2N1 bWVudEF0dHJpYnV0ZXMpOwogICAgIHJlc3VsdC5kb2N1bWVudEF0dHJpYnV0ZXMgPSBkb2N1bWVu dEF0dHJpYnV0ZXM7CiAKICAgICBjb21wbGV0aW9uSGFuZGxlcih7IHJlc3VsdCB9KTsK