173495 2017-06-16 14:03:44 -0700 Cleanup: WebContentMenuClient::searchWithGoogle() should parse URL using URL { URL { }, ... } instead of URL { ParsedURLString, ... } 2017-06-16 17:56:06 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates achristensen webkit-bug-importer oldest_to_newest 1320156 0 dbates 2017-06-16 14:03:44 -0700 When parsing an arbitrary string s that looks like a URL we should use URL { URL { }, s }. The constructor URL { ParsedURLString, s' } should only be used when s' is the result from URL::string(). WebContentMenuClient::searchWithGoogle() should use URL { URL { }, ... } to construct the URL object for the string it built. 1320157 1 313129 dbates 2017-06-16 14:04:59 -0700 Created attachment 313129 Patch 1320161 2 313130 dbates 2017-06-16 14:10:21 -0700 Created attachment 313130 Patch 1320162 3 313131 dbates 2017-06-16 14:11:46 -0700 Created attachment 313131 Patch 1320164 4 313131 achristensen 2017-06-16 14:12:22 -0700 Comment on attachment 313131 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313131&action=review > Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp:66 > + String url = "http://www.google.com/search?q=" + encoded + "&ie=UTF-8&oe=UTF-8"; I think makeString is even more efficient than calling operator+ twice. 1320171 5 dbates 2017-06-16 14:24:08 -0700 (In reply to Alex Christensen from comment #4) > Comment on attachment 313131 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=313131&action=review > > > Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp:66 > > + String url = "http://www.google.com/search?q=" + encoded + "&ie=UTF-8&oe=UTF-8"; > > I think makeString is even more efficient than calling operator+ twice. The StringOperators usage in this line is almost as efficient as makeString(), which is efficient enough for our use here. StringOperators ensures that we allocate for the finalized size once and then copy the parts just like makeString(). The difference between StringOperators and makeString() is the StringOperators can create temporaries and ultimately we need to convert from StringAppend to String. These differences likely go away with a good optimizing compiler. 1320272 6 webkit-bug-importer 2017-06-16 17:50:11 -0700 <rdar://problem/32827445> 1320275 7 dbates 2017-06-16 17:56:06 -0700 Committed r218435: <http://trac.webkit.org/changeset/218435> 313129 2017-06-16 14:04:59 -0700 2017-06-16 14:10:19 -0700 Patch bug-173495-20170616140458.patch text/plain 5362 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggY2NkN2U5NGU5 MDMzOGMyMmNiMjdkNjRhODU3ZTA2NmE5MDAzYjQ4Yy4uMjJiNThmYzI3YWYwM2I0YmQ3NmU0MWVh ODkxNzViMDRhZjZjYzMwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3 LTA2LTE2ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVh bnVwOiBXZWJDb250ZXh0TWVudUNsaWVudDo6c2VhcmNoV2l0aEdvb2dsZSgpIHNob3VsZCBwYXJz ZSBVUkwgdXNpbmcgVVJMKFVSTCgpLCAuLi4pCisgICAgICAgIGluc3RlYWQgb2YgVVJMKFBhcnNl ZFVSTFN0cmluZywgLi4uKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTczNDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVVJMKFBhcnNlZFVSTFN0cmluZywgLi4uKSBzaG91bGQgb25seSBiZSB1c2VkIHdp dGggYSBzdHJpbmcgdGhhdCB3YXMgdGhlIHJlc3VsdCBvZiBVUkw6OnN0cmluZygpLgorICAgICAg ICBPdGhlcndpc2UsIGl0IHdpbGwgY2F1c2UgYW4gYXNzZXJ0aW9uIGZhaWx1cmUgaWYgdGhlIGNh bm9uaWNhbGl6ZWQgVVJMIGRpZmZlcnMgZnJvbSB0aGUgc3RyaW5nLgorICAgICAgICBBbHRob3Vn aCBpdCBpcyB1bmxpa2VseSB0aGF0IHRoZSBoYXJkY29kZWQgc3RyaW5nIGluIFdlYkNvbnRleHRN ZW51Q2xpZW50OjpzZWFyY2hXaXRoR29vZ2xlKCkKKyAgICAgICAgd291bGQgZGlmZmVyIGZyb20g dGhlIGNhbm9uaWNhbGl6ZWQgVVJMIGl0IGlzIGJlc3QgcHJhY3RpY2UgdG8gdXNlIFVSTChVUkwo KSwgLi4uKSB0bworICAgICAgICBwYXJzZSBhbiBhcmJpdHJhcnkgc3RyaW5nIHRoYXQgbG9va3Mg bGlrZSBhIFVSTC4KKworICAgICAgICBBbHNvIG1vZGVybml6ZSB0aGUgY29kZSB1c2luZyBDKysx NCBpZGlvbXMuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVu dC5jcHA6CisgICAgICAgIChXZWJDb250ZXh0TWVudUNsaWVudDo6c2VhcmNoV2l0aEdvb2dsZSk6 CisKIDIwMTctMDYtMTUgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+ CiAKICAgICAgICAgW1dpbl0gV2ViS2l0IHNob3VsZG4ndCBpbmNsdWRlIHRoZSBmb3J3YXJkaW5n IGhlYWRlciBvZiBXZWJLaXQgaXRzZWxmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGQ0ZDU2YmU4NTExN2RiNDEy MjIyYzk1MmIzMzRmNjYzZjUxYmY5OS4uNmVlZDFhODlhYTE0OTM5NjkyNjJlMzk5ODFjZmU5OGE3 ZjZmYzZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA2LTE2ICBEYW5pZWwg QmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwOiBXZWJDb250ZXh0 TWVudUNsaWVudDo6c2VhcmNoV2l0aEdvb2dsZSgpIHNob3VsZCBwYXJzZSBVUkwgdXNpbmcgVVJM KFVSTCgpLCAuLi4pCisgICAgICAgIGluc3RlYWQgb2YgVVJMKFBhcnNlZFVSTFN0cmluZywgLi4u KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNDk1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVVJMKFBh cnNlZFVSTFN0cmluZywgLi4uKSBzaG91bGQgb25seSBiZSB1c2VkIHdpdGggYSBzdHJpbmcgdGhh dCB3YXMgdGhlIHJlc3VsdCBvZiBVUkw6OnN0cmluZygpLgorICAgICAgICBPdGhlcndpc2UsIGl0 IHdpbGwgY2F1c2UgYW4gYXNzZXJ0aW9uIGZhaWx1cmUgaWYgdGhlIGNhbm9uaWNhbGl6ZWQgVVJM IGRpZmZlcnMgZnJvbSB0aGUgc3RyaW5nLgorICAgICAgICBBbHRob3VnaCBpdCBpcyB1bmxpa2Vs eSB0aGF0IHRoZSBoYXJkY29kZWQgc3RyaW5nIGluIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzZWFy Y2hXaXRoR29vZ2xlKCkKKyAgICAgICAgd291bGQgZGlmZmVyIGZyb20gdGhlIGNhbm9uaWNhbGl6 ZWQgVVJMIGl0IGlzIGJlc3QgcHJhY3RpY2UgdG8gdXNlIFVSTChVUkwoKSwgLi4uKSB0bworICAg ICAgICBwYXJzZSBhbiBhcmJpdHJhcnkgc3RyaW5nIHRoYXQgbG9va3MgbGlrZSBhIFVSTC4KKwor ICAgICAgICBBbHNvIG1vZGVybml6ZSB0aGUgY29kZSB1c2luZyBDKysxNCBpZGlvbXMuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVDbGllbnQ6OnNlYXJjaFdpdGhHb29n bGUpOgorCiAyMDE3LTA2LTE1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgogCiAgICAgICAgIFVzaW5nIC1bV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZCBzZXRJdGVtUHJv dmlkZXJzOl0gdG8gc3dhcCBvdXQgaXRlbSBwcm92aWRlcnMgYmVmb3JlIGEgZHJvcCBicmVha3Mg aXRlbSBwcm92aWRlciBsb2FkaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJD b3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9X ZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKaW5kZXggNjJlYjE1OTZkYjY3 NjJkOWZjZTRlYWE0MWZhMGJiMzJiNjFlNzQwNy4uNmM5MzIwNDQ3NjE1ZTIyMzBiZmYxOTlhMzk1 YjYxN2FlMGYyODhmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBv cnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNv cmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtNjEsMTUgKzYxLDE1IEBAIHZv aWQgV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNlYXJjaFdpdGhHb29nbGUoY29uc3QgRnJhbWUqIGZy YW1lKQogICAgIFN0cmluZyBzZWFyY2hTdHJpbmcgPSBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRU ZXh0KCk7CiAgICAgc2VhcmNoU3RyaW5nLnN0cmlwV2hpdGVTcGFjZSgpOwogICAgIFN0cmluZyBl bmNvZGVkID0gZW5jb2RlV2l0aFVSTEVzY2FwZVNlcXVlbmNlcyhzZWFyY2hTdHJpbmcpOwotICAg IGVuY29kZWQucmVwbGFjZSgiJTIwIiwgIisiKTsKLSAgICAKKyAgICBlbmNvZGVkLnJlcGxhY2Uo QVNDSUlMaXRlcmFsKCIlMjAiKSwgQVNDSUlMaXRlcmFsKCIrIikpOworCiAgICAgU3RyaW5nIHVy bCgiaHR0cDovL3d3dy5nb29nbGUuY29tL3NlYXJjaD9xPSIpOwogICAgIHVybC5hcHBlbmQoZW5j b2RlZCk7CiAgICAgdXJsLmFwcGVuZCgiJmllPVVURi04Jm9lPVVURi04Iik7CiAKICAgICBpZiAo UGFnZSogcGFnZSA9IGZyYW1lLT5wYWdlKCkpIHsKICAgICAgICAgVXNlckdlc3R1cmVJbmRpY2F0 b3IgaW5kaWNhdG9yKFByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7Ci0gICAgICAgIHBhZ2UtPm1haW5G cmFtZSgpLmxvYWRlcigpLnVybFNlbGVjdGVkKFVSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIFN0 cmluZygpLCAwLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBNYXli ZVNlbmRSZWZlcnJlciwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxs b3cpOworICAgICAgICBwYWdlLT5tYWluRnJhbWUoKS5sb2FkZXIoKS51cmxTZWxlY3RlZChVUkwg eyBVUkwgeyB9LCB1cmwgfSwgeyB9LCBudWxscHRyLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNr Rm9yd2FyZExpc3Q6Ok5vLCBNYXliZVNlbmRSZWZlcnJlciwgU2hvdWxkT3BlbkV4dGVybmFsVVJM c1BvbGljeTo6U2hvdWxkTm90QWxsb3cpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRN ZW51Q2xpZW50LmNwcAppbmRleCAxMGQ4ZjU2YjM3NmIxMWIzZmY2ZjExZmE5MzZmZTlkOTYxN2I3 ZGEwLi43M2Q5NWNlNTllYjYxYTc4Y2U2OGM5ZWRkMDZkZTc4NTU4MjdmYjk1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51 Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkNvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtNjIsMTMgKzYyLDEzIEBAIHZvaWQgV2ViQ29u dGV4dE1lbnVDbGllbnQ6OnNlYXJjaFdpdGhHb29nbGUoY29uc3QgRnJhbWUqIGZyYW1lKQogICAg IFN0cmluZyBzZWFyY2hTdHJpbmcgPSBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRUZXh0KCk7CiAg ICAgc2VhcmNoU3RyaW5nLnN0cmlwV2hpdGVTcGFjZSgpOwogICAgIFN0cmluZyBlbmNvZGVkID0g ZW5jb2RlV2l0aFVSTEVzY2FwZVNlcXVlbmNlcyhzZWFyY2hTdHJpbmcpOwotICAgIGVuY29kZWQu cmVwbGFjZSgiJTIwIiwgIisiKTsKLSAgICAKKyAgICBlbmNvZGVkLnJlcGxhY2UoQVNDSUlMaXRl cmFsKCIlMjAiKSwgQVNDSUlMaXRlcmFsKCIrIikpOworCiAgICAgU3RyaW5nIHVybCA9ICJodHRw Oi8vd3d3Lmdvb2dsZS5jb20vc2VhcmNoP3E9IiArIGVuY29kZWQgKyAiJmllPVVURi04Jm9lPVVU Ri04IjsKIAogICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKSkgewogICAgICAgICBV c2VyR2VzdHVyZUluZGljYXRvciBpbmRpY2F0b3IoUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKTsKLSAg ICAgICAgcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkudXJsU2VsZWN0ZWQoVVJMKFBhcnNlZFVS TFN0cmluZywgdXJsKSwgU3RyaW5nKCksIDAsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3 YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9s aWN5OjpTaG91bGROb3RBbGxvdyk7CisgICAgICAgIHBhZ2UtPm1haW5GcmFtZSgpLmxvYWRlcigp LnVybFNlbGVjdGVkKFVSTCB7IFVSTCB7IH0sIHVybCB9LCB7IH0sIG51bGxwdHIsIExvY2tIaXN0 b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBTaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdyk7CiAgICAgfQogfQogI2Vu ZGlmCg== 313130 2017-06-16 14:10:21 -0700 2017-06-16 14:11:44 -0700 Patch bug-173495-20170616141020.patch text/plain 5460 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggY2NkN2U5NGU5 MDMzOGMyMmNiMjdkNjRhODU3ZTA2NmE5MDAzYjQ4Yy4uMjJiNThmYzI3YWYwM2I0YmQ3NmU0MWVh ODkxNzViMDRhZjZjYzMwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3 LTA2LTE2ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVh bnVwOiBXZWJDb250ZXh0TWVudUNsaWVudDo6c2VhcmNoV2l0aEdvb2dsZSgpIHNob3VsZCBwYXJz ZSBVUkwgdXNpbmcgVVJMKFVSTCgpLCAuLi4pCisgICAgICAgIGluc3RlYWQgb2YgVVJMKFBhcnNl ZFVSTFN0cmluZywgLi4uKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTczNDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVVJMKFBhcnNlZFVSTFN0cmluZywgLi4uKSBzaG91bGQgb25seSBiZSB1c2VkIHdp dGggYSBzdHJpbmcgdGhhdCB3YXMgdGhlIHJlc3VsdCBvZiBVUkw6OnN0cmluZygpLgorICAgICAg ICBPdGhlcndpc2UsIGl0IHdpbGwgY2F1c2UgYW4gYXNzZXJ0aW9uIGZhaWx1cmUgaWYgdGhlIGNh bm9uaWNhbGl6ZWQgVVJMIGRpZmZlcnMgZnJvbSB0aGUgc3RyaW5nLgorICAgICAgICBBbHRob3Vn aCBpdCBpcyB1bmxpa2VseSB0aGF0IHRoZSBoYXJkY29kZWQgc3RyaW5nIGluIFdlYkNvbnRleHRN ZW51Q2xpZW50OjpzZWFyY2hXaXRoR29vZ2xlKCkKKyAgICAgICAgd291bGQgZGlmZmVyIGZyb20g dGhlIGNhbm9uaWNhbGl6ZWQgVVJMIGl0IGlzIGJlc3QgcHJhY3RpY2UgdG8gdXNlIFVSTChVUkwo KSwgLi4uKSB0bworICAgICAgICBwYXJzZSBhbiBhcmJpdHJhcnkgc3RyaW5nIHRoYXQgbG9va3Mg bGlrZSBhIFVSTC4KKworICAgICAgICBBbHNvIG1vZGVybml6ZSB0aGUgY29kZSB1c2luZyBDKysx NCBpZGlvbXMuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVu dC5jcHA6CisgICAgICAgIChXZWJDb250ZXh0TWVudUNsaWVudDo6c2VhcmNoV2l0aEdvb2dsZSk6 CisKIDIwMTctMDYtMTUgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+ CiAKICAgICAgICAgW1dpbl0gV2ViS2l0IHNob3VsZG4ndCBpbmNsdWRlIHRoZSBmb3J3YXJkaW5n IGhlYWRlciBvZiBXZWJLaXQgaXRzZWxmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGQ0ZDU2YmU4NTExN2RiNDEy MjIyYzk1MmIzMzRmNjYzZjUxYmY5OS4uNmVlZDFhODlhYTE0OTM5NjkyNjJlMzk5ODFjZmU5OGE3 ZjZmYzZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA2LTE2ICBEYW5pZWwg QmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwOiBXZWJDb250ZXh0 TWVudUNsaWVudDo6c2VhcmNoV2l0aEdvb2dsZSgpIHNob3VsZCBwYXJzZSBVUkwgdXNpbmcgVVJM KFVSTCgpLCAuLi4pCisgICAgICAgIGluc3RlYWQgb2YgVVJMKFBhcnNlZFVSTFN0cmluZywgLi4u KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNDk1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVVJMKFBh cnNlZFVSTFN0cmluZywgLi4uKSBzaG91bGQgb25seSBiZSB1c2VkIHdpdGggYSBzdHJpbmcgdGhh dCB3YXMgdGhlIHJlc3VsdCBvZiBVUkw6OnN0cmluZygpLgorICAgICAgICBPdGhlcndpc2UsIGl0 IHdpbGwgY2F1c2UgYW4gYXNzZXJ0aW9uIGZhaWx1cmUgaWYgdGhlIGNhbm9uaWNhbGl6ZWQgVVJM IGRpZmZlcnMgZnJvbSB0aGUgc3RyaW5nLgorICAgICAgICBBbHRob3VnaCBpdCBpcyB1bmxpa2Vs eSB0aGF0IHRoZSBoYXJkY29kZWQgc3RyaW5nIGluIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzZWFy Y2hXaXRoR29vZ2xlKCkKKyAgICAgICAgd291bGQgZGlmZmVyIGZyb20gdGhlIGNhbm9uaWNhbGl6 ZWQgVVJMIGl0IGlzIGJlc3QgcHJhY3RpY2UgdG8gdXNlIFVSTChVUkwoKSwgLi4uKSB0bworICAg ICAgICBwYXJzZSBhbiBhcmJpdHJhcnkgc3RyaW5nIHRoYXQgbG9va3MgbGlrZSBhIFVSTC4KKwor ICAgICAgICBBbHNvIG1vZGVybml6ZSB0aGUgY29kZSB1c2luZyBDKysxNCBpZGlvbXMuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVDbGllbnQ6OnNlYXJjaFdpdGhHb29n bGUpOgorCiAyMDE3LTA2LTE1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgogCiAgICAgICAgIFVzaW5nIC1bV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZCBzZXRJdGVtUHJv dmlkZXJzOl0gdG8gc3dhcCBvdXQgaXRlbSBwcm92aWRlcnMgYmVmb3JlIGEgZHJvcCBicmVha3Mg aXRlbSBwcm92aWRlciBsb2FkaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJD b3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9X ZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKaW5kZXggNjJlYjE1OTZkYjY3 NjJkOWZjZTRlYWE0MWZhMGJiMzJiNjFlNzQwNy4uOWYxYWExNzQ3NWEwOWFmNDdiNmZjYTkzY2E4 NmUxZDc1NzU3ZTg1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBv cnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNv cmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtNjEsMTUgKzYxLDEzIEBAIHZv aWQgV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNlYXJjaFdpdGhHb29nbGUoY29uc3QgRnJhbWUqIGZy YW1lKQogICAgIFN0cmluZyBzZWFyY2hTdHJpbmcgPSBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRU ZXh0KCk7CiAgICAgc2VhcmNoU3RyaW5nLnN0cmlwV2hpdGVTcGFjZSgpOwogICAgIFN0cmluZyBl bmNvZGVkID0gZW5jb2RlV2l0aFVSTEVzY2FwZVNlcXVlbmNlcyhzZWFyY2hTdHJpbmcpOwotICAg IGVuY29kZWQucmVwbGFjZSgiJTIwIiwgIisiKTsKLSAgICAKLSAgICBTdHJpbmcgdXJsKCJodHRw Oi8vd3d3Lmdvb2dsZS5jb20vc2VhcmNoP3E9Iik7Ci0gICAgdXJsLmFwcGVuZChlbmNvZGVkKTsK LSAgICB1cmwuYXBwZW5kKCImaWU9VVRGLTgmb2U9VVRGLTgiKTsKKyAgICBlbmNvZGVkLnJlcGxh Y2UoQVNDSUlMaXRlcmFsIHsgIiUyMCIgfSwgQVNDSUlMaXRlcmFsIHsgIisiIH0pOworCisgICAg U3RyaW5nIHVybCA9ICJodHRwOi8vd3d3Lmdvb2dsZS5jb20vc2VhcmNoP3E9IiArIGVuY29kZWQg KyAiJmllPVVURi04Jm9lPVVURi04IjsKIAogICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBh Z2UoKSkgewogICAgICAgICBVc2VyR2VzdHVyZUluZGljYXRvciBpbmRpY2F0b3IoUHJvY2Vzc2lu Z1VzZXJHZXN0dXJlKTsKLSAgICAgICAgcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkudXJsU2Vs ZWN0ZWQoVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSwgU3RyaW5nKCksIDAsIExvY2tIaXN0b3J5 OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBTaG91bGRP cGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdyk7CisgICAgICAgIHBhZ2UtPm1h aW5GcmFtZSgpLmxvYWRlcigpLnVybFNlbGVjdGVkKFVSTCB7IFVSTCB7IH0sIHVybCB9LCB7IH0s IG51bGxwdHIsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIE1heWJl U2VuZFJlZmVycmVyLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxv dyk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwCmluZGV4IDEw ZDhmNTZiMzc2YjExYjNmZjZmMTFmYTkzNmZlOWQ5NjE3YjdkYTAuLjZkNThlMzY3MjdiYWRlNjc0 NWY0ZWQwY2YzZmNiMjcxYWVjYTQ0ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQu Y3BwCkBAIC02MiwxMyArNjIsMTMgQEAgdm9pZCBXZWJDb250ZXh0TWVudUNsaWVudDo6c2VhcmNo V2l0aEdvb2dsZShjb25zdCBGcmFtZSogZnJhbWUpCiAgICAgU3RyaW5nIHNlYXJjaFN0cmluZyA9 IGZyYW1lLT5lZGl0b3IoKS5zZWxlY3RlZFRleHQoKTsKICAgICBzZWFyY2hTdHJpbmcuc3RyaXBX aGl0ZVNwYWNlKCk7CiAgICAgU3RyaW5nIGVuY29kZWQgPSBlbmNvZGVXaXRoVVJMRXNjYXBlU2Vx dWVuY2VzKHNlYXJjaFN0cmluZyk7Ci0gICAgZW5jb2RlZC5yZXBsYWNlKCIlMjAiLCAiKyIpOwot ICAgIAorICAgIGVuY29kZWQucmVwbGFjZShBU0NJSUxpdGVyYWwgeyAiJTIwIiB9LCBBU0NJSUxp dGVyYWwgeyAiKyIgfSk7CisKICAgICBTdHJpbmcgdXJsID0gImh0dHA6Ly93d3cuZ29vZ2xlLmNv bS9zZWFyY2g/cT0iICsgZW5jb2RlZCArICImaWU9VVRGLTgmb2U9VVRGLTgiOwogCiAgICAgaWYg KFBhZ2UqIHBhZ2UgPSBmcmFtZS0+cGFnZSgpKSB7CiAgICAgICAgIFVzZXJHZXN0dXJlSW5kaWNh dG9yIGluZGljYXRvcihQcm9jZXNzaW5nVXNlckdlc3R1cmUpOwotICAgICAgICBwYWdlLT5tYWlu RnJhbWUoKS5sb2FkZXIoKS51cmxTZWxlY3RlZChVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpLCBT dHJpbmcoKSwgMCwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywgTWF5 YmVTZW5kUmVmZXJyZXIsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFs bG93KTsKKyAgICAgICAgcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkudXJsU2VsZWN0ZWQoVVJM IHsgVVJMIHsgfSwgdXJsIH0sIHsgfSwgbnVsbHB0ciwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFj a0ZvcndhcmRMaXN0OjpObywgTWF5YmVTZW5kUmVmZXJyZXIsIFNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3k6OlNob3VsZE5vdEFsbG93KTsKICAgICB9CiB9CiAjZW5kaWYK 313131 2017-06-16 14:11:46 -0700 2017-06-16 14:12:22 -0700 Patch bug-173495-20170616141145.patch text/plain 5476 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4MzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggY2NkN2U5NGU5 MDMzOGMyMmNiMjdkNjRhODU3ZTA2NmE5MDAzYjQ4Yy4uOTA5ZDgwYzJlMWQwZmJjYzkwYzM5YmZk MjNiOTg4OGE5MzYzOTdjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3 LTA2LTE2ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVh bnVwOiBXZWJDb250ZXh0TWVudUNsaWVudDo6c2VhcmNoV2l0aEdvb2dsZSgpIHNob3VsZCBwYXJz ZSBVUkwgdXNpbmcgVVJMIHsgVVJMIHsgfSwgLi4uIH0KKyAgICAgICAgaW5zdGVhZCBvZiBVUkwg eyBQYXJzZWRVUkxTdHJpbmcsIC4uLiB9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNzM0OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVUkwoUGFyc2VkVVJMU3RyaW5nLCAuLi4pIHNob3VsZCBvbmx5IGJl IHVzZWQgd2l0aCBhIHN0cmluZyB0aGF0IHdhcyB0aGUgcmVzdWx0IG9mIFVSTDo6c3RyaW5nKCku CisgICAgICAgIE90aGVyd2lzZSwgaXQgd2lsbCBjYXVzZSBhbiBhc3NlcnRpb24gZmFpbHVyZSBp ZiB0aGUgY2Fub25pY2FsaXplZCBVUkwgZGlmZmVycyBmcm9tIHRoZSBzdHJpbmcuCisgICAgICAg IEFsdGhvdWdoIGl0IGlzIHVubGlrZWx5IHRoYXQgdGhlIGhhcmRjb2RlZCBzdHJpbmcgaW4gV2Vi Q29udGV4dE1lbnVDbGllbnQ6OnNlYXJjaFdpdGhHb29nbGUoKQorICAgICAgICB3b3VsZCBkaWZm ZXIgZnJvbSB0aGUgY2Fub25pY2FsaXplZCBVUkwgaXQgaXMgYmVzdCBwcmFjdGljZSB0byB1c2Ug VVJMKFVSTCgpLCAuLi4pIHRvCisgICAgICAgIHBhcnNlIGFuIGFyYml0cmFyeSBzdHJpbmcgdGhh dCBsb29rcyBsaWtlIGEgVVJMLgorCisgICAgICAgIEFsc28gbW9kZXJuaXplIHRoZSBjb2RlIHVz aW5nIEMrKzE0IGlkaW9tcy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRN ZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkNvbnRleHRNZW51Q2xpZW50OjpzZWFyY2hXaXRo R29vZ2xlKToKKwogMjAxNy0wNi0xNSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KIAogICAgICAgICBbV2luXSBXZWJLaXQgc2hvdWxkbid0IGluY2x1ZGUgdGhlIGZv cndhcmRpbmcgaGVhZGVyIG9mIFdlYktpdCBpdHNlbGYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBkZDRkNTZiZTg1 MTE3ZGI0MTIyMjJjOTUyYjMzNGY2NjNmNTFiZjk5Li5lNWFiZTk1NjBkOGE0NzUzMTRjZjdjNTdm NDg5OGEzNWUxODlmNDI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTctMDYtMTYg IERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFudXA6IFdl YkNvbnRleHRNZW51Q2xpZW50OjpzZWFyY2hXaXRoR29vZ2xlKCkgc2hvdWxkIHBhcnNlIFVSTCB1 c2luZyBVUkwgeyBVUkwgeyB9LCAuLi4gfQorICAgICAgICBpbnN0ZWFkIG9mIFVSTCB7IFBhcnNl ZFVSTFN0cmluZywgLi4uIH0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MzQ5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVSTChQYXJzZWRVUkxTdHJpbmcsIC4uLikgc2hvdWxkIG9ubHkgYmUgdXNlZCB3 aXRoIGEgc3RyaW5nIHRoYXQgd2FzIHRoZSByZXN1bHQgb2YgVVJMOjpzdHJpbmcoKS4KKyAgICAg ICAgT3RoZXJ3aXNlLCBpdCB3aWxsIGNhdXNlIGFuIGFzc2VydGlvbiBmYWlsdXJlIGlmIHRoZSBj YW5vbmljYWxpemVkIFVSTCBkaWZmZXJzIGZyb20gdGhlIHN0cmluZy4KKyAgICAgICAgQWx0aG91 Z2ggaXQgaXMgdW5saWtlbHkgdGhhdCB0aGUgaGFyZGNvZGVkIHN0cmluZyBpbiBXZWJDb250ZXh0 TWVudUNsaWVudDo6c2VhcmNoV2l0aEdvb2dsZSgpCisgICAgICAgIHdvdWxkIGRpZmZlciBmcm9t IHRoZSBjYW5vbmljYWxpemVkIFVSTCBpdCBpcyBiZXN0IHByYWN0aWNlIHRvIHVzZSBVUkwoVVJM KCksIC4uLikgdG8KKyAgICAgICAgcGFyc2UgYW4gYXJiaXRyYXJ5IHN0cmluZyB0aGF0IGxvb2tz IGxpa2UgYSBVUkwuCisKKyAgICAgICAgQWxzbyBtb2Rlcm5pemUgdGhlIGNvZGUgdXNpbmcgQysr MTQgaWRpb21zLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb250 ZXh0TWVudUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51Q2xpZW50 OjpzZWFyY2hXaXRoR29vZ2xlKToKKwogMjAxNy0wNi0xNSAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2luZyAtW1dlYkl0ZW1Qcm92aWRlclBhc3Rl Ym9hcmQgc2V0SXRlbVByb3ZpZGVyczpdIHRvIHN3YXAgb3V0IGl0ZW0gcHJvdmlkZXJzIGJlZm9y ZSBhIGRyb3AgYnJlYWtzIGl0ZW0gcHJvdmlkZXIgbG9hZGluZwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwIGIvU291 cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwCmlu ZGV4IDYyZWIxNTk2ZGI2NzYyZDlmY2U0ZWFhNDFmYTBiYjMyYjYxZTc0MDcuLjlmMWFhMTc0NzVh MDlhZjQ3YjZmY2E5M2NhODZlMWQ3NTc1N2U4NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv d2luL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKQEAgLTYx LDE1ICs2MSwxMyBAQCB2b2lkIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzZWFyY2hXaXRoR29vZ2xl KGNvbnN0IEZyYW1lKiBmcmFtZSkKICAgICBTdHJpbmcgc2VhcmNoU3RyaW5nID0gZnJhbWUtPmVk aXRvcigpLnNlbGVjdGVkVGV4dCgpOwogICAgIHNlYXJjaFN0cmluZy5zdHJpcFdoaXRlU3BhY2Uo KTsKICAgICBTdHJpbmcgZW5jb2RlZCA9IGVuY29kZVdpdGhVUkxFc2NhcGVTZXF1ZW5jZXMoc2Vh cmNoU3RyaW5nKTsKLSAgICBlbmNvZGVkLnJlcGxhY2UoIiUyMCIsICIrIik7Ci0gICAgCi0gICAg U3RyaW5nIHVybCgiaHR0cDovL3d3dy5nb29nbGUuY29tL3NlYXJjaD9xPSIpOwotICAgIHVybC5h cHBlbmQoZW5jb2RlZCk7Ci0gICAgdXJsLmFwcGVuZCgiJmllPVVURi04Jm9lPVVURi04Iik7Cisg ICAgZW5jb2RlZC5yZXBsYWNlKEFTQ0lJTGl0ZXJhbCB7ICIlMjAiIH0sIEFTQ0lJTGl0ZXJhbCB7 ICIrIiB9KTsKKworICAgIFN0cmluZyB1cmwgPSAiaHR0cDovL3d3dy5nb29nbGUuY29tL3NlYXJj aD9xPSIgKyBlbmNvZGVkICsgIiZpZT1VVEYtOCZvZT1VVEYtOCI7CiAKICAgICBpZiAoUGFnZSog cGFnZSA9IGZyYW1lLT5wYWdlKCkpIHsKICAgICAgICAgVXNlckdlc3R1cmVJbmRpY2F0b3IgaW5k aWNhdG9yKFByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7Ci0gICAgICAgIHBhZ2UtPm1haW5GcmFtZSgp LmxvYWRlcigpLnVybFNlbGVjdGVkKFVSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIFN0cmluZygp LCAwLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBNYXliZVNlbmRS ZWZlcnJlciwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cpOwor ICAgICAgICBwYWdlLT5tYWluRnJhbWUoKS5sb2FkZXIoKS51cmxTZWxlY3RlZChVUkwgeyBVUkwg eyB9LCB1cmwgfSwgeyB9LCBudWxscHRyLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2Fy ZExpc3Q6Ok5vLCBNYXliZVNlbmRSZWZlcnJlciwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eTo6U2hvdWxkTm90QWxsb3cpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xp ZW50LmNwcAppbmRleCAxMGQ4ZjU2YjM3NmIxMWIzZmY2ZjExZmE5MzZmZTlkOTYxN2I3ZGEwLi42 ZDU4ZTM2NzI3YmFkZTY3NDVmNGVkMGNmM2ZjYjI3MWFlY2E0NGY1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNv bnRleHRNZW51Q2xpZW50LmNwcApAQCAtNjIsMTMgKzYyLDEzIEBAIHZvaWQgV2ViQ29udGV4dE1l bnVDbGllbnQ6OnNlYXJjaFdpdGhHb29nbGUoY29uc3QgRnJhbWUqIGZyYW1lKQogICAgIFN0cmlu ZyBzZWFyY2hTdHJpbmcgPSBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRUZXh0KCk7CiAgICAgc2Vh cmNoU3RyaW5nLnN0cmlwV2hpdGVTcGFjZSgpOwogICAgIFN0cmluZyBlbmNvZGVkID0gZW5jb2Rl V2l0aFVSTEVzY2FwZVNlcXVlbmNlcyhzZWFyY2hTdHJpbmcpOwotICAgIGVuY29kZWQucmVwbGFj ZSgiJTIwIiwgIisiKTsKLSAgICAKKyAgICBlbmNvZGVkLnJlcGxhY2UoQVNDSUlMaXRlcmFsIHsg IiUyMCIgfSwgQVNDSUlMaXRlcmFsIHsgIisiIH0pOworCiAgICAgU3RyaW5nIHVybCA9ICJodHRw Oi8vd3d3Lmdvb2dsZS5jb20vc2VhcmNoP3E9IiArIGVuY29kZWQgKyAiJmllPVVURi04Jm9lPVVU Ri04IjsKIAogICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKSkgewogICAgICAgICBV c2VyR2VzdHVyZUluZGljYXRvciBpbmRpY2F0b3IoUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKTsKLSAg ICAgICAgcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkudXJsU2VsZWN0ZWQoVVJMKFBhcnNlZFVS TFN0cmluZywgdXJsKSwgU3RyaW5nKCksIDAsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3 YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9s aWN5OjpTaG91bGROb3RBbGxvdyk7CisgICAgICAgIHBhZ2UtPm1haW5GcmFtZSgpLmxvYWRlcigp LnVybFNlbGVjdGVkKFVSTCB7IFVSTCB7IH0sIHVybCB9LCB7IH0sIG51bGxwdHIsIExvY2tIaXN0 b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBTaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdyk7CiAgICAgfQogfQogI2Vu ZGlmCg==