195572 2019-03-11 14:24:09 -0700 Rename originsMatch in originSerializationsMatch 2019-03-13 09:49:03 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=195362 InRadar P2 Normal --- 1 youennf youennf achristensen beidson commit-queue jiewen_tan webkit-bug-importer oldest_to_newest 1514999 0 youennf 2019-03-11 14:24:09 -0700 Rename originsMatch in originSerializationsMatch. That will make it clearer the intent of this method. 1515001 1 364286 youennf 2019-03-11 14:26:42 -0700 Created attachment 364286 Patch 1515173 2 364286 jiewen_tan 2019-03-11 18:45:55 -0700 Comment on attachment 364286 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364286&action=review > Source/WebCore/ChangeLog:3 > + Rename originsMatch in originSerializationsMatch Will serializedOriginsMatch be a better name? 1515177 3 364286 jiewen_tan 2019-03-11 18:52:28 -0700 Comment on attachment 364286 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364286&action=review >> Source/WebCore/ChangeLog:3 >> + Rename originsMatch in originSerializationsMatch > > Will serializedOriginsMatch be a better name? Anymore, they are more or less the same. LGTM. r=me. 1515178 4 jiewen_tan 2019-03-11 18:52:45 -0700 (In reply to Jiewen Tan from comment #3) > Comment on attachment 364286 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=364286&action=review > > >> Source/WebCore/ChangeLog:3 > >> + Rename originsMatch in originSerializationsMatch > > > > Will serializedOriginsMatch be a better name? > > Anymore, they are more or less the same. LGTM. r=me. I mean anyway... 1515490 5 364399 youennf 2019-03-12 10:16:11 -0700 Created attachment 364399 Patch for landing 1515527 6 364399 commit-queue 2019-03-12 11:08:23 -0700 Comment on attachment 364399 Patch for landing Clearing flags on attachment: 364399 Committed r242804: <https://trac.webkit.org/changeset/242804> 1515528 7 commit-queue 2019-03-12 11:08:24 -0700 All reviewed patches have been landed. Closing bug. 1515545 8 webkit-bug-importer 2019-03-12 11:33:03 -0700 <rdar://problem/48816174> 1515999 9 youennf 2019-03-13 09:49:03 -0700 (In reply to Jiewen Tan from comment #2) > Comment on attachment 364286 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=364286&action=review > > > Source/WebCore/ChangeLog:3 > > + Rename originsMatch in originSerializationsMatch > > Will serializedOriginsMatch be a better name? Sounds better indeed, changed in the landing patch. 364286 2019-03-11 14:26:42 -0700 2019-03-12 10:16:10 -0700 Patch bug-195572-20190311142642.patch text/plain 8142 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDlkNmM4MDI3ZTE0ODFl OWUwMWE5NzZlZjkzNDE1NzA4ZTRkZGU3MC4uNjMwZjg1ZTgzODA3NjlmODM0YWUxZTE1YWNjNzcx NjA5ODY2Y2Y0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAzLTExICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgb3JpZ2luc01h dGNoIGluIG9yaWdpblNlcmlhbGl6YXRpb25zTWF0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTU3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHJlbmFtaW5nLCBtYWtlIHVz ZSBvZiBTZWN1cml0eU9yaWdpbjo6aXNTYW1lT3JpZ2luQXMKKyAgICAgICAgd2hlcmUgaXQgbWFr ZXMgbW9yZSBzZW5zZSB0aGFuIHRvIGNvbXBhcmUgb3JpZ2luIHNlcmlhbGl6YXRpb24uCisgICAg ICAgIFRoZSBtYWluIGRpZmZlcmVuY2UgaXMgdGhhdCBpc1NhbWVPcmlnaW5BcyB3aWxsIHJldHVy biBmYWxzZSBmb3IgdHdvIGRpZmZlcmVudCB1bmlxdWUgb3JpZ2lucworICAgICAgICB3aGlsZSBv cmlnaW5zU2VyaWFsaXphdGlvbnNNYXRjaCB3aWxsIG5vdC4KKworICAgICAgICAqIE1vZHVsZXMv Y3JlZGVudGlhbG1hbmFnZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q3JlZGVudGlhbHNDb250YWluZXI6OmRvZXNIYXZlU2FtZU9yaWdpbkFzSXRzQW5j ZXN0b3JzKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0NvbnRyb2xsZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6bWF0Y2hEb2N1bWVudE9yaWdpbik6CisgICAgICAgICogTW9k dWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSVENQZWVyQ29ubmVjdGlvbjo6Y2VydGlmaWNhdGVzRnJvbUNvbmZpZ3VyYXRpb24pOgorICAg ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudExvYWRlcjo6c2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlIGNvbnN0 KToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnNob3VsZFVwZGF0ZUNhY2hlZFJl c291cmNlV2l0aEN1cnJlbnRSZXF1ZXN0KToKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2lu LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om9yaWdpblNlcmlhbGl6YXRpb25zTWF0Y2gpOgorICAg ICAgICAoV2ViQ29yZTo6b3JpZ2luc01hdGNoKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL1Nl Y3VyaXR5T3JpZ2luLmg6CisKIDIwMTktMDMtMTEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBw bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IChyMjQyMTgxKSBBUEkgdGVzdCBEcmFnQW5k RHJvcFRlc3RzLkV4dGVybmFsU291cmNlUGxhaW5UZXh0VG9JRnJhbWUgaXMgVGltaW5nIG91dApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9jcmVkZW50aWFsbWFuYWdlbWVudC9D cmVkZW50aWFsc0NvbnRhaW5lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NyZWRlbnRp YWxtYW5hZ2VtZW50L0NyZWRlbnRpYWxzQ29udGFpbmVyLmNwcAppbmRleCBjYjI3NjBjMWFhNzRl OTE0NzQ1MzUwZTAwZjFmNzE2M2YwM2IzYTEyLi43MDgxNDc4ZTkwY2NmMTY3MzllNThmMTlhMzNl ZmI0YmRhY2JiYmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NyZWRlbnRp YWxtYW5hZ2VtZW50L0NyZWRlbnRpYWxzQ29udGFpbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2NyZWRlbnRpYWxtYW5hZ2VtZW50L0NyZWRlbnRpYWxzQ29udGFpbmVyLmNwcApA QCAtNTQsNyArNTQsNyBAQCBib29sIENyZWRlbnRpYWxzQ29udGFpbmVyOjpkb2VzSGF2ZVNhbWVP cmlnaW5Bc0l0c0FuY2VzdG9ycygpCiAKICAgICBhdXRvJiBvcmlnaW4gPSBtX2RvY3VtZW50LT5z ZWN1cml0eU9yaWdpbigpOwogICAgIGZvciAoYXV0byogZG9jdW1lbnQgPSBtX2RvY3VtZW50LT5w YXJlbnREb2N1bWVudCgpOyBkb2N1bWVudDsgZG9jdW1lbnQgPSBkb2N1bWVudC0+cGFyZW50RG9j dW1lbnQoKSkgewotICAgICAgICBpZiAoIW9yaWdpbnNNYXRjaChkb2N1bWVudC0+c2VjdXJpdHlP cmlnaW4oKSwgb3JpZ2luKSkKKyAgICAgICAgaWYgKCFvcmlnaW4uaXNTYW1lT3JpZ2luQXMoZG9j dW1lbnQtPnNlY3VyaXR5T3JpZ2luKCkpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0KICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vUlRDQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1JUQ0NvbnRyb2xsZXIuY3BwCmluZGV4IGNkYjc3N2U5OTkyOTIyMWNmMGE4ZjAx MTQyYjJkMDdlZGU5ZWZlZDQuLjcwZDQwYzZiZDViMzI2MmYyY2ZlNjE1ZmJjMmI0NWM2MjljY2Y0 M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDQ29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVEND b250cm9sbGVyLmNwcApAQCAtNTcsOSArNTcsOSBAQCB2b2lkIFJUQ0NvbnRyb2xsZXI6OnJlbW92 ZShSVENQZWVyQ29ubmVjdGlvbiYgY29ubmVjdGlvbikKIAogc3RhdGljIGlubGluZSBib29sIG1h dGNoRG9jdW1lbnRPcmlnaW4oRG9jdW1lbnQmIGRvY3VtZW50LCBTZWN1cml0eU9yaWdpbiYgdG9w T3JpZ2luLCBTZWN1cml0eU9yaWdpbiYgY2xpZW50T3JpZ2luKQogewotICAgIGlmIChvcmlnaW5z TWF0Y2godG9wT3JpZ2luLCBkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpKSkKKyAgICBpZiAodG9w T3JpZ2luLmlzU2FtZU9yaWdpbkFzKGRvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkpKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICByZXR1cm4gb3JpZ2luc01hdGNoKHRvcE9yaWdpbiwgZG9jdW1l bnQudG9wT3JpZ2luKCkpICYmIG9yaWdpbnNNYXRjaChjbGllbnRPcmlnaW4sIGRvY3VtZW50LnNl Y3VyaXR5T3JpZ2luKCkpOworICAgIHJldHVybiB0b3BPcmlnaW4uaXNTYW1lT3JpZ2luQXMoZG9j dW1lbnQudG9wT3JpZ2luKCkpICYmIGNsaWVudE9yaWdpbi5pc1NhbWVPcmlnaW5Bcyhkb2N1bWVu dC5zZWN1cml0eU9yaWdpbigpKTsKIH0KIAogYm9vbCBSVENDb250cm9sbGVyOjpzaG91bGREaXNh YmxlSUNFQ2FuZGlkYXRlRmlsdGVyaW5nKERvY3VtZW50JiBkb2N1bWVudCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5j cHAKaW5kZXggZmQ1OGUwZmRiZDA5NmY0YjMwYzExNTM2M2VkZDhiNDBhZjMwMGJiNC4uYTJlYjg4 MTU3M2MwOGZiMmQ4OGNmYThlOTVlYjRlY2YwNzQ0NmQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAKQEAg LTMxMSw3ICszMTEsNyBAQCBFeGNlcHRpb25PcjxWZWN0b3I8TWVkaWFFbmRwb2ludENvbmZpZ3Vy YXRpb246OkNlcnRpZmljYXRlUEVNPj4gUlRDUGVlckNvbm5lY3RpbwogICAgIFZlY3RvcjxNZWRp YUVuZHBvaW50Q29uZmlndXJhdGlvbjo6Q2VydGlmaWNhdGVQRU0+IGNlcnRpZmljYXRlczsKICAg ICBjZXJ0aWZpY2F0ZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShjb25maWd1cmF0aW9uLmNlcnRp ZmljYXRlcy5zaXplKCkpOwogICAgIGZvciAoYXV0byYgY2VydGlmaWNhdGUgOiBjb25maWd1cmF0 aW9uLmNlcnRpZmljYXRlcykgewotICAgICAgICBpZiAoIW9yaWdpbnNNYXRjaChvcmlnaW4sIGNl cnRpZmljYXRlLT5vcmlnaW4oKSkpCisgICAgICAgIGlmICghb3JpZ2luLmlzU2FtZU9yaWdpbkFz KGNlcnRpZmljYXRlLT5vcmlnaW4oKSkpCiAgICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsg SW52YWxpZEFjY2Vzc0Vycm9yLCAiQ2VydGlmaWNhdGUgZG9lcyBub3QgaGF2ZSBhIHZhbGlkIG9y aWdpbiIgfTsKIAogICAgICAgICBpZiAoY3VycmVudE1pbGxpU2Vjb25kcyA+IGNlcnRpZmljYXRl LT5leHBpcmVzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRM b2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRl eCBiMGY5NGE1MDg5YTVlNDM0Mjg0MmQ2YzJhNGRjNjg2ZjllMDBkMWQxLi4xYjJlMjFkMzRhNzlm Y2M3ZTlkYmY1Zjc5MWE4YmQ0YjE5ZmUxMDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAKQEAgLTIwODMsNyArMjA4Myw3IEBAIFNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3kgRG9jdW1lbnRMb2FkZXI6OnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1By b3BhCiAgICAgICAgIHJldHVybiBtX3Nob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k7CiAKICAg ICBpZiAoYXV0byogY3VycmVudERvY3VtZW50ID0gZG9jdW1lbnQoKSkgewotICAgICAgICBpZiAo b3JpZ2luc01hdGNoKGN1cnJlbnREb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSwgY3VycmVudERv Y3VtZW50LT50b3BPcmlnaW4oKSkpCisgICAgICAgIGlmIChjdXJyZW50RG9jdW1lbnQtPnNlY3Vy aXR5T3JpZ2luKCkuaXNTYW1lT3JpZ2luQXMoY3VycmVudERvY3VtZW50LT50b3BPcmlnaW4oKSkp CiAgICAgICAgICAgICByZXR1cm4gbV9zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OwogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5jcHAKaW5kZXggZjQyNjMwM2FjMWY0YzhjMDhhZDg1OGVkOWNjNzJhYmMxZDFjYTA3 NS4uMDRmZWRhY2VlMmRkODU4YjRlMmNlNmY0OTVmZGZiOGNkZjdjNDRiMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCkBA IC02MzgsNyArNjM4LDcgQEAgYm9vbCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6c2hvdWxkVXBkYXRl Q2FjaGVkUmVzb3VyY2VXaXRoQ3VycmVudFJlcXVlc3QoY29uc3QgQ2EKICAgICAgICAgYnJlYWs7 CiAgICAgfQogCi0gICAgaWYgKHJlc291cmNlLm9wdGlvbnMoKS5tb2RlICE9IHJlcXVlc3Qub3B0 aW9ucygpLm1vZGUgfHwgIW9yaWdpbnNNYXRjaChyZXF1ZXN0Lm9yaWdpbigpLCByZXNvdXJjZS5v cmlnaW4oKSkpCisgICAgaWYgKHJlc291cmNlLm9wdGlvbnMoKS5tb2RlICE9IHJlcXVlc3Qub3B0 aW9ucygpLm1vZGUgfHwgIW9yaWdpblNlcmlhbGl6YXRpb25zTWF0Y2gocmVxdWVzdC5vcmlnaW4o KSwgcmVzb3VyY2Uub3JpZ2luKCkpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIGlmIChy ZXNvdXJjZS5vcHRpb25zKCkucmVkaXJlY3QgIT0gcmVxdWVzdC5vcHRpb25zKCkucmVkaXJlY3Qg JiYgcmVzb3VyY2UuaGFzUmVkaXJlY3Rpb25zKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlP cmlnaW4uY3BwCmluZGV4IDUzNTY2NTNiYzBjY2Q0NjZhOTYzMDE4MzQyNmZkOGEzMjYwMjRlYjMu LmVlZGZjMGUwZjYwZmEzOGFiM2Q5ZTVmODIxMTlhZmMyMzZjZjgxMmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCkBAIC00OTEsNyArNDkxLDcgQEAgc3RhdGljIGlubGlu ZSBib29sIGFyZU9yaWdpbnNNYXRjaGluZyhjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMSwg Y29uc3QgU2VjdXIKIH0KIAogLy8gVGhpcyBmdW5jdGlvbiBtaW1pY3MgdGhlIHJlc3VsdCBvZiBz dHJpbmcgY29tcGFyaXNvbiBvZiBzZXJpYWxpemVkIG9yaWdpbnMuCi1ib29sIG9yaWdpbnNNYXRj aChjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMSwgY29uc3QgU2VjdXJpdHlPcmlnaW4mIG9y aWdpbjIpCitib29sIG9yaWdpblNlcmlhbGl6YXRpb25zTWF0Y2goY29uc3QgU2VjdXJpdHlPcmln aW4mIG9yaWdpbjEsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4yKQogewogICAgIGlmICgm b3JpZ2luMSA9PSAmb3JpZ2luMikKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC01MDAsMTIgKzUw MCwxMiBAQCBib29sIG9yaWdpbnNNYXRjaChjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMSwg Y29uc3QgU2VjdXJpdHlPcmlnaW4mIG9yaWdpbjIpCiAgICAgcmV0dXJuIGFyZU9yaWdpbnNNYXRj aGluZyhvcmlnaW4xLCBvcmlnaW4yKTsKIH0KIAotYm9vbCBvcmlnaW5zTWF0Y2goY29uc3QgU2Vj dXJpdHlPcmlnaW4qIG9yaWdpbjEsIGNvbnN0IFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4yKQorYm9v bCBvcmlnaW5TZXJpYWxpemF0aW9uc01hdGNoKGNvbnN0IFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4x LCBjb25zdCBTZWN1cml0eU9yaWdpbiogb3JpZ2luMikKIHsKICAgICBpZiAoIW9yaWdpbjEgfHwg IW9yaWdpbjIpCiAgICAgICAgIHJldHVybiBvcmlnaW4xID09IG9yaWdpbjI7CiAKLSAgICByZXR1 cm4gb3JpZ2luc01hdGNoKCpvcmlnaW4xLCAqb3JpZ2luMik7CisgICAgcmV0dXJuIG9yaWdpblNl cmlhbGl6YXRpb25zTWF0Y2goKm9yaWdpbjEsICpvcmlnaW4yKTsKIH0KIAogUmVmPFNlY3VyaXR5 T3JpZ2luPiBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbVN0cmluZyhjb25zdCBTdHJpbmcmIG9y aWdpblN0cmluZykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmln aW4uaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAppbmRleCBlZDJkOWZi ZTRhZDU4OTg5MjY4OTc3ODNiMmNkOTllOWQ4NGIwNzM3Li40M2YzODA2YTllMmNmYzUzYzEyMDBm MjAyNGE4YTkxOTRhYzA0YzM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCkBA IC0yNDAsOCArMjQwLDggQEAgcHJpdmF0ZToKIGJvb2wgc2hvdWxkVHJlYXRBc1BvdGVudGlhbGx5 VHJ1c3R3b3J0aHkoY29uc3QgVVJMJik7CiAKIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgT3JpZ2lu IGhlYWRlciB2YWx1ZXMgc2VyaWFsaXplZCBmcm9tIHRoZXNlIHR3byBvcmlnaW5zIHdvdWxkIGJl IHRoZSBzYW1lLgotYm9vbCBvcmlnaW5zTWF0Y2goY29uc3QgU2VjdXJpdHlPcmlnaW4mLCBjb25z dCBTZWN1cml0eU9yaWdpbiYpOwotYm9vbCBvcmlnaW5zTWF0Y2goY29uc3QgU2VjdXJpdHlPcmln aW4qLCBjb25zdCBTZWN1cml0eU9yaWdpbiopOworYm9vbCBvcmlnaW5TZXJpYWxpemF0aW9uc01h dGNoKGNvbnN0IFNlY3VyaXR5T3JpZ2luJiwgY29uc3QgU2VjdXJpdHlPcmlnaW4mKTsKK2Jvb2wg b3JpZ2luU2VyaWFsaXphdGlvbnNNYXRjaChjb25zdCBTZWN1cml0eU9yaWdpbiosIGNvbnN0IFNl Y3VyaXR5T3JpZ2luKik7CiAKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IGlubGluZSB2b2lkIFNl Y3VyaXR5T3JpZ2luOjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHsK 364399 2019-03-12 10:16:11 -0700 2019-03-12 11:08:23 -0700 Patch for landing bug-195572-20190312101610.patch text/plain 8117 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDlkNmM4MDI3ZTE0ODFl OWUwMWE5NzZlZjkzNDE1NzA4ZTRkZGU3MC4uZmQ2ZjQyNDYzMTUzZmIzNTI3ZjAyNjEzYmMzM2Fl NjA4MWUxMTc1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAzLTExICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgb3JpZ2luc01h dGNoIGluIG9yaWdpblNlcmlhbGl6YXRpb25zTWF0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTU3MgorCisgICAgICAgIFJldmlld2VkIGJ5IEpp ZXdlbiBUYW4uCisKKyAgICAgICAgSW4gYWRkaXRpb24gdG8gcmVuYW1pbmcsIG1ha2UgdXNlIG9m IFNlY3VyaXR5T3JpZ2luOjppc1NhbWVPcmlnaW5BcworICAgICAgICB3aGVyZSBpdCBtYWtlcyBt b3JlIHNlbnNlIHRoYW4gdG8gY29tcGFyZSBvcmlnaW4gc2VyaWFsaXphdGlvbi4KKyAgICAgICAg VGhlIG1haW4gZGlmZmVyZW5jZSBpcyB0aGF0IGlzU2FtZU9yaWdpbkFzIHdpbGwgcmV0dXJuIGZh bHNlIGZvciB0d28gZGlmZmVyZW50IHVuaXF1ZSBvcmlnaW5zCisgICAgICAgIHdoaWxlIG9yaWdp bnNTZXJpYWxpemF0aW9uc01hdGNoIHdpbGwgbm90LgorCisgICAgICAgICogTW9kdWxlcy9jcmVk ZW50aWFsbWFuYWdlbWVudC9DcmVkZW50aWFsc0NvbnRhaW5lci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDcmVkZW50aWFsc0NvbnRhaW5lcjo6ZG9lc0hhdmVTYW1lT3JpZ2luQXNJdHNBbmNlc3Rv cnMpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDQ29udHJvbGxlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjptYXRjaERvY3VtZW50T3JpZ2luKToKKyAgICAgICAgKiBNb2R1bGVz L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJU Q1BlZXJDb25uZWN0aW9uOjpjZXJ0aWZpY2F0ZXNGcm9tQ29uZmlndXJhdGlvbik6CisgICAgICAg ICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 TG9hZGVyOjpzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdhdGUgY29uc3QpOgor ICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6c2hvdWxkVXBkYXRlQ2FjaGVkUmVzb3Vy Y2VXaXRoQ3VycmVudFJlcXVlc3QpOgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW4uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6c2VyaWFsaXplZE9yaWdpbnNNYXRjaCk6CisgICAgICAgIChX ZWJDb3JlOjpvcmlnaW5zTWF0Y2gpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlP cmlnaW4uaDoKKwogMjAxOS0wMy0xMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CiAKICAgICAgICAgUkVHUkVTU0lPTjogKHIyNDIxODEpIEFQSSB0ZXN0IERyYWdBbmREcm9wVGVz dHMuRXh0ZXJuYWxTb3VyY2VQbGFpblRleHRUb0lGcmFtZSBpcyBUaW1pbmcgb3V0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2NyZWRlbnRpYWxtYW5hZ2VtZW50L0NyZWRlbnRp YWxzQ29udGFpbmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY3JlZGVudGlhbG1hbmFn ZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIuY3BwCmluZGV4IGNiMjc2MGMxYWE3NGU5MTQ3NDUz NTBlMDBmMWY3MTYzZjAzYjNhMTIuLjcwODE0NzhlOTBjY2YxNjczOWU1OGYxOWEzM2VmYjRiZGFj YmJiZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvY3JlZGVudGlhbG1hbmFn ZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvY3JlZGVudGlhbG1hbmFnZW1lbnQvQ3JlZGVudGlhbHNDb250YWluZXIuY3BwCkBAIC01NCw3 ICs1NCw3IEBAIGJvb2wgQ3JlZGVudGlhbHNDb250YWluZXI6OmRvZXNIYXZlU2FtZU9yaWdpbkFz SXRzQW5jZXN0b3JzKCkKIAogICAgIGF1dG8mIG9yaWdpbiA9IG1fZG9jdW1lbnQtPnNlY3VyaXR5 T3JpZ2luKCk7CiAgICAgZm9yIChhdXRvKiBkb2N1bWVudCA9IG1fZG9jdW1lbnQtPnBhcmVudERv Y3VtZW50KCk7IGRvY3VtZW50OyBkb2N1bWVudCA9IGRvY3VtZW50LT5wYXJlbnREb2N1bWVudCgp KSB7Ci0gICAgICAgIGlmICghb3JpZ2luc01hdGNoKGRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigp LCBvcmlnaW4pKQorICAgICAgICBpZiAoIW9yaWdpbi5pc1NhbWVPcmlnaW5Bcyhkb2N1bWVudC0+ c2VjdXJpdHlPcmlnaW4oKSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogICAg IHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9SVENDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vUlRDQ29udHJvbGxlci5jcHAKaW5kZXggY2RiNzc3ZTk5OTI5MjIxY2YwYThmMDExNDJiMmQw N2VkZTllZmVkNC4uNzBkNDBjNmJkNWIzMjYyZjJjZmU2MTVmYmMyYjQ1YzYyOWNjZjQzZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENDb250cm9sbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0NvbnRyb2xs ZXIuY3BwCkBAIC01Nyw5ICs1Nyw5IEBAIHZvaWQgUlRDQ29udHJvbGxlcjo6cmVtb3ZlKFJUQ1Bl ZXJDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogCiBzdGF0aWMgaW5saW5lIGJvb2wgbWF0Y2hEb2N1 bWVudE9yaWdpbihEb2N1bWVudCYgZG9jdW1lbnQsIFNlY3VyaXR5T3JpZ2luJiB0b3BPcmlnaW4s IFNlY3VyaXR5T3JpZ2luJiBjbGllbnRPcmlnaW4pCiB7Ci0gICAgaWYgKG9yaWdpbnNNYXRjaCh0 b3BPcmlnaW4sIGRvY3VtZW50LnNlY3VyaXR5T3JpZ2luKCkpKQorICAgIGlmICh0b3BPcmlnaW4u aXNTYW1lT3JpZ2luQXMoZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKSkpCiAgICAgICAgIHJldHVy biB0cnVlOwotICAgIHJldHVybiBvcmlnaW5zTWF0Y2godG9wT3JpZ2luLCBkb2N1bWVudC50b3BP cmlnaW4oKSkgJiYgb3JpZ2luc01hdGNoKGNsaWVudE9yaWdpbiwgZG9jdW1lbnQuc2VjdXJpdHlP cmlnaW4oKSk7CisgICAgcmV0dXJuIHRvcE9yaWdpbi5pc1NhbWVPcmlnaW5Bcyhkb2N1bWVudC50 b3BPcmlnaW4oKSkgJiYgY2xpZW50T3JpZ2luLmlzU2FtZU9yaWdpbkFzKGRvY3VtZW50LnNlY3Vy aXR5T3JpZ2luKCkpOwogfQogCiBib29sIFJUQ0NvbnRyb2xsZXI6OnNob3VsZERpc2FibGVJQ0VD YW5kaWRhdGVGaWx0ZXJpbmcoRG9jdW1lbnQmIGRvY3VtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAppbmRl eCBmZDU4ZTBmZGJkMDk2ZjRiMzBjMTE1MzYzZWRkOGI0MGFmMzAwYmI0Li5hMmViODgxNTczYzA4 ZmIyZDg4Y2ZhOGU5NWViNGVjZjA3NDQ2ZDM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcApAQCAtMzExLDcg KzMxMSw3IEBAIEV4Y2VwdGlvbk9yPFZlY3RvcjxNZWRpYUVuZHBvaW50Q29uZmlndXJhdGlvbjo6 Q2VydGlmaWNhdGVQRU0+PiBSVENQZWVyQ29ubmVjdGlvCiAgICAgVmVjdG9yPE1lZGlhRW5kcG9p bnRDb25maWd1cmF0aW9uOjpDZXJ0aWZpY2F0ZVBFTT4gY2VydGlmaWNhdGVzOwogICAgIGNlcnRp ZmljYXRlcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGNvbmZpZ3VyYXRpb24uY2VydGlmaWNhdGVz LnNpemUoKSk7CiAgICAgZm9yIChhdXRvJiBjZXJ0aWZpY2F0ZSA6IGNvbmZpZ3VyYXRpb24uY2Vy dGlmaWNhdGVzKSB7Ci0gICAgICAgIGlmICghb3JpZ2luc01hdGNoKG9yaWdpbiwgY2VydGlmaWNh dGUtPm9yaWdpbigpKSkKKyAgICAgICAgaWYgKCFvcmlnaW4uaXNTYW1lT3JpZ2luQXMoY2VydGlm aWNhdGUtPm9yaWdpbigpKSkKICAgICAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlk QWNjZXNzRXJyb3IsICJDZXJ0aWZpY2F0ZSBkb2VzIG5vdCBoYXZlIGEgdmFsaWQgb3JpZ2luIiB9 OwogCiAgICAgICAgIGlmIChjdXJyZW50TWlsbGlTZWNvbmRzID4gY2VydGlmaWNhdGUtPmV4cGly ZXMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IGIwZjk0 YTUwODlhNWU0MzQyODQyZDZjMmE0ZGM2ODZmOWUwMGQxZDEuLjFiMmUyMWQzNGE3OWZjYzdlOWRi ZjVmNzkxYThiZDRiMTlmZTEwN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmNwcApAQCAtMjA4Myw3ICsyMDgzLDcgQEAgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSBEb2N1bWVudExvYWRlcjo6c2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGEKICAg ICAgICAgcmV0dXJuIG1fc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTsKIAogICAgIGlmIChh dXRvKiBjdXJyZW50RG9jdW1lbnQgPSBkb2N1bWVudCgpKSB7Ci0gICAgICAgIGlmIChvcmlnaW5z TWF0Y2goY3VycmVudERvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpLCBjdXJyZW50RG9jdW1lbnQt PnRvcE9yaWdpbigpKSkKKyAgICAgICAgaWYgKGN1cnJlbnREb2N1bWVudC0+c2VjdXJpdHlPcmln aW4oKS5pc1NhbWVPcmlnaW5BcyhjdXJyZW50RG9jdW1lbnQtPnRvcE9yaWdpbigpKSkKICAgICAg ICAgICAgIHJldHVybiBtX3Nob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k7CiAgICAgfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVy LmNwcAppbmRleCBmNDI2MzAzYWMxZjRjOGMwOGFkODU4ZWQ5Y2M3MmFiYzFkMWNhMDc1Li43ZDhj MjRkMTJkZjRkNTg0ZDU4NjYyNDU2NDc2YTNjZjc3MzIzMzgxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTYzOCw3 ICs2MzgsNyBAQCBib29sIENhY2hlZFJlc291cmNlTG9hZGVyOjpzaG91bGRVcGRhdGVDYWNoZWRS ZXNvdXJjZVdpdGhDdXJyZW50UmVxdWVzdChjb25zdCBDYQogICAgICAgICBicmVhazsKICAgICB9 CiAKLSAgICBpZiAocmVzb3VyY2Uub3B0aW9ucygpLm1vZGUgIT0gcmVxdWVzdC5vcHRpb25zKCku bW9kZSB8fCAhb3JpZ2luc01hdGNoKHJlcXVlc3Qub3JpZ2luKCksIHJlc291cmNlLm9yaWdpbigp KSkKKyAgICBpZiAocmVzb3VyY2Uub3B0aW9ucygpLm1vZGUgIT0gcmVxdWVzdC5vcHRpb25zKCku bW9kZSB8fCAhc2VyaWFsaXplZE9yaWdpbnNNYXRjaChyZXF1ZXN0Lm9yaWdpbigpLCByZXNvdXJj ZS5vcmlnaW4oKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgaWYgKHJlc291cmNlLm9w dGlvbnMoKS5yZWRpcmVjdCAhPSByZXF1ZXN0Lm9wdGlvbnMoKS5yZWRpcmVjdCAmJiByZXNvdXJj ZS5oYXNSZWRpcmVjdGlvbnMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Vj dXJpdHlPcmlnaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAK aW5kZXggNTM1NjY1M2JjMGNjZDQ2NmE5NjMwMTgzNDI2ZmQ4YTMyNjAyNGViMy4uMzk5MDMyMzQ0 N2RhZDFiOTZlMDZiMmQxZWNiM2E2NzU0ZDgxZDg5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1 cml0eU9yaWdpbi5jcHAKQEAgLTQ5MSw3ICs0OTEsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgYXJl T3JpZ2luc01hdGNoaW5nKGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4xLCBjb25zdCBTZWN1 cgogfQogCiAvLyBUaGlzIGZ1bmN0aW9uIG1pbWljcyB0aGUgcmVzdWx0IG9mIHN0cmluZyBjb21w YXJpc29uIG9mIHNlcmlhbGl6ZWQgb3JpZ2lucy4KLWJvb2wgb3JpZ2luc01hdGNoKGNvbnN0IFNl Y3VyaXR5T3JpZ2luJiBvcmlnaW4xLCBjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMikKK2Jv b2wgc2VyaWFsaXplZE9yaWdpbnNNYXRjaChjb25zdCBTZWN1cml0eU9yaWdpbiYgb3JpZ2luMSwg Y29uc3QgU2VjdXJpdHlPcmlnaW4mIG9yaWdpbjIpCiB7CiAgICAgaWYgKCZvcmlnaW4xID09ICZv cmlnaW4yKQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTUwMCwxMiArNTAwLDEyIEBAIGJvb2wg b3JpZ2luc01hdGNoKGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4xLCBjb25zdCBTZWN1cml0 eU9yaWdpbiYgb3JpZ2luMikKICAgICByZXR1cm4gYXJlT3JpZ2luc01hdGNoaW5nKG9yaWdpbjEs IG9yaWdpbjIpOwogfQogCi1ib29sIG9yaWdpbnNNYXRjaChjb25zdCBTZWN1cml0eU9yaWdpbiog b3JpZ2luMSwgY29uc3QgU2VjdXJpdHlPcmlnaW4qIG9yaWdpbjIpCitib29sIHNlcmlhbGl6ZWRP cmlnaW5zTWF0Y2goY29uc3QgU2VjdXJpdHlPcmlnaW4qIG9yaWdpbjEsIGNvbnN0IFNlY3VyaXR5 T3JpZ2luKiBvcmlnaW4yKQogewogICAgIGlmICghb3JpZ2luMSB8fCAhb3JpZ2luMikKICAgICAg ICAgcmV0dXJuIG9yaWdpbjEgPT0gb3JpZ2luMjsKIAotICAgIHJldHVybiBvcmlnaW5zTWF0Y2go Km9yaWdpbjEsICpvcmlnaW4yKTsKKyAgICByZXR1cm4gc2VyaWFsaXplZE9yaWdpbnNNYXRjaCgq b3JpZ2luMSwgKm9yaWdpbjIpOwogfQogCiBSZWY8U2VjdXJpdHlPcmlnaW4+IFNlY3VyaXR5T3Jp Z2luOjpjcmVhdGVGcm9tU3RyaW5nKGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oIGIvU291cmNlL1dlYkNv cmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCmluZGV4IGVkMmQ5ZmJlNGFkNTg5ODkyNjg5Nzc4M2Iy Y2Q5OWU5ZDg0YjA3MzcuLmMzMzU1ZDFmZWUzNTk2NDEyMjMwOWNiM2RkYWRjNDY4YTJjMTY1YmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKQEAgLTI0MCw4ICsyNDAsOCBAQCBw cml2YXRlOgogYm9vbCBzaG91bGRUcmVhdEFzUG90ZW50aWFsbHlUcnVzdHdvcnRoeShjb25zdCBV UkwmKTsKIAogLy8gUmV0dXJucyB0cnVlIGlmIHRoZSBPcmlnaW4gaGVhZGVyIHZhbHVlcyBzZXJp YWxpemVkIGZyb20gdGhlc2UgdHdvIG9yaWdpbnMgd291bGQgYmUgdGhlIHNhbWUuCi1ib29sIG9y aWdpbnNNYXRjaChjb25zdCBTZWN1cml0eU9yaWdpbiYsIGNvbnN0IFNlY3VyaXR5T3JpZ2luJik7 Ci1ib29sIG9yaWdpbnNNYXRjaChjb25zdCBTZWN1cml0eU9yaWdpbiosIGNvbnN0IFNlY3VyaXR5 T3JpZ2luKik7Citib29sIHNlcmlhbGl6ZWRPcmlnaW5zTWF0Y2goY29uc3QgU2VjdXJpdHlPcmln aW4mLCBjb25zdCBTZWN1cml0eU9yaWdpbiYpOworYm9vbCBzZXJpYWxpemVkT3JpZ2luc01hdGNo KGNvbnN0IFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgU2VjdXJpdHlPcmlnaW4qKTsKIAogdGVtcGxh dGU8Y2xhc3MgRW5jb2Rlcj4gaW5saW5lIHZvaWQgU2VjdXJpdHlPcmlnaW46OmVuY29kZShFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogewo=