177731 2017-10-01 19:35:07 -0700 Pasteboard shouldn't add "Files" as a type 2017-10-02 01:56:33 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa buildbot cdumez commit-queue dbates esprehn+autocc kangil.han webkit-bug-importer wenson_hsieh oldest_to_newest 1355103 0 rniwa 2017-10-01 19:35:07 -0700 Right now, Pasteboard::typesSafeForDOMToReadAndWrite() and typesForLegacyUnsafeBindings() adds "Files" as a MIME type when there is a file-like object but this is a quirk only needed for DataTransfer DOM API. We should do this work in DataTransfer.cpp instead of having each platform's Pasteboard implement this DOM API quirk. 1355105 1 322345 rniwa 2017-10-01 19:40:14 -0700 Created attachment 322345 Cleanup 1355106 2 322346 rniwa 2017-10-01 19:44:17 -0700 Created attachment 322346 Updated change log 1355108 3 322347 rniwa 2017-10-01 19:50:30 -0700 Created attachment 322347 Fixed Mac builds 1355109 4 322348 rniwa 2017-10-01 19:58:15 -0700 Created attachment 322348 Updated for trunk 1355111 5 322348 wenson_hsieh 2017-10-01 20:00:23 -0700 Comment on attachment 322348 Updated for trunk View in context: https://bugs.webkit.org/attachment.cgi?id=322348&action=review > Source/WebCore/platform/win/PasteboardWin.cpp:234 > // URL and Text are provided for compatibility with IE's model Should we update this comment here as well, now that we're writing the normalized types rather than the legacy "URL" and "Text" types? 1355112 6 rniwa 2017-10-01 20:02:10 -0700 (In reply to Wenson Hsieh from comment #5) > Comment on attachment 322348 [details] > Updated for trunk > > View in context: > https://bugs.webkit.org/attachment.cgi?id=322348&action=review > > > Source/WebCore/platform/win/PasteboardWin.cpp:234 > > // URL and Text are provided for compatibility with IE's model > > Should we update this comment here as well, now that we're writing the > normalized types rather than the legacy "URL" and "Text" types? Oops, removed. 1355113 7 322349 rniwa 2017-10-01 20:03:27 -0700 Created attachment 322349 Patch for landing 1355114 8 322349 rniwa 2017-10-01 20:04:03 -0700 Comment on attachment 322349 Patch for landing Wait for EWS. 1355172 9 rniwa 2017-10-02 01:55:13 -0700 Committed r222702: <http://trac.webkit.org/changeset/222702> 1355173 10 webkit-bug-importer 2017-10-02 01:56:33 -0700 <rdar://problem/34764319> 322345 2017-10-01 19:40:14 -0700 2017-10-01 19:44:15 -0700 Cleanup bug-177731-20171001194012.patch text/plain 6507 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRmZmNmYjBlY2QyZTRm ZmJlNmEwYjIzN2QwNDMyYzI2YWIzOWExNy4uZjNmZDBhYzNmYzkyM2ZjYzQ2NmU2OTJmZmIyM2Rh NDY3NDY5MzE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTEwLTAxICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3RlYm9hcmQgc2hvdWxk bid0IGFkZCAiRmlsZXMiIGFzIGEgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCB0aGUgcGxhdGZvcm0gc3BlY2lmaWMgY29kZSB0byBh ZGQgIkZpbGVzIiB3aGVuIHRoZXJlIGlzIGEgZmlsZSBwcmVzZW50IGluIHBsYXRmb3JtJ3MgcGFz dGVib2FyZC4KKyAgICAgICAgRGF0YVRyYW5zZmVyOjp0eXBlcyBub3cgYWRkcyAiRmlsZXMiIGF1 dG9tYXRpY2FsbHkgd2hlbiBQYXN0ZWJvYXJkOjpjb250YWluc0ZpbGVzIHJldHVybnMgdHJ1ZS4K KworICAgICAgICBObyBuZXcgdGVzdHMgc2luY2UgdGhlcmUgc2hvdWxkIGJlIG5vIGJlaGF2aW9y YWwgY2hhbmdlLgorCisgICAgICAgICogZG9tL0RhdGFUcmFuc2Zlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEYXRhVHJhbnNmZXI6OnR5cGVzIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUGFzdGVib2FyZEd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp0eXBl c0ZvckxlZ2FjeVVuc2FmZUJpbmRpbmdzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvUGFzdGVi b2FyZElPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9h cmRUeXBlc0ZvckNvY29hVHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRN YWMubW06CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlw ZXNGb3JDb2NvYVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmFkZE1pbWVUeXBlc0ZvckZvcm1hdCk6CisKIDIwMTctMDkt MzAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRG9uJ3QgcmV2 ZWFsIGZpbGUgVVJMIHdoZW4gcGFzdGluZyBhbiBpbWFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL0RhdGFUcmFuc2Zlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRGF0YVRyYW5z ZmVyLmNwcAppbmRleCA5ZDIxZjNhYTUyMDFlNWQ5MGIxNTljOTViMGEwODAzZWE1OGJjNmJmLi42 ODgwMWE3NGE4MDY2ZjMzZDA0NzllM2YzMDQzOTI1YmJhMDNjZTFjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRGF0YVRyYW5zZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RGF0YVRyYW5zZmVyLmNwcApAQCAtMTcyLDEyICsxNzIsMjIgQEAgVmVjdG9yPFN0cmluZz4gRGF0 YVRyYW5zZmVyOjp0eXBlcygpIGNvbnN0CiAgICAgaWYgKCFjYW5SZWFkVHlwZXMoKSkKICAgICAg ICAgcmV0dXJuIHsgfTsKICAgICAKLSAgICBpZiAoIVNldHRpbmdzOjpjdXN0b21QYXN0ZWJvYXJk RGF0YUVuYWJsZWQoKSkKLSAgICAgICAgcmV0dXJuIG1fcGFzdGVib2FyZC0+dHlwZXNGb3JMZWdh Y3lVbnNhZmVCaW5kaW5ncygpOworICAgIGlmICghU2V0dGluZ3M6OmN1c3RvbVBhc3RlYm9hcmRE YXRhRW5hYmxlZCgpKSB7CisgICAgICAgIGF1dG8gdHlwZXMgPSBtX3Bhc3RlYm9hcmQtPnR5cGVz Rm9yTGVnYWN5VW5zYWZlQmluZGluZ3MoKTsKKyAgICAgICAgQVNTRVJUKCF0eXBlcy5jb250YWlu cygiRmlsZXMiKSk7CisgICAgICAgIGlmIChtX3Bhc3RlYm9hcmQtPmNvbnRhaW5zRmlsZXMoKSkK KyAgICAgICAgICAgIHR5cGVzLmFwcGVuZCgiRmlsZXMiKTsKKyAgICAgICAgcmV0dXJuIHR5cGVz OworICAgIH0KIAotICAgIGlmIChtX3Bhc3RlYm9hcmQtPmNvbnRhaW5zRmlsZXMoKSkKKyAgICBp ZiAobV9wYXN0ZWJvYXJkLT5jb250YWluc0ZpbGVzKCkpIHsKKyAgICAgICAgQVNTRVJUKCFtX3Bh c3RlYm9hcmQtPnR5cGVzU2FmZUZvckJpbmRpbmdzKCkuY29udGFpbnMoIkZpbGVzIikpOwogICAg ICAgICByZXR1cm4geyAiRmlsZXMiIH07Ci0gICAgcmV0dXJuIG1fcGFzdGVib2FyZC0+dHlwZXNT YWZlRm9yQmluZGluZ3MoKTsKKyAgICB9CisKKyAgICBhdXRvIHR5cGVzID0gbV9wYXN0ZWJvYXJk LT50eXBlc1NhZmVGb3JCaW5kaW5ncygpOworICAgIEFTU0VSVCghdHlwZXMuY29udGFpbnMoIkZp bGVzIikpOworICAgIHJldHVybiB0eXBlczsKIH0KIAogRmlsZUxpc3QmIERhdGFUcmFuc2Zlcjo6 ZmlsZXMoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Bh c3RlYm9hcmRHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRH dGsuY3BwCmluZGV4IDU2ZTUwYTUwZmRkMWJjNjBhMDFjODM0ZmQ5YzdjOTYzM2ZkZDZmYWQuLmM4 OWQ3NWJlMmZkNjVkYjVhMzkzZGZhMDY4NmJkMzY3NzU3MmU5ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAKQEAgLTI4MCw5ICsyODAsNiBAQCBW ZWN0b3I8U3RyaW5nPiBQYXN0ZWJvYXJkOjp0eXBlc0ZvckxlZ2FjeVVuc2FmZUJpbmRpbmdzKCkK ICAgICAgICAgdHlwZXMuYXBwZW5kKEFTQ0lJTGl0ZXJhbCgiVVJMIikpOwogICAgIH0KIAotICAg IGlmIChtX3NlbGVjdGlvbkRhdGEtPmhhc0ZpbGVuYW1lcygpKQotICAgICAgICB0eXBlcy5hcHBl bmQoQVNDSUlMaXRlcmFsKCJGaWxlcyIpKTsKLQogICAgIGZvciAoYXV0byYga2V5IDogbV9zZWxl Y3Rpb25EYXRhLT51bmtub3duVHlwZXMoKS5rZXlzKCkpCiAgICAgICAgIHR5cGVzLmFwcGVuZChr ZXkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGFzdGVib2Fy ZElPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tCmlu ZGV4IDEzZTFlNjE2MTg3OTRlNjUyM2E3MDljYjg5NzFkY2RhMjgxOTI2NTYuLjczZGRmYTYzZGYz MGZjNDU1ZGE0YmU0Yjc4MzE5ZjA0OGYxYmNkM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tCkBAIC0zNTgsMTAgKzM1OCw4IEBAIHZvaWQgUGFzdGVi b2FyZDo6YWRkSFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlKExpc3RIYXNoU2V0PFN0cmlu Zz4mIHJlc3VsdFR5CiAgICAgICAgIHJlc3VsdFR5cGVzLmFkZChBU0NJSUxpdGVyYWwoInRleHQv dXJpLWxpc3QiKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgaWYgKFBhc3RlYm9hcmQ6 OnNob3VsZFRyZWF0Q29jb2FUeXBlQXNGaWxlKGNvY29hVHlwZSkpIHsKLSAgICAgICAgcmVzdWx0 VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgiRmlsZXMiKSk7CisgICAgaWYgKFBhc3RlYm9hcmQ6OnNo b3VsZFRyZWF0Q29jb2FUeXBlQXNGaWxlKGNvY29hVHlwZSkpCiAgICAgICAgIHJldHVybjsKLSAg ICB9CiAgICAgU3RyaW5nIHV0aVR5cGUgPSB1dGlUeXBlRnJvbUNvY29hVHlwZShjb2NvYVR5cGUp OwogICAgIGlmICghdXRpVHlwZS5pc0VtcHR5KCkpIHsKICAgICAgICAgcmVzdWx0VHlwZXMuYWRk KHV0aVR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3Rl Ym9hcmRNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5t bQppbmRleCAyZjBjNWJmOWViZGQ4ODNiNGViZTcyNzBiNzhjNmU0MGZhNzI2OTNlLi5iYTY4NzQ0 NmFkYTdhMWZmMjYwNjFiMzVkZDYzMTMyNWY4MWQ3NmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQpAQCAtNTA4LDIwICs1MDgsOCBAQCB2b2lkIFBh c3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZShMaXN0SGFzaFNldDxT dHJpbmc+JiByZXN1bHRUeQogICAgICAgICByZXN1bHRUeXBlcy5hZGQoQVNDSUlMaXRlcmFsKCJ0 ZXh0L3VyaS1saXN0IikpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGlmIChjb2NvYVR5 cGUgPT0gU3RyaW5nKE5TRmlsZW5hbWVzUGJvYXJkVHlwZSkpIHsKLSAgICAgICAgLy8gSWYgZmls ZSBsaXN0IGlzIGVtcHR5LCBhZGQgbm90aGluZy4KLSAgICAgICAgLy8gTm90ZSB0aGF0IHRoZXJl IGlzIGEgY2hhbmNlIHRoYXQgdGhlIGZpbGUgbGlzdCBjb3VudCBjb3VsZCBoYXZlIGNoYW5nZWQg c2luY2Ugd2UgZ3JhYmJlZCB0aGUgdHlwZXMgYXJyYXkuCi0gICAgICAgIC8vIEhvd2V2ZXIsIHRo aXMgaXMgbm90IHJlYWxseSBhbiBpc3N1ZSBmb3IgdXMgZG9pbmcgYSBzYW5pdHkgY2hlY2sgaGVy ZS4KLSAgICAgICAgVmVjdG9yPFN0cmluZz4gZmlsZUxpc3Q7Ci0gICAgICAgIHBsYXRmb3JtU3Ry YXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+Z2V0UGF0aG5hbWVzRm9yVHlwZShmaWxl TGlzdCwgU3RyaW5nKE5TRmlsZW5hbWVzUGJvYXJkVHlwZSksIHBhc3RlYm9hcmROYW1lKTsKLSAg ICAgICAgaWYgKCFmaWxlTGlzdC5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXN1bHRUeXBlcy5h ZGQoQVNDSUlMaXRlcmFsKCJGaWxlcyIpKTsKKyAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhO U0ZpbGVuYW1lc1Bib2FyZFR5cGUpIHx8IFBhc3RlYm9hcmQ6OnNob3VsZFRyZWF0Q29jb2FUeXBl QXNGaWxlKGNvY29hVHlwZSkpCiAgICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgaWYgKFBhc3Rl Ym9hcmQ6OnNob3VsZFRyZWF0Q29jb2FUeXBlQXNGaWxlKGNvY29hVHlwZSkpIHsKLSAgICAgICAg cmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgiRmlsZXMiKSk7Ci0gICAgICAgIHJldHVybjsK LSAgICB9CiAgICAgU3RyaW5nIHV0aVR5cGUgPSB1dGlUeXBlRnJvbUNvY29hVHlwZShjb2NvYVR5 cGUpOwogICAgIGlmICghdXRpVHlwZS5pc0VtcHR5KCkpIHsKICAgICAgICAgcmVzdWx0VHlwZXMu YWRkKHV0aVR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bh c3RlYm9hcmRXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRX aW4uY3BwCmluZGV4IDY3NDM4NzIwOTY1NjBlMGY1YTU5Mzk3NTljMWVlZjFlZDA4MWExZDEuLjU4 ZmQ0NWE5YzAzOWU3NjRiMzhjMmNjYTNmNDZkZTBhY2E5NGM4N2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS93aW4vUGFzdGVib2FyZFdpbi5jcHAKQEAgLTIzMiwxNSArMjMyLDEwIEBA IGJvb2wgUGFzdGVib2FyZDo6aGFzRGF0YSgpCiBzdGF0aWMgdm9pZCBhZGRNaW1lVHlwZXNGb3JG b3JtYXQoTGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0cywgY29uc3QgRk9STUFURVRDJiBmb3Jt YXQpCiB7CiAgICAgLy8gVVJMIGFuZCBUZXh0IGFyZSBwcm92aWRlZCBmb3IgY29tcGF0aWJpbGl0 eSB3aXRoIElFJ3MgbW9kZWwKLSAgICBpZiAoZm9ybWF0LmNmRm9ybWF0ID09IHVybEZvcm1hdCgp LT5jZkZvcm1hdCB8fCBmb3JtYXQuY2ZGb3JtYXQgPT0gdXJsV0Zvcm1hdCgpLT5jZkZvcm1hdCkg ewotICAgICAgICByZXN1bHRzLmFkZCgiVVJMIik7CisgICAgaWYgKGZvcm1hdC5jZkZvcm1hdCA9 PSB1cmxGb3JtYXQoKS0+Y2ZGb3JtYXQgfHwgZm9ybWF0LmNmRm9ybWF0ID09IHVybFdGb3JtYXQo KS0+Y2ZGb3JtYXQpCiAgICAgICAgIHJlc3VsdHMuYWRkKCJ0ZXh0L3VyaS1saXN0Iik7Ci0gICAg fQotCi0gICAgaWYgKGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRXRm9ybWF0KCktPmNmRm9y bWF0IHx8IGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRGb3JtYXQoKS0+Y2ZGb3JtYXQpIHsK LSAgICAgICAgcmVzdWx0cy5hZGQoIlRleHQiKTsKKyAgICBpZiAoZm9ybWF0LmNmRm9ybWF0ID09 IHBsYWluVGV4dFdGb3JtYXQoKS0+Y2ZGb3JtYXQgfHwgZm9ybWF0LmNmRm9ybWF0ID09IHBsYWlu VGV4dEZvcm1hdCgpLT5jZkZvcm1hdCkKICAgICAgICAgcmVzdWx0cy5hZGQoInRleHQvcGxhaW4i KTsKLSAgICB9CiB9CiAKIFZlY3RvcjxTdHJpbmc+IFBhc3RlYm9hcmQ6OnR5cGVzU2FmZUZvckJp bmRpbmdzKCkK 322346 2017-10-01 19:44:17 -0700 2017-10-01 19:50:28 -0700 Updated change log bug-177731-20171001194415.patch text/plain 6709 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRmZmNmYjBlY2QyZTRm ZmJlNmEwYjIzN2QwNDMyYzI2YWIzOWExNy4uOWNmYmMyOGE5ZjhiOGVkNWRlOWQxZjA1NzFkZDY5 MjU5M2M0ZDRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTEwLTAxICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3RlYm9hcmQgc2hvdWxk bid0IGFkZCAiRmlsZXMiIGFzIGEgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCB0aGUgcGxhdGZvcm0gc3BlY2lmaWMgY29kZSB0byBh ZGQgIkZpbGVzIiB3aGVuIHRoZXJlIGlzIGEgZmlsZSBwcmVzZW50IGluIHBsYXRmb3JtJ3MgcGFz dGVib2FyZC4KKyAgICAgICAgRGF0YVRyYW5zZmVyOjp0eXBlcyBub3cgYWRkcyAiRmlsZXMiIGF1 dG9tYXRpY2FsbHkgd2hlbiBQYXN0ZWJvYXJkOjpjb250YWluc0ZpbGVzIHJldHVybnMgdHJ1ZS4K KworICAgICAgICBObyBuZXcgdGVzdHMgc2luY2UgdGhlcmUgc2hvdWxkIGJlIG5vIGJlaGF2aW9y YWwgY2hhbmdlLgorCisgICAgICAgICogZG9tL0RhdGFUcmFuc2Zlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEYXRhVHJhbnNmZXI6OnR5cGVzIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUGFzdGVib2FyZEd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp0eXBl c0ZvckxlZ2FjeVVuc2FmZUJpbmRpbmdzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvUGFzdGVi b2FyZElPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9h cmRUeXBlc0ZvckNvY29hVHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRN YWMubW06CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlw ZXNGb3JDb2NvYVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmFkZE1pbWVUeXBlc0ZvckZvcm1hdCk6IFJlbW92ZWQgdGhl IGNvZGUgdG8gYWRkICJUZXh0IiBhbmQgIlVSTCIgYXMgc2VwYXJhdGUgdHlwZXMgc2luY2UKKyAg ICAgICAgdGhpcyBpcyBub3Qgd2hhdCB0aGUgcmVzdCBvZiBwb3J0cyBkbywgYW5kIHRoaXMgdHlw ZSBub3JtYWxpemF0aW9uIGlzIG5vdyB0YWtlbiBjYXJlIG9mIGJ5IERhdGFUcmFuc2ZlcgorICAg ICAgICBzaW5jZSByMjIxMDYzLgorCiAyMDE3LTA5LTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIERvbid0IHJldmVhbCBmaWxlIFVSTCB3aGVuIHBhc3Rpbmcg YW4gaW1hZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9EYXRhVHJhbnNmZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFuc2Zlci5jcHAKaW5kZXggOWQyMWYzYWE1MjAx ZTVkOTBiMTU5Yzk1YjBhMDgwM2VhNThiYzZiZi4uNjg4MDFhNzRhODA2NmYzM2QwNDc5ZTNmMzA0 MzkyNWJiYTAzY2UxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFuc2Zl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFuc2Zlci5jcHAKQEAgLTE3Miwx MiArMTcyLDIyIEBAIFZlY3RvcjxTdHJpbmc+IERhdGFUcmFuc2Zlcjo6dHlwZXMoKSBjb25zdAog ICAgIGlmICghY2FuUmVhZFR5cGVzKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAgICAgCi0gICAg aWYgKCFTZXR0aW5nczo6Y3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpCi0gICAgICAgIHJl dHVybiBtX3Bhc3RlYm9hcmQtPnR5cGVzRm9yTGVnYWN5VW5zYWZlQmluZGluZ3MoKTsKKyAgICBp ZiAoIVNldHRpbmdzOjpjdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoKSkgeworICAgICAgICBh dXRvIHR5cGVzID0gbV9wYXN0ZWJvYXJkLT50eXBlc0ZvckxlZ2FjeVVuc2FmZUJpbmRpbmdzKCk7 CisgICAgICAgIEFTU0VSVCghdHlwZXMuY29udGFpbnMoIkZpbGVzIikpOworICAgICAgICBpZiAo bV9wYXN0ZWJvYXJkLT5jb250YWluc0ZpbGVzKCkpCisgICAgICAgICAgICB0eXBlcy5hcHBlbmQo IkZpbGVzIik7CisgICAgICAgIHJldHVybiB0eXBlczsKKyAgICB9CiAKLSAgICBpZiAobV9wYXN0 ZWJvYXJkLT5jb250YWluc0ZpbGVzKCkpCisgICAgaWYgKG1fcGFzdGVib2FyZC0+Y29udGFpbnNG aWxlcygpKSB7CisgICAgICAgIEFTU0VSVCghbV9wYXN0ZWJvYXJkLT50eXBlc1NhZmVGb3JCaW5k aW5ncygpLmNvbnRhaW5zKCJGaWxlcyIpKTsKICAgICAgICAgcmV0dXJuIHsgIkZpbGVzIiB9Owot ICAgIHJldHVybiBtX3Bhc3RlYm9hcmQtPnR5cGVzU2FmZUZvckJpbmRpbmdzKCk7CisgICAgfQor CisgICAgYXV0byB0eXBlcyA9IG1fcGFzdGVib2FyZC0+dHlwZXNTYWZlRm9yQmluZGluZ3MoKTsK KyAgICBBU1NFUlQoIXR5cGVzLmNvbnRhaW5zKCJGaWxlcyIpKTsKKyAgICByZXR1cm4gdHlwZXM7 CiB9CiAKIEZpbGVMaXN0JiBEYXRhVHJhbnNmZXI6OmZpbGVzKCkgY29uc3QKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAppbmRleCA1NmU1MGE1MGZkZDFi YzYwYTAxYzgzNGZkOWM3Yzk2MzNmZGQ2ZmFkLi5jODlkNzViZTJmZDY1ZGI1YTM5M2RmYTA2ODZi ZDM2Nzc1NzJlOWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFz dGVib2FyZEd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9h cmRHdGsuY3BwCkBAIC0yODAsOSArMjgwLDYgQEAgVmVjdG9yPFN0cmluZz4gUGFzdGVib2FyZDo6 dHlwZXNGb3JMZWdhY3lVbnNhZmVCaW5kaW5ncygpCiAgICAgICAgIHR5cGVzLmFwcGVuZChBU0NJ SUxpdGVyYWwoIlVSTCIpKTsKICAgICB9CiAKLSAgICBpZiAobV9zZWxlY3Rpb25EYXRhLT5oYXNG aWxlbmFtZXMoKSkKLSAgICAgICAgdHlwZXMuYXBwZW5kKEFTQ0lJTGl0ZXJhbCgiRmlsZXMiKSk7 Ci0KICAgICBmb3IgKGF1dG8mIGtleSA6IG1fc2VsZWN0aW9uRGF0YS0+dW5rbm93blR5cGVzKCku a2V5cygpKQogICAgICAgICB0eXBlcy5hcHBlbmQoa2V5KTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvUGFzdGVib2FyZElPUy5tbQppbmRleCAxM2UxZTYxNjE4Nzk0ZTY1MjNhNzA5 Y2I4OTcxZGNkYTI4MTkyNjU2Li43M2RkZmE2M2RmMzBmYzQ1NWRhNGJlNGI3ODMxOWYwNDhmMWJj ZDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGFzdGVib2FyZElP Uy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGFzdGVib2FyZElPUy5tbQpA QCAtMzU4LDEwICszNTgsOCBAQCB2b2lkIFBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9hcmRUeXBl c0ZvckNvY29hVHlwZShMaXN0SGFzaFNldDxTdHJpbmc+JiByZXN1bHRUeQogICAgICAgICByZXN1 bHRUeXBlcy5hZGQoQVNDSUlMaXRlcmFsKCJ0ZXh0L3VyaS1saXN0IikpOwogICAgICAgICByZXR1 cm47CiAgICAgfQotICAgIGlmIChQYXN0ZWJvYXJkOjpzaG91bGRUcmVhdENvY29hVHlwZUFzRmls ZShjb2NvYVR5cGUpKSB7Ci0gICAgICAgIHJlc3VsdFR5cGVzLmFkZChBU0NJSUxpdGVyYWwoIkZp bGVzIikpOworICAgIGlmIChQYXN0ZWJvYXJkOjpzaG91bGRUcmVhdENvY29hVHlwZUFzRmlsZShj b2NvYVR5cGUpKQogICAgICAgICByZXR1cm47Ci0gICAgfQogICAgIFN0cmluZyB1dGlUeXBlID0g dXRpVHlwZUZyb21Db2NvYVR5cGUoY29jb2FUeXBlKTsKICAgICBpZiAoIXV0aVR5cGUuaXNFbXB0 eSgpKSB7CiAgICAgICAgIHJlc3VsdFR5cGVzLmFkZCh1dGlUeXBlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0KaW5kZXggMmYwYzViZjllYmRkODgzYjRl YmU3MjcwYjc4YzZlNDBmYTcyNjkzZS4uYmE2ODc0NDZhZGE3YTFmZjI2MDYxYjM1ZGQ2MzEzMjVm ODFkNzZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9h cmRNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMu bW0KQEAgLTUwOCwyMCArNTA4LDggQEAgdm9pZCBQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJk VHlwZXNGb3JDb2NvYVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0VHkKICAgICAgICAg cmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgidGV4dC91cmktbGlzdCIpKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KLSAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhOU0ZpbGVuYW1lc1Bi b2FyZFR5cGUpKSB7Ci0gICAgICAgIC8vIElmIGZpbGUgbGlzdCBpcyBlbXB0eSwgYWRkIG5vdGhp bmcuCi0gICAgICAgIC8vIE5vdGUgdGhhdCB0aGVyZSBpcyBhIGNoYW5jZSB0aGF0IHRoZSBmaWxl IGxpc3QgY291bnQgY291bGQgaGF2ZSBjaGFuZ2VkIHNpbmNlIHdlIGdyYWJiZWQgdGhlIHR5cGVz IGFycmF5LgotICAgICAgICAvLyBIb3dldmVyLCB0aGlzIGlzIG5vdCByZWFsbHkgYW4gaXNzdWUg Zm9yIHVzIGRvaW5nIGEgc2FuaXR5IGNoZWNrIGhlcmUuCi0gICAgICAgIFZlY3RvcjxTdHJpbmc+ IGZpbGVMaXN0OwotICAgICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0 ZWd5KCktPmdldFBhdGhuYW1lc0ZvclR5cGUoZmlsZUxpc3QsIFN0cmluZyhOU0ZpbGVuYW1lc1Bi b2FyZFR5cGUpLCBwYXN0ZWJvYXJkTmFtZSk7Ci0gICAgICAgIGlmICghZmlsZUxpc3QuaXNFbXB0 eSgpKQotICAgICAgICAgICAgcmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgiRmlsZXMiKSk7 CisgICAgaWYgKGNvY29hVHlwZSA9PSBTdHJpbmcoTlNGaWxlbmFtZXNQYm9hcmRUeXBlKSB8fCBQ YXN0ZWJvYXJkOjpzaG91bGRUcmVhdENvY29hVHlwZUFzRmlsZShjb2NvYVR5cGUpKQogICAgICAg ICByZXR1cm47Ci0gICAgfQotICAgIGlmIChQYXN0ZWJvYXJkOjpzaG91bGRUcmVhdENvY29hVHlw ZUFzRmlsZShjb2NvYVR5cGUpKSB7Ci0gICAgICAgIHJlc3VsdFR5cGVzLmFkZChBU0NJSUxpdGVy YWwoIkZpbGVzIikpOwotICAgICAgICByZXR1cm47Ci0gICAgfQogICAgIFN0cmluZyB1dGlUeXBl ID0gdXRpVHlwZUZyb21Db2NvYVR5cGUoY29jb2FUeXBlKTsKICAgICBpZiAoIXV0aVR5cGUuaXNF bXB0eSgpKSB7CiAgICAgICAgIHJlc3VsdFR5cGVzLmFkZCh1dGlUeXBlKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAppbmRleCA2NzQzODcyMDk2NTYw ZTBmNWE1OTM5NzU5YzFlZWYxZWQwODFhMWQxLi41OGZkNDVhOWMwMzllNzY0YjM4YzJjY2EzZjQ2 ZGUwYWNhOTRjODdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFz dGVib2FyZFdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9h cmRXaW4uY3BwCkBAIC0yMzIsMTUgKzIzMiwxMCBAQCBib29sIFBhc3RlYm9hcmQ6Omhhc0RhdGEo KQogc3RhdGljIHZvaWQgYWRkTWltZVR5cGVzRm9yRm9ybWF0KExpc3RIYXNoU2V0PFN0cmluZz4m IHJlc3VsdHMsIGNvbnN0IEZPUk1BVEVUQyYgZm9ybWF0KQogewogICAgIC8vIFVSTCBhbmQgVGV4 dCBhcmUgcHJvdmlkZWQgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBJRSdzIG1vZGVsCi0gICAgaWYg KGZvcm1hdC5jZkZvcm1hdCA9PSB1cmxGb3JtYXQoKS0+Y2ZGb3JtYXQgfHwgZm9ybWF0LmNmRm9y bWF0ID09IHVybFdGb3JtYXQoKS0+Y2ZGb3JtYXQpIHsKLSAgICAgICAgcmVzdWx0cy5hZGQoIlVS TCIpOworICAgIGlmIChmb3JtYXQuY2ZGb3JtYXQgPT0gdXJsRm9ybWF0KCktPmNmRm9ybWF0IHx8 IGZvcm1hdC5jZkZvcm1hdCA9PSB1cmxXRm9ybWF0KCktPmNmRm9ybWF0KQogICAgICAgICByZXN1 bHRzLmFkZCgidGV4dC91cmktbGlzdCIpOwotICAgIH0KLQotICAgIGlmIChmb3JtYXQuY2ZGb3Jt YXQgPT0gcGxhaW5UZXh0V0Zvcm1hdCgpLT5jZkZvcm1hdCB8fCBmb3JtYXQuY2ZGb3JtYXQgPT0g cGxhaW5UZXh0Rm9ybWF0KCktPmNmRm9ybWF0KSB7Ci0gICAgICAgIHJlc3VsdHMuYWRkKCJUZXh0 Iik7CisgICAgaWYgKGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRXRm9ybWF0KCktPmNmRm9y bWF0IHx8IGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRGb3JtYXQoKS0+Y2ZGb3JtYXQpCiAg ICAgICAgIHJlc3VsdHMuYWRkKCJ0ZXh0L3BsYWluIik7Ci0gICAgfQogfQogCiBWZWN0b3I8U3Ry aW5nPiBQYXN0ZWJvYXJkOjp0eXBlc1NhZmVGb3JCaW5kaW5ncygpCg== 322347 2017-10-01 19:50:30 -0700 2017-10-01 19:58:13 -0700 Fixed Mac builds bug-177731-20171001195028.patch text/plain 9319 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRmZmNmYjBlY2QyZTRm ZmJlNmEwYjIzN2QwNDMyYzI2YWIzOWExNy4uOWNmYmMyOGE5ZjhiOGVkNWRlOWQxZjA1NzFkZDY5 MjU5M2M0ZDRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTEwLTAxICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3RlYm9hcmQgc2hvdWxk bid0IGFkZCAiRmlsZXMiIGFzIGEgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCB0aGUgcGxhdGZvcm0gc3BlY2lmaWMgY29kZSB0byBh ZGQgIkZpbGVzIiB3aGVuIHRoZXJlIGlzIGEgZmlsZSBwcmVzZW50IGluIHBsYXRmb3JtJ3MgcGFz dGVib2FyZC4KKyAgICAgICAgRGF0YVRyYW5zZmVyOjp0eXBlcyBub3cgYWRkcyAiRmlsZXMiIGF1 dG9tYXRpY2FsbHkgd2hlbiBQYXN0ZWJvYXJkOjpjb250YWluc0ZpbGVzIHJldHVybnMgdHJ1ZS4K KworICAgICAgICBObyBuZXcgdGVzdHMgc2luY2UgdGhlcmUgc2hvdWxkIGJlIG5vIGJlaGF2aW9y YWwgY2hhbmdlLgorCisgICAgICAgICogZG9tL0RhdGFUcmFuc2Zlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEYXRhVHJhbnNmZXI6OnR5cGVzIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUGFzdGVib2FyZEd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp0eXBl c0ZvckxlZ2FjeVVuc2FmZUJpbmRpbmdzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvUGFzdGVi b2FyZElPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9h cmRUeXBlc0ZvckNvY29hVHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRN YWMubW06CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlw ZXNGb3JDb2NvYVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmFkZE1pbWVUeXBlc0ZvckZvcm1hdCk6IFJlbW92ZWQgdGhl IGNvZGUgdG8gYWRkICJUZXh0IiBhbmQgIlVSTCIgYXMgc2VwYXJhdGUgdHlwZXMgc2luY2UKKyAg ICAgICAgdGhpcyBpcyBub3Qgd2hhdCB0aGUgcmVzdCBvZiBwb3J0cyBkbywgYW5kIHRoaXMgdHlw ZSBub3JtYWxpemF0aW9uIGlzIG5vdyB0YWtlbiBjYXJlIG9mIGJ5IERhdGFUcmFuc2ZlcgorICAg ICAgICBzaW5jZSByMjIxMDYzLgorCiAyMDE3LTA5LTMwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIERvbid0IHJldmVhbCBmaWxlIFVSTCB3aGVuIHBhc3Rpbmcg YW4gaW1hZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9EYXRhVHJhbnNmZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFuc2Zlci5jcHAKaW5kZXggOWQyMWYzYWE1MjAx ZTVkOTBiMTU5Yzk1YjBhMDgwM2VhNThiYzZiZi4uNjg4MDFhNzRhODA2NmYzM2QwNDc5ZTNmMzA0 MzkyNWJiYTAzY2UxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFuc2Zl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFuc2Zlci5jcHAKQEAgLTE3Miwx MiArMTcyLDIyIEBAIFZlY3RvcjxTdHJpbmc+IERhdGFUcmFuc2Zlcjo6dHlwZXMoKSBjb25zdAog ICAgIGlmICghY2FuUmVhZFR5cGVzKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAgICAgCi0gICAg aWYgKCFTZXR0aW5nczo6Y3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpCi0gICAgICAgIHJl dHVybiBtX3Bhc3RlYm9hcmQtPnR5cGVzRm9yTGVnYWN5VW5zYWZlQmluZGluZ3MoKTsKKyAgICBp ZiAoIVNldHRpbmdzOjpjdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoKSkgeworICAgICAgICBh dXRvIHR5cGVzID0gbV9wYXN0ZWJvYXJkLT50eXBlc0ZvckxlZ2FjeVVuc2FmZUJpbmRpbmdzKCk7 CisgICAgICAgIEFTU0VSVCghdHlwZXMuY29udGFpbnMoIkZpbGVzIikpOworICAgICAgICBpZiAo bV9wYXN0ZWJvYXJkLT5jb250YWluc0ZpbGVzKCkpCisgICAgICAgICAgICB0eXBlcy5hcHBlbmQo IkZpbGVzIik7CisgICAgICAgIHJldHVybiB0eXBlczsKKyAgICB9CiAKLSAgICBpZiAobV9wYXN0 ZWJvYXJkLT5jb250YWluc0ZpbGVzKCkpCisgICAgaWYgKG1fcGFzdGVib2FyZC0+Y29udGFpbnNG aWxlcygpKSB7CisgICAgICAgIEFTU0VSVCghbV9wYXN0ZWJvYXJkLT50eXBlc1NhZmVGb3JCaW5k aW5ncygpLmNvbnRhaW5zKCJGaWxlcyIpKTsKICAgICAgICAgcmV0dXJuIHsgIkZpbGVzIiB9Owot ICAgIHJldHVybiBtX3Bhc3RlYm9hcmQtPnR5cGVzU2FmZUZvckJpbmRpbmdzKCk7CisgICAgfQor CisgICAgYXV0byB0eXBlcyA9IG1fcGFzdGVib2FyZC0+dHlwZXNTYWZlRm9yQmluZGluZ3MoKTsK KyAgICBBU1NFUlQoIXR5cGVzLmNvbnRhaW5zKCJGaWxlcyIpKTsKKyAgICByZXR1cm4gdHlwZXM7 CiB9CiAKIEZpbGVMaXN0JiBEYXRhVHJhbnNmZXI6OmZpbGVzKCkgY29uc3QKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Bhc3RlYm9hcmQuaAppbmRleCA5ODgyMGM5MzFkZjE4ZTIzM2FmZThmOGY3YzIzMTdm MWJiY2Y5NDNiLi43NDhiNWNiZWY5YTliNTYyYThjM2I0YWRmZGJlYmJjN2QzNDNlZjZkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCkBAIC0yNzksNyArMjc5LDcgQEAgcHJpdmF0 ZToKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBWZWN0b3I8U3RyaW5nPiByZWFkRmlsZW5hbWVz KCk7CiAgICAgU3RyaW5nIHJlYWRQbGF0Zm9ybVZhbHVlQXNTdHJpbmcoY29uc3QgU3RyaW5nJiBk b21UeXBlLCBsb25nIGNoYW5nZUNvdW50LCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKTsK LSAgICBzdGF0aWMgdm9pZCBhZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUoTGlzdEhh c2hTZXQ8U3RyaW5nPiYgcmVzdWx0VHlwZXMsIGNvbnN0IFN0cmluZyYgY29jb2FUeXBlLCBjb25z dCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKTsKKyAgICBzdGF0aWMgdm9pZCBhZGRIVE1MQ2xpcGJv YXJkVHlwZXNGb3JDb2NvYVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0VHlwZXMsIGNv bnN0IFN0cmluZyYgY29jb2FUeXBlKTsKICAgICBTdHJpbmcgcmVhZFN0cmluZ0ZvclBsYXRmb3Jt VHlwZShjb25zdCBTdHJpbmcmKTsKICAgICBWZWN0b3I8U3RyaW5nPiByZWFkVHlwZXNXaXRoU2Vj dXJpdHlDaGVjaygpOwogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHJlYWRCdWZmZXJGb3JUeXBl V2l0aFNlY3VyaXR5Q2hlY2soY29uc3QgU3RyaW5nJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jb2NvYS9QYXN0ZWJvYXJkQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jb2NvYS9QYXN0ZWJvYXJkQ29jb2EubW0KaW5kZXggOWUyYTFiYjQ3OTU4NzRmMDQy Y2NiNTZjODdkZmQ4MjFhZmIxM2E1Ny4uY2IzYjgxYzJjYWE4MmU5ZDEzZTU4NDk1MzlmZDVlYmEy MzE1ZDRmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUGFzdGVi b2FyZENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Bhc3RlYm9h cmRDb2NvYS5tbQpAQCAtMTYxLDcgKzE2MSw3IEBAIFZlY3RvcjxTdHJpbmc+IFBhc3RlYm9hcmQ6 OnR5cGVzRm9yTGVnYWN5VW5zYWZlQmluZGluZ3MoKQogCiAgICAgTGlzdEhhc2hTZXQ8U3RyaW5n PiByZXN1bHQ7CiAgICAgZm9yIChhdXRvJiBjb2NvYVR5cGUgOiBjb2NvYVR5cGVzKQotICAgICAg ICBhZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUocmVzdWx0LCBjb2NvYVR5cGUsIG1f cGFzdGVib2FyZE5hbWUpOworICAgICAgICBhZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5 cGUocmVzdWx0LCBjb2NvYVR5cGUpOwogCiAgICAgVmVjdG9yPFN0cmluZz4gdHlwZXM7CiAgICAg Y29weVRvVmVjdG9yKHJlc3VsdCwgdHlwZXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL1Bhc3RlYm9hcmRHdGsuY3BwCmluZGV4IDU2ZTUwYTUwZmRkMWJjNjBhMDFjODM0ZmQ5Yzdj OTYzM2ZkZDZmYWQuLmM4OWQ3NWJlMmZkNjVkYjVhMzkzZGZhMDY4NmJkMzY3NzU3MmU5ZjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3RrLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHAKQEAgLTI4 MCw5ICsyODAsNiBAQCBWZWN0b3I8U3RyaW5nPiBQYXN0ZWJvYXJkOjp0eXBlc0ZvckxlZ2FjeVVu c2FmZUJpbmRpbmdzKCkKICAgICAgICAgdHlwZXMuYXBwZW5kKEFTQ0lJTGl0ZXJhbCgiVVJMIikp OwogICAgIH0KIAotICAgIGlmIChtX3NlbGVjdGlvbkRhdGEtPmhhc0ZpbGVuYW1lcygpKQotICAg ICAgICB0eXBlcy5hcHBlbmQoQVNDSUlMaXRlcmFsKCJGaWxlcyIpKTsKLQogICAgIGZvciAoYXV0 byYga2V5IDogbV9zZWxlY3Rpb25EYXRhLT51bmtub3duVHlwZXMoKS5rZXlzKCkpCiAgICAgICAg IHR5cGVzLmFwcGVuZChrZXkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvUGFzdGVib2FyZElPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0 ZWJvYXJkSU9TLm1tCmluZGV4IDEzZTFlNjE2MTg3OTRlNjUyM2E3MDljYjg5NzFkY2RhMjgxOTI2 NTYuLmNlNDJjNGFhMjVkNjE0MmEwNTIwZGNkYmEwN2MwMzM0OTE3ZjIyZDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tCkBAIC0zNDUsNyArMzQ1LDcg QEAgU3RyaW5nIFBhc3RlYm9hcmQ6OnJlYWRQbGF0Zm9ybVZhbHVlQXNTdHJpbmcoY29uc3QgU3Ry aW5nJiBkb21UeXBlLCBsb25nIGNoYW5nZUMKICAgICByZXR1cm4gU3RyaW5nKCk7CiB9CiAKLXZv aWQgUGFzdGVib2FyZDo6YWRkSFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlKExpc3RIYXNo U2V0PFN0cmluZz4mIHJlc3VsdFR5cGVzLCBjb25zdCBTdHJpbmcmIGNvY29hVHlwZSwgY29uc3Qg U3RyaW5nJikKK3ZvaWQgUGFzdGVib2FyZDo6YWRkSFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FU eXBlKExpc3RIYXNoU2V0PFN0cmluZz4mIHJlc3VsdFR5cGVzLCBjb25zdCBTdHJpbmcmIGNvY29h VHlwZSkKIHsKICAgICAvLyBVVEkgbWF5IG5vdCBkbyB0aGVzZSByaWdodCwgc28gbWFrZSBzdXJl IHdlIGdldCB0aGUgcmlnaHQsIHByZWRpY3RhYmxlIHJlc3VsdC4KICAgICBpZiAoW2NvY29hVHlw ZSBpc0VxdWFsVG9TdHJpbmc6KE5TU3RyaW5nICopa1VUVHlwZVBsYWluVGV4dF0KQEAgLTM1OCwx MCArMzU4LDggQEAgdm9pZCBQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2Nv YVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0VHkKICAgICAgICAgcmVzdWx0VHlwZXMu YWRkKEFTQ0lJTGl0ZXJhbCgidGV4dC91cmktbGlzdCIpKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KLSAgICBpZiAoUGFzdGVib2FyZDo6c2hvdWxkVHJlYXRDb2NvYVR5cGVBc0ZpbGUoY29jb2FU eXBlKSkgewotICAgICAgICByZXN1bHRUeXBlcy5hZGQoQVNDSUlMaXRlcmFsKCJGaWxlcyIpKTsK KyAgICBpZiAoUGFzdGVib2FyZDo6c2hvdWxkVHJlYXRDb2NvYVR5cGVBc0ZpbGUoY29jb2FUeXBl KSkKICAgICAgICAgcmV0dXJuOwotICAgIH0KICAgICBTdHJpbmcgdXRpVHlwZSA9IHV0aVR5cGVG cm9tQ29jb2FUeXBlKGNvY29hVHlwZSk7CiAgICAgaWYgKCF1dGlUeXBlLmlzRW1wdHkoKSkgewog ICAgICAgICByZXN1bHRUeXBlcy5hZGQodXRpVHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCmluZGV4IDJmMGM1YmY5ZWJkZDg4M2I0ZWJlNzI3MGI3 OGM2ZTQwZmE3MjY5M2UuLjdkYWJkOTQzNGVlZjUyYjhjM2Y2MzFiZGUxYjFmMzI2ZjNmODRhYTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCkBAIC00 OTQsNyArNDk0LDcgQEAgc3RhdGljIFN0cmluZyB1dGlUeXBlRnJvbUNvY29hVHlwZShjb25zdCBT dHJpbmcmIHR5cGUpCiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi12b2lkIFBhc3RlYm9hcmQ6 OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZShMaXN0SGFzaFNldDxTdHJpbmc+JiBy ZXN1bHRUeXBlcywgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUsIGNvbnN0IFN0cmluZyYgcGFzdGVi b2FyZE5hbWUpCit2b2lkIFBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29h VHlwZShMaXN0SGFzaFNldDxTdHJpbmc+JiByZXN1bHRUeXBlcywgY29uc3QgU3RyaW5nJiBjb2Nv YVR5cGUpCiB7CiAgICAgaWYgKGNvY29hVHlwZSA9PSAiTmVYVCBwbGFpbiBhc2NpaSBwYXN0ZWJv YXJkIHR5cGUiKQogICAgICAgICByZXR1cm47IC8vIFNraXAgdGhpcyBhbmNpZW50IHR5cGUgdGhh dCBnZXRzIGF1dG8tc3VwcGxpZWQgYnkgc29tZSBzeXN0ZW0gY29udmVyc2lvbi4KQEAgLTUwOCwy MCArNTA4LDggQEAgdm9pZCBQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2Nv YVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0VHkKICAgICAgICAgcmVzdWx0VHlwZXMu YWRkKEFTQ0lJTGl0ZXJhbCgidGV4dC91cmktbGlzdCIpKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KLSAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhOU0ZpbGVuYW1lc1Bib2FyZFR5cGUpKSB7 Ci0gICAgICAgIC8vIElmIGZpbGUgbGlzdCBpcyBlbXB0eSwgYWRkIG5vdGhpbmcuCi0gICAgICAg IC8vIE5vdGUgdGhhdCB0aGVyZSBpcyBhIGNoYW5jZSB0aGF0IHRoZSBmaWxlIGxpc3QgY291bnQg Y291bGQgaGF2ZSBjaGFuZ2VkIHNpbmNlIHdlIGdyYWJiZWQgdGhlIHR5cGVzIGFycmF5LgotICAg ICAgICAvLyBIb3dldmVyLCB0aGlzIGlzIG5vdCByZWFsbHkgYW4gaXNzdWUgZm9yIHVzIGRvaW5n IGEgc2FuaXR5IGNoZWNrIGhlcmUuCi0gICAgICAgIFZlY3RvcjxTdHJpbmc+IGZpbGVMaXN0Owot ICAgICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPmdldFBh dGhuYW1lc0ZvclR5cGUoZmlsZUxpc3QsIFN0cmluZyhOU0ZpbGVuYW1lc1Bib2FyZFR5cGUpLCBw YXN0ZWJvYXJkTmFtZSk7Ci0gICAgICAgIGlmICghZmlsZUxpc3QuaXNFbXB0eSgpKQotICAgICAg ICAgICAgcmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgiRmlsZXMiKSk7CisgICAgaWYgKGNv Y29hVHlwZSA9PSBTdHJpbmcoTlNGaWxlbmFtZXNQYm9hcmRUeXBlKSB8fCBQYXN0ZWJvYXJkOjpz aG91bGRUcmVhdENvY29hVHlwZUFzRmlsZShjb2NvYVR5cGUpKQogICAgICAgICByZXR1cm47Ci0g ICAgfQotICAgIGlmIChQYXN0ZWJvYXJkOjpzaG91bGRUcmVhdENvY29hVHlwZUFzRmlsZShjb2Nv YVR5cGUpKSB7Ci0gICAgICAgIHJlc3VsdFR5cGVzLmFkZChBU0NJSUxpdGVyYWwoIkZpbGVzIikp OwotICAgICAgICByZXR1cm47Ci0gICAgfQogICAgIFN0cmluZyB1dGlUeXBlID0gdXRpVHlwZUZy b21Db2NvYVR5cGUoY29jb2FUeXBlKTsKICAgICBpZiAoIXV0aVR5cGUuaXNFbXB0eSgpKSB7CiAg ICAgICAgIHJlc3VsdFR5cGVzLmFkZCh1dGlUeXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAppbmRleCA2NzQzODcyMDk2NTYwZTBmNWE1OTM5NzU5 YzFlZWYxZWQwODFhMWQxLi41OGZkNDVhOWMwMzllNzY0YjM4YzJjY2EzZjQ2ZGUwYWNhOTRjODdj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFzdGVib2FyZFdpbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwCkBA IC0yMzIsMTUgKzIzMiwxMCBAQCBib29sIFBhc3RlYm9hcmQ6Omhhc0RhdGEoKQogc3RhdGljIHZv aWQgYWRkTWltZVR5cGVzRm9yRm9ybWF0KExpc3RIYXNoU2V0PFN0cmluZz4mIHJlc3VsdHMsIGNv bnN0IEZPUk1BVEVUQyYgZm9ybWF0KQogewogICAgIC8vIFVSTCBhbmQgVGV4dCBhcmUgcHJvdmlk ZWQgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBJRSdzIG1vZGVsCi0gICAgaWYgKGZvcm1hdC5jZkZv cm1hdCA9PSB1cmxGb3JtYXQoKS0+Y2ZGb3JtYXQgfHwgZm9ybWF0LmNmRm9ybWF0ID09IHVybFdG b3JtYXQoKS0+Y2ZGb3JtYXQpIHsKLSAgICAgICAgcmVzdWx0cy5hZGQoIlVSTCIpOworICAgIGlm IChmb3JtYXQuY2ZGb3JtYXQgPT0gdXJsRm9ybWF0KCktPmNmRm9ybWF0IHx8IGZvcm1hdC5jZkZv cm1hdCA9PSB1cmxXRm9ybWF0KCktPmNmRm9ybWF0KQogICAgICAgICByZXN1bHRzLmFkZCgidGV4 dC91cmktbGlzdCIpOwotICAgIH0KLQotICAgIGlmIChmb3JtYXQuY2ZGb3JtYXQgPT0gcGxhaW5U ZXh0V0Zvcm1hdCgpLT5jZkZvcm1hdCB8fCBmb3JtYXQuY2ZGb3JtYXQgPT0gcGxhaW5UZXh0Rm9y bWF0KCktPmNmRm9ybWF0KSB7Ci0gICAgICAgIHJlc3VsdHMuYWRkKCJUZXh0Iik7CisgICAgaWYg KGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRXRm9ybWF0KCktPmNmRm9ybWF0IHx8IGZvcm1h dC5jZkZvcm1hdCA9PSBwbGFpblRleHRGb3JtYXQoKS0+Y2ZGb3JtYXQpCiAgICAgICAgIHJlc3Vs dHMuYWRkKCJ0ZXh0L3BsYWluIik7Ci0gICAgfQogfQogCiBWZWN0b3I8U3RyaW5nPiBQYXN0ZWJv YXJkOjp0eXBlc1NhZmVGb3JCaW5kaW5ncygpCg== 322348 2017-10-01 19:58:15 -0700 2017-10-01 20:03:24 -0700 Updated for trunk bug-177731-20171001195813.patch text/plain 8596 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjY5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEwLTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3RlYm9hcmQgc2hvdWxkbid0 IGFkZCAiRmlsZXMiIGFzIGEgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc3NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVtb3ZlZCB0aGUgcGxhdGZvcm0gc3BlY2lmaWMgY29kZSB0byBhZGQg IkZpbGVzIiB3aGVuIHRoZXJlIGlzIGEgZmlsZSBwcmVzZW50IGluIHBsYXRmb3JtJ3MgcGFzdGVi b2FyZC4KKyAgICAgICAgRGF0YVRyYW5zZmVyOjp0eXBlcyBub3cgYWRkcyAiRmlsZXMiIGF1dG9t YXRpY2FsbHkgd2hlbiBQYXN0ZWJvYXJkOjpjb250YWluc0ZpbGVzIHJldHVybnMgdHJ1ZS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgc2luY2UgdGhlcmUgc2hvdWxkIGJlIG5vIGJlaGF2aW9yYWwg Y2hhbmdlLgorCisgICAgICAgICogZG9tL0RhdGFUcmFuc2Zlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEYXRhVHJhbnNmZXI6OnR5cGVzIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsv UGFzdGVib2FyZEd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp0eXBlc0Zv ckxlZ2FjeVVuc2FmZUJpbmRpbmdzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvUGFzdGVib2Fy ZElPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9hcmRU eXBlc0ZvckNvY29hVHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlwZXNG b3JDb2NvYVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmFkZE1pbWVUeXBlc0ZvckZvcm1hdCk6IFJlbW92ZWQgdGhlIGNv ZGUgdG8gYWRkICJUZXh0IiBhbmQgIlVSTCIgYXMgc2VwYXJhdGUgdHlwZXMgc2luY2UgdGhpcyBp cworICAgICAgICBub3Qgd2hhdCBvdGhlciBwb3J0cyBkbywgYW5kIHRoaXMgdHlwZSBub3JtYWxp emF0aW9uIGlzIG5vdyB0YWtlbiBjYXJlIG9mIGJ5IERhdGFUcmFuc2ZlciBzaW5jZSByMjIxMDYz LgorCiAyMDE3LTEwLTAxICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAg QWRkIHN1cHBvcnQgZm9yIERPTSBhYm9ydGluZyAoaHR0cHM6Ly9kb20uc3BlYy53aGF0d2cub3Jn LyNhYm9ydGluZy1vbmdvaW5nLWFjdGl2aXRpZXMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20v RGF0YVRyYW5zZmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRGF0YVRy YW5zZmVyLmNwcAkocmV2aXNpb24gMjIyNjk0KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RhdGFU cmFuc2Zlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MiwxMiArMTcyLDIyIEBAIFZlY3RvcjxT dHJpbmc+IERhdGFUcmFuc2Zlcjo6dHlwZXMoKSBjb24KICAgICBpZiAoIWNhblJlYWRUeXBlcygp KQogICAgICAgICByZXR1cm4geyB9OwogICAgIAotICAgIGlmICghU2V0dGluZ3M6OmN1c3RvbVBh c3RlYm9hcmREYXRhRW5hYmxlZCgpKQotICAgICAgICByZXR1cm4gbV9wYXN0ZWJvYXJkLT50eXBl c0ZvckxlZ2FjeVVuc2FmZUJpbmRpbmdzKCk7CisgICAgaWYgKCFTZXR0aW5nczo6Y3VzdG9tUGFz dGVib2FyZERhdGFFbmFibGVkKCkpIHsKKyAgICAgICAgYXV0byB0eXBlcyA9IG1fcGFzdGVib2Fy ZC0+dHlwZXNGb3JMZWdhY3lVbnNhZmVCaW5kaW5ncygpOworICAgICAgICBBU1NFUlQoIXR5cGVz LmNvbnRhaW5zKCJGaWxlcyIpKTsKKyAgICAgICAgaWYgKG1fcGFzdGVib2FyZC0+Y29udGFpbnNG aWxlcygpKQorICAgICAgICAgICAgdHlwZXMuYXBwZW5kKCJGaWxlcyIpOworICAgICAgICByZXR1 cm4gdHlwZXM7CisgICAgfQogCi0gICAgaWYgKG1fcGFzdGVib2FyZC0+Y29udGFpbnNGaWxlcygp KQorICAgIGlmIChtX3Bhc3RlYm9hcmQtPmNvbnRhaW5zRmlsZXMoKSkgeworICAgICAgICBBU1NF UlQoIW1fcGFzdGVib2FyZC0+dHlwZXNTYWZlRm9yQmluZGluZ3MoKS5jb250YWlucygiRmlsZXMi KSk7CiAgICAgICAgIHJldHVybiB7ICJGaWxlcyIgfTsKLSAgICByZXR1cm4gbV9wYXN0ZWJvYXJk LT50eXBlc1NhZmVGb3JCaW5kaW5ncygpOworICAgIH0KKworICAgIGF1dG8gdHlwZXMgPSBtX3Bh c3RlYm9hcmQtPnR5cGVzU2FmZUZvckJpbmRpbmdzKCk7CisgICAgQVNTRVJUKCF0eXBlcy5jb250 YWlucygiRmlsZXMiKSk7CisgICAgcmV0dXJuIHR5cGVzOwogfQogCiBGaWxlTGlzdCYgRGF0YVRy YW5zZmVyOjpmaWxlcygpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0 ZWJvYXJkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2Fy ZC5oCShyZXZpc2lvbiAyMjI2OTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJv YXJkLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4Myw3ICsyODMsNyBAQCBwcml2YXRlOgogCiAjaWYg UExBVEZPUk0oQ09DT0EpCiAgICAgU3RyaW5nIHJlYWRQbGF0Zm9ybVZhbHVlQXNTdHJpbmcoY29u c3QgU3RyaW5nJiBkb21UeXBlLCBsb25nIGNoYW5nZUNvdW50LCBjb25zdCBTdHJpbmcmIHBhc3Rl Ym9hcmROYW1lKTsKLSAgICBzdGF0aWMgdm9pZCBhZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2Nv YVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0VHlwZXMsIGNvbnN0IFN0cmluZyYgY29j b2FUeXBlLCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKTsKKyAgICBzdGF0aWMgdm9pZCBh ZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVz dWx0VHlwZXMsIGNvbnN0IFN0cmluZyYgY29jb2FUeXBlKTsKICAgICBTdHJpbmcgcmVhZFN0cmlu Z0ZvclBsYXRmb3JtVHlwZShjb25zdCBTdHJpbmcmKTsKICNlbmRpZgogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QYXN0ZWJvYXJkQ29jb2EubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUGFzdGVib2FyZENvY29hLm1tCShyZXZpc2lv biAyMjI2OTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QYXN0ZWJvYXJkQ29j b2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE5Miw3ICsxOTIsNyBAQCBWZWN0b3I8U3RyaW5nPiBQ YXN0ZWJvYXJkOjp0eXBlc0ZvckxlZ2FjCiAKICAgICBMaXN0SGFzaFNldDxTdHJpbmc+IHJlc3Vs dDsKICAgICBmb3IgKGF1dG8mIGNvY29hVHlwZSA6IHR5cGVzKQotICAgICAgICBhZGRIVE1MQ2xp cGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUocmVzdWx0LCBjb2NvYVR5cGUsIG1fcGFzdGVib2FyZE5h bWUpOworICAgICAgICBhZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUocmVzdWx0LCBj b2NvYVR5cGUpOwogCiAgICAgY29weVRvVmVjdG9yKHJlc3VsdCwgdHlwZXMpOwogICAgIHJldHVy biB0eXBlczsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkR3Rr LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2Fy ZEd0ay5jcHAJKHJldmlzaW9uIDIyMjY5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9QYXN0ZWJvYXJkR3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc3LDkgKzI3Nyw2IEBAIFZl Y3RvcjxTdHJpbmc+IFBhc3RlYm9hcmQ6OnR5cGVzRm9yTGVnYWMKICAgICAgICAgdHlwZXMuYXBw ZW5kKEFTQ0lJTGl0ZXJhbCgiVVJMIikpOwogICAgIH0KIAotICAgIGlmIChtX3NlbGVjdGlvbkRh dGEtPmhhc0ZpbGVuYW1lcygpKQotICAgICAgICB0eXBlcy5hcHBlbmQoQVNDSUlMaXRlcmFsKCJG aWxlcyIpKTsKLQogICAgIGZvciAoYXV0byYga2V5IDogbV9zZWxlY3Rpb25EYXRhLT51bmtub3du VHlwZXMoKS5rZXlzKCkpCiAgICAgICAgIHR5cGVzLmFwcGVuZChrZXkpOwogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGFzdGVib2FyZElPUy5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGFzdGVib2FyZElPUy5tbQkocmV2aXNpb24gMjIy Njk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0JKHdv cmtpbmcgY29weSkKQEAgLTM0NSw3ICszNDUsNyBAQCBTdHJpbmcgUGFzdGVib2FyZDo6cmVhZFBs YXRmb3JtVmFsdWVBc1N0CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi12b2lkIFBhc3RlYm9h cmQ6OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZShMaXN0SGFzaFNldDxTdHJpbmc+ JiByZXN1bHRUeXBlcywgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUsIGNvbnN0IFN0cmluZyYpCit2 b2lkIFBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZShMaXN0SGFz aFNldDxTdHJpbmc+JiByZXN1bHRUeXBlcywgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUpCiB7CiAg ICAgLy8gVVRJIG1heSBub3QgZG8gdGhlc2UgcmlnaHQsIHNvIG1ha2Ugc3VyZSB3ZSBnZXQgdGhl IHJpZ2h0LCBwcmVkaWN0YWJsZSByZXN1bHQuCiAgICAgaWYgKFtjb2NvYVR5cGUgaXNFcXVhbFRv U3RyaW5nOihOU1N0cmluZyAqKWtVVFR5cGVQbGFpblRleHRdCkBAIC0zNTgsMTAgKzM1OCw4IEBA IHZvaWQgUGFzdGVib2FyZDo6YWRkSFRNTENsaXBib2FyZFR5cGVzRm8KICAgICAgICAgcmVzdWx0 VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgidGV4dC91cmktbGlzdCIpKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KLSAgICBpZiAoUGFzdGVib2FyZDo6c2hvdWxkVHJlYXRDb2NvYVR5cGVBc0ZpbGUo Y29jb2FUeXBlKSkgewotICAgICAgICByZXN1bHRUeXBlcy5hZGQoQVNDSUlMaXRlcmFsKCJGaWxl cyIpKTsKKyAgICBpZiAoUGFzdGVib2FyZDo6c2hvdWxkVHJlYXRDb2NvYVR5cGVBc0ZpbGUoY29j b2FUeXBlKSkKICAgICAgICAgcmV0dXJuOwotICAgIH0KICAgICBTdHJpbmcgdXRpVHlwZSA9IHV0 aVR5cGVGcm9tQ29jb2FUeXBlKGNvY29hVHlwZSk7CiAgICAgaWYgKCF1dGlUeXBlLmlzRW1wdHko KSkgewogICAgICAgICByZXN1bHRUeXBlcy5hZGQodXRpVHlwZSk7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkocmV2aXNpb24gMjIyNjk0KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0JKHdvcmtpbmcg Y29weSkKQEAgLTQ5NCw3ICs0OTQsNyBAQCBzdGF0aWMgU3RyaW5nIHV0aVR5cGVGcm9tQ29jb2FU eXBlKGNvbnN0CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi12b2lkIFBhc3RlYm9hcmQ6OmFk ZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZShMaXN0SGFzaFNldDxTdHJpbmc+JiByZXN1 bHRUeXBlcywgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUsIGNvbnN0IFN0cmluZyYgcGFzdGVib2Fy ZE5hbWUpCit2b2lkIFBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlw ZShMaXN0SGFzaFNldDxTdHJpbmc+JiByZXN1bHRUeXBlcywgY29uc3QgU3RyaW5nJiBjb2NvYVR5 cGUpCiB7CiAgICAgaWYgKGNvY29hVHlwZSA9PSAiTmVYVCBwbGFpbiBhc2NpaSBwYXN0ZWJvYXJk IHR5cGUiKQogICAgICAgICByZXR1cm47IC8vIFNraXAgdGhpcyBhbmNpZW50IHR5cGUgdGhhdCBn ZXRzIGF1dG8tc3VwcGxpZWQgYnkgc29tZSBzeXN0ZW0gY29udmVyc2lvbi4KQEAgLTUwOCwyMCAr NTA4LDggQEAgdm9pZCBQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlwZXNGbwogICAgICAg ICByZXN1bHRUeXBlcy5hZGQoQVNDSUlMaXRlcmFsKCJ0ZXh0L3VyaS1saXN0IikpOwogICAgICAg ICByZXR1cm47CiAgICAgfQotICAgIGlmIChjb2NvYVR5cGUgPT0gU3RyaW5nKE5TRmlsZW5hbWVz UGJvYXJkVHlwZSkpIHsKLSAgICAgICAgLy8gSWYgZmlsZSBsaXN0IGlzIGVtcHR5LCBhZGQgbm90 aGluZy4KLSAgICAgICAgLy8gTm90ZSB0aGF0IHRoZXJlIGlzIGEgY2hhbmNlIHRoYXQgdGhlIGZp bGUgbGlzdCBjb3VudCBjb3VsZCBoYXZlIGNoYW5nZWQgc2luY2Ugd2UgZ3JhYmJlZCB0aGUgdHlw ZXMgYXJyYXkuCi0gICAgICAgIC8vIEhvd2V2ZXIsIHRoaXMgaXMgbm90IHJlYWxseSBhbiBpc3N1 ZSBmb3IgdXMgZG9pbmcgYSBzYW5pdHkgY2hlY2sgaGVyZS4KLSAgICAgICAgVmVjdG9yPFN0cmlu Zz4gZmlsZUxpc3Q7Ci0gICAgICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3Ry YXRlZ3koKS0+Z2V0UGF0aG5hbWVzRm9yVHlwZShmaWxlTGlzdCwgU3RyaW5nKE5TRmlsZW5hbWVz UGJvYXJkVHlwZSksIHBhc3RlYm9hcmROYW1lKTsKLSAgICAgICAgaWYgKCFmaWxlTGlzdC5pc0Vt cHR5KCkpCi0gICAgICAgICAgICByZXN1bHRUeXBlcy5hZGQoQVNDSUlMaXRlcmFsKCJGaWxlcyIp KTsKKyAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhOU0ZpbGVuYW1lc1Bib2FyZFR5cGUpIHx8 IFBhc3RlYm9hcmQ6OnNob3VsZFRyZWF0Q29jb2FUeXBlQXNGaWxlKGNvY29hVHlwZSkpCiAgICAg ICAgIHJldHVybjsKLSAgICB9Ci0gICAgaWYgKFBhc3RlYm9hcmQ6OnNob3VsZFRyZWF0Q29jb2FU eXBlQXNGaWxlKGNvY29hVHlwZSkpIHsKLSAgICAgICAgcmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0 ZXJhbCgiRmlsZXMiKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgU3RyaW5nIHV0aVR5 cGUgPSB1dGlUeXBlRnJvbUNvY29hVHlwZShjb2NvYVR5cGUpOwogICAgIGlmICghdXRpVHlwZS5p c0VtcHR5KCkpIHsKICAgICAgICAgcmVzdWx0VHlwZXMuYWRkKHV0aVR5cGUpOwpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAkocmV2aXNpb24g MjIyNjk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bhc3RlYm9hcmRXaW4uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yMzIsMTUgKzIzMiwxMCBAQCBib29sIFBhc3RlYm9hcmQ6Omhh c0RhdGEoKQogc3RhdGljIHZvaWQgYWRkTWltZVR5cGVzRm9yRm9ybWF0KExpc3RIYXNoU2V0PFN0 cmluZz4mIHJlc3VsdHMsIGNvbnN0IEZPUk1BVEVUQyYgZm9ybWF0KQogewogICAgIC8vIFVSTCBh bmQgVGV4dCBhcmUgcHJvdmlkZWQgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBJRSdzIG1vZGVsCi0g ICAgaWYgKGZvcm1hdC5jZkZvcm1hdCA9PSB1cmxGb3JtYXQoKS0+Y2ZGb3JtYXQgfHwgZm9ybWF0 LmNmRm9ybWF0ID09IHVybFdGb3JtYXQoKS0+Y2ZGb3JtYXQpIHsKLSAgICAgICAgcmVzdWx0cy5h ZGQoIlVSTCIpOworICAgIGlmIChmb3JtYXQuY2ZGb3JtYXQgPT0gdXJsRm9ybWF0KCktPmNmRm9y bWF0IHx8IGZvcm1hdC5jZkZvcm1hdCA9PSB1cmxXRm9ybWF0KCktPmNmRm9ybWF0KQogICAgICAg ICByZXN1bHRzLmFkZCgidGV4dC91cmktbGlzdCIpOwotICAgIH0KLQotICAgIGlmIChmb3JtYXQu Y2ZGb3JtYXQgPT0gcGxhaW5UZXh0V0Zvcm1hdCgpLT5jZkZvcm1hdCB8fCBmb3JtYXQuY2ZGb3Jt YXQgPT0gcGxhaW5UZXh0Rm9ybWF0KCktPmNmRm9ybWF0KSB7Ci0gICAgICAgIHJlc3VsdHMuYWRk KCJUZXh0Iik7CisgICAgaWYgKGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRXRm9ybWF0KCkt PmNmRm9ybWF0IHx8IGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRGb3JtYXQoKS0+Y2ZGb3Jt YXQpCiAgICAgICAgIHJlc3VsdHMuYWRkKCJ0ZXh0L3BsYWluIik7Ci0gICAgfQogfQogCiBWZWN0 b3I8U3RyaW5nPiBQYXN0ZWJvYXJkOjp0eXBlc1NhZmVGb3JCaW5kaW5ncygpCg== 322349 2017-10-01 20:03:27 -0700 2017-10-01 20:04:03 -0700 Patch for landing bug-177731-20171001200325.patch text/plain 8596 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjY5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEwLTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3RlYm9hcmQgc2hvdWxkbid0 IGFkZCAiRmlsZXMiIGFzIGEgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc3NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFJlbW92ZWQgdGhlIHBsYXRmb3JtIHNwZWNpZmljIGNvZGUgdG8gYWRkICJG aWxlcyIgd2hlbiB0aGVyZSBpcyBhIGZpbGUgcHJlc2VudCBpbiBwbGF0Zm9ybSdzIHBhc3RlYm9h cmQuCisgICAgICAgIERhdGFUcmFuc2Zlcjo6dHlwZXMgbm93IGFkZHMgIkZpbGVzIiBhdXRvbWF0 aWNhbGx5IHdoZW4gUGFzdGVib2FyZDo6Y29udGFpbnNGaWxlcyByZXR1cm5zIHRydWUuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoZXJlIHNob3VsZCBiZSBubyBiZWhhdmlvcmFsIGNo YW5nZS4KKworICAgICAgICAqIGRvbS9EYXRhVHJhbnNmZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RGF0YVRyYW5zZmVyOjp0eXBlcyBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Bh c3RlYm9hcmRHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6dHlwZXNGb3JM ZWdhY3lVbnNhZmVCaW5kaW5ncyk6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlw ZXNGb3JDb2NvYVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6YWRkSFRNTENsaXBib2FyZFR5cGVzRm9y Q29jb2FUeXBlKToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vUGFzdGVib2FyZFdpbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjphZGRNaW1lVHlwZXNGb3JGb3JtYXQpOiBSZW1vdmVkIHRoZSBjb2Rl IHRvIGFkZCAiVGV4dCIgYW5kICJVUkwiIGFzIHNlcGFyYXRlIHR5cGVzIHNpbmNlIHRoaXMgaXMK KyAgICAgICAgbm90IHdoYXQgb3RoZXIgcG9ydHMgZG8sIGFuZCB0aGlzIHR5cGUgbm9ybWFsaXph dGlvbiBpcyBub3cgdGFrZW4gY2FyZSBvZiBieSBEYXRhVHJhbnNmZXIgc2luY2UgcjIyMTA2My4K KwogMjAxNy0xMC0wMSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFk ZCBzdXBwb3J0IGZvciBET00gYWJvcnRpbmcgKGh0dHBzOi8vZG9tLnNwZWMud2hhdHdnLm9yZy8j YWJvcnRpbmctb25nb2luZy1hY3Rpdml0aWVzKQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0Rh dGFUcmFuc2Zlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RhdGFUcmFu c2Zlci5jcHAJKHJldmlzaW9uIDIyMjY5NCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9EYXRhVHJh bnNmZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzIsMTIgKzE3MiwyMiBAQCBWZWN0b3I8U3Ry aW5nPiBEYXRhVHJhbnNmZXI6OnR5cGVzKCkgY29uCiAgICAgaWYgKCFjYW5SZWFkVHlwZXMoKSkK ICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAKLSAgICBpZiAoIVNldHRpbmdzOjpjdXN0b21QYXN0 ZWJvYXJkRGF0YUVuYWJsZWQoKSkKLSAgICAgICAgcmV0dXJuIG1fcGFzdGVib2FyZC0+dHlwZXNG b3JMZWdhY3lVbnNhZmVCaW5kaW5ncygpOworICAgIGlmICghU2V0dGluZ3M6OmN1c3RvbVBhc3Rl Ym9hcmREYXRhRW5hYmxlZCgpKSB7CisgICAgICAgIGF1dG8gdHlwZXMgPSBtX3Bhc3RlYm9hcmQt PnR5cGVzRm9yTGVnYWN5VW5zYWZlQmluZGluZ3MoKTsKKyAgICAgICAgQVNTRVJUKCF0eXBlcy5j b250YWlucygiRmlsZXMiKSk7CisgICAgICAgIGlmIChtX3Bhc3RlYm9hcmQtPmNvbnRhaW5zRmls ZXMoKSkKKyAgICAgICAgICAgIHR5cGVzLmFwcGVuZCgiRmlsZXMiKTsKKyAgICAgICAgcmV0dXJu IHR5cGVzOworICAgIH0KIAotICAgIGlmIChtX3Bhc3RlYm9hcmQtPmNvbnRhaW5zRmlsZXMoKSkK KyAgICBpZiAobV9wYXN0ZWJvYXJkLT5jb250YWluc0ZpbGVzKCkpIHsKKyAgICAgICAgQVNTRVJU KCFtX3Bhc3RlYm9hcmQtPnR5cGVzU2FmZUZvckJpbmRpbmdzKCkuY29udGFpbnMoIkZpbGVzIikp OwogICAgICAgICByZXR1cm4geyAiRmlsZXMiIH07Ci0gICAgcmV0dXJuIG1fcGFzdGVib2FyZC0+ dHlwZXNTYWZlRm9yQmluZGluZ3MoKTsKKyAgICB9CisKKyAgICBhdXRvIHR5cGVzID0gbV9wYXN0 ZWJvYXJkLT50eXBlc1NhZmVGb3JCaW5kaW5ncygpOworICAgIEFTU0VSVCghdHlwZXMuY29udGFp bnMoIkZpbGVzIikpOworICAgIHJldHVybiB0eXBlczsKIH0KIAogRmlsZUxpc3QmIERhdGFUcmFu c2Zlcjo6ZmlsZXMoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVi b2FyZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQu aAkocmV2aXNpb24gMjIyNjk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2Fy ZC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODMsNyArMjgzLDcgQEAgcHJpdmF0ZToKIAogI2lmIFBM QVRGT1JNKENPQ09BKQogICAgIFN0cmluZyByZWFkUGxhdGZvcm1WYWx1ZUFzU3RyaW5nKGNvbnN0 IFN0cmluZyYgZG9tVHlwZSwgbG9uZyBjaGFuZ2VDb3VudCwgY29uc3QgU3RyaW5nJiBwYXN0ZWJv YXJkTmFtZSk7Ci0gICAgc3RhdGljIHZvaWQgYWRkSFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FU eXBlKExpc3RIYXNoU2V0PFN0cmluZz4mIHJlc3VsdFR5cGVzLCBjb25zdCBTdHJpbmcmIGNvY29h VHlwZSwgY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSk7CisgICAgc3RhdGljIHZvaWQgYWRk SFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlKExpc3RIYXNoU2V0PFN0cmluZz4mIHJlc3Vs dFR5cGVzLCBjb25zdCBTdHJpbmcmIGNvY29hVHlwZSk7CiAgICAgU3RyaW5nIHJlYWRTdHJpbmdG b3JQbGF0Zm9ybVR5cGUoY29uc3QgU3RyaW5nJik7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY29jb2EvUGFzdGVib2FyZENvY29hLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Bhc3RlYm9hcmRDb2NvYS5tbQkocmV2aXNpb24g MjIyNjk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUGFzdGVib2FyZENvY29h Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTIsNyArMTkyLDcgQEAgVmVjdG9yPFN0cmluZz4gUGFz dGVib2FyZDo6dHlwZXNGb3JMZWdhYwogCiAgICAgTGlzdEhhc2hTZXQ8U3RyaW5nPiByZXN1bHQ7 CiAgICAgZm9yIChhdXRvJiBjb2NvYVR5cGUgOiB0eXBlcykKLSAgICAgICAgYWRkSFRNTENsaXBi b2FyZFR5cGVzRm9yQ29jb2FUeXBlKHJlc3VsdCwgY29jb2FUeXBlLCBtX3Bhc3RlYm9hcmROYW1l KTsKKyAgICAgICAgYWRkSFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlKHJlc3VsdCwgY29j b2FUeXBlKTsKIAogICAgIGNvcHlUb1ZlY3RvcihyZXN1bHQsIHR5cGVzKTsKICAgICByZXR1cm4g dHlwZXM7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRH dGsuY3BwCShyZXZpc2lvbiAyMjI2OTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UGFzdGVib2FyZEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3Nyw5ICsyNzcsNiBAQCBWZWN0 b3I8U3RyaW5nPiBQYXN0ZWJvYXJkOjp0eXBlc0ZvckxlZ2FjCiAgICAgICAgIHR5cGVzLmFwcGVu ZChBU0NJSUxpdGVyYWwoIlVSTCIpKTsKICAgICB9CiAKLSAgICBpZiAobV9zZWxlY3Rpb25EYXRh LT5oYXNGaWxlbmFtZXMoKSkKLSAgICAgICAgdHlwZXMuYXBwZW5kKEFTQ0lJTGl0ZXJhbCgiRmls ZXMiKSk7Ci0KICAgICBmb3IgKGF1dG8mIGtleSA6IG1fc2VsZWN0aW9uRGF0YS0+dW5rbm93blR5 cGVzKCkua2V5cygpKQogICAgICAgICB0eXBlcy5hcHBlbmQoa2V5KTsKIApJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0JKHJldmlzaW9uIDIyMjY5 NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNDUsNyArMzQ1LDcgQEAgU3RyaW5nIFBhc3RlYm9hcmQ6OnJlYWRQbGF0 Zm9ybVZhbHVlQXNTdAogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIAotdm9pZCBQYXN0ZWJvYXJk OjphZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYg cmVzdWx0VHlwZXMsIGNvbnN0IFN0cmluZyYgY29jb2FUeXBlLCBjb25zdCBTdHJpbmcmKQordm9p ZCBQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUoTGlzdEhhc2hT ZXQ8U3RyaW5nPiYgcmVzdWx0VHlwZXMsIGNvbnN0IFN0cmluZyYgY29jb2FUeXBlKQogewogICAg IC8vIFVUSSBtYXkgbm90IGRvIHRoZXNlIHJpZ2h0LCBzbyBtYWtlIHN1cmUgd2UgZ2V0IHRoZSBy aWdodCwgcHJlZGljdGFibGUgcmVzdWx0LgogICAgIGlmIChbY29jb2FUeXBlIGlzRXF1YWxUb1N0 cmluZzooTlNTdHJpbmcgKilrVVRUeXBlUGxhaW5UZXh0XQpAQCAtMzU4LDEwICszNTgsOCBAQCB2 b2lkIFBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvCiAgICAgICAgIHJlc3VsdFR5 cGVzLmFkZChBU0NJSUxpdGVyYWwoInRleHQvdXJpLWxpc3QiKSk7CiAgICAgICAgIHJldHVybjsK ICAgICB9Ci0gICAgaWYgKFBhc3RlYm9hcmQ6OnNob3VsZFRyZWF0Q29jb2FUeXBlQXNGaWxlKGNv Y29hVHlwZSkpIHsKLSAgICAgICAgcmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgiRmlsZXMi KSk7CisgICAgaWYgKFBhc3RlYm9hcmQ6OnNob3VsZFRyZWF0Q29jb2FUeXBlQXNGaWxlKGNvY29h VHlwZSkpCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgU3RyaW5nIHV0aVR5cGUgPSB1dGlU eXBlRnJvbUNvY29hVHlwZShjb2NvYVR5cGUpOwogICAgIGlmICghdXRpVHlwZS5pc0VtcHR5KCkp IHsKICAgICAgICAgcmVzdWx0VHlwZXMuYWRkKHV0aVR5cGUpOwpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0JKHJldmlzaW9uIDIyMjY5NCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCSh3b3JraW5nIGNv cHkpCkBAIC00OTQsNyArNDk0LDcgQEAgc3RhdGljIFN0cmluZyB1dGlUeXBlRnJvbUNvY29hVHlw ZShjb25zdAogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIAotdm9pZCBQYXN0ZWJvYXJkOjphZGRI VE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0 VHlwZXMsIGNvbnN0IFN0cmluZyYgY29jb2FUeXBlLCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmRO YW1lKQordm9pZCBQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUo TGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0VHlwZXMsIGNvbnN0IFN0cmluZyYgY29jb2FUeXBl KQogewogICAgIGlmIChjb2NvYVR5cGUgPT0gIk5lWFQgcGxhaW4gYXNjaWkgcGFzdGVib2FyZCB0 eXBlIikKICAgICAgICAgcmV0dXJuOyAvLyBTa2lwIHRoaXMgYW5jaWVudCB0eXBlIHRoYXQgZ2V0 cyBhdXRvLXN1cHBsaWVkIGJ5IHNvbWUgc3lzdGVtIGNvbnZlcnNpb24uCkBAIC01MDgsMjAgKzUw OCw4IEBAIHZvaWQgUGFzdGVib2FyZDo6YWRkSFRNTENsaXBib2FyZFR5cGVzRm8KICAgICAgICAg cmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgidGV4dC91cmktbGlzdCIpKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KLSAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhOU0ZpbGVuYW1lc1Bi b2FyZFR5cGUpKSB7Ci0gICAgICAgIC8vIElmIGZpbGUgbGlzdCBpcyBlbXB0eSwgYWRkIG5vdGhp bmcuCi0gICAgICAgIC8vIE5vdGUgdGhhdCB0aGVyZSBpcyBhIGNoYW5jZSB0aGF0IHRoZSBmaWxl IGxpc3QgY291bnQgY291bGQgaGF2ZSBjaGFuZ2VkIHNpbmNlIHdlIGdyYWJiZWQgdGhlIHR5cGVz IGFycmF5LgotICAgICAgICAvLyBIb3dldmVyLCB0aGlzIGlzIG5vdCByZWFsbHkgYW4gaXNzdWUg Zm9yIHVzIGRvaW5nIGEgc2FuaXR5IGNoZWNrIGhlcmUuCi0gICAgICAgIFZlY3RvcjxTdHJpbmc+ IGZpbGVMaXN0OwotICAgICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0 ZWd5KCktPmdldFBhdGhuYW1lc0ZvclR5cGUoZmlsZUxpc3QsIFN0cmluZyhOU0ZpbGVuYW1lc1Bi b2FyZFR5cGUpLCBwYXN0ZWJvYXJkTmFtZSk7Ci0gICAgICAgIGlmICghZmlsZUxpc3QuaXNFbXB0 eSgpKQotICAgICAgICAgICAgcmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgiRmlsZXMiKSk7 CisgICAgaWYgKGNvY29hVHlwZSA9PSBTdHJpbmcoTlNGaWxlbmFtZXNQYm9hcmRUeXBlKSB8fCBQ YXN0ZWJvYXJkOjpzaG91bGRUcmVhdENvY29hVHlwZUFzRmlsZShjb2NvYVR5cGUpKQogICAgICAg ICByZXR1cm47Ci0gICAgfQotICAgIGlmIChQYXN0ZWJvYXJkOjpzaG91bGRUcmVhdENvY29hVHlw ZUFzRmlsZShjb2NvYVR5cGUpKSB7Ci0gICAgICAgIHJlc3VsdFR5cGVzLmFkZChBU0NJSUxpdGVy YWwoIkZpbGVzIikpOwotICAgICAgICByZXR1cm47Ci0gICAgfQogICAgIFN0cmluZyB1dGlUeXBl ID0gdXRpVHlwZUZyb21Db2NvYVR5cGUoY29jb2FUeXBlKTsKICAgICBpZiAoIXV0aVR5cGUuaXNF bXB0eSgpKSB7CiAgICAgICAgIHJlc3VsdFR5cGVzLmFkZCh1dGlUeXBlKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vUGFzdGVib2FyZFdpbi5jcHAJKHJldmlzaW9uIDIy MjY5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9QYXN0ZWJvYXJkV2luLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjMxLDE2ICsyMzEsMTAgQEAgYm9vbCBQYXN0ZWJvYXJkOjpoYXNE YXRhKCkKIAogc3RhdGljIHZvaWQgYWRkTWltZVR5cGVzRm9yRm9ybWF0KExpc3RIYXNoU2V0PFN0 cmluZz4mIHJlc3VsdHMsIGNvbnN0IEZPUk1BVEVUQyYgZm9ybWF0KQogewotICAgIC8vIFVSTCBh bmQgVGV4dCBhcmUgcHJvdmlkZWQgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBJRSdzIG1vZGVsCi0g ICAgaWYgKGZvcm1hdC5jZkZvcm1hdCA9PSB1cmxGb3JtYXQoKS0+Y2ZGb3JtYXQgfHwgZm9ybWF0 LmNmRm9ybWF0ID09IHVybFdGb3JtYXQoKS0+Y2ZGb3JtYXQpIHsKLSAgICAgICAgcmVzdWx0cy5h ZGQoIlVSTCIpOworICAgIGlmIChmb3JtYXQuY2ZGb3JtYXQgPT0gdXJsRm9ybWF0KCktPmNmRm9y bWF0IHx8IGZvcm1hdC5jZkZvcm1hdCA9PSB1cmxXRm9ybWF0KCktPmNmRm9ybWF0KQogICAgICAg ICByZXN1bHRzLmFkZCgidGV4dC91cmktbGlzdCIpOwotICAgIH0KLQotICAgIGlmIChmb3JtYXQu Y2ZGb3JtYXQgPT0gcGxhaW5UZXh0V0Zvcm1hdCgpLT5jZkZvcm1hdCB8fCBmb3JtYXQuY2ZGb3Jt YXQgPT0gcGxhaW5UZXh0Rm9ybWF0KCktPmNmRm9ybWF0KSB7Ci0gICAgICAgIHJlc3VsdHMuYWRk KCJUZXh0Iik7CisgICAgaWYgKGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRXRm9ybWF0KCkt PmNmRm9ybWF0IHx8IGZvcm1hdC5jZkZvcm1hdCA9PSBwbGFpblRleHRGb3JtYXQoKS0+Y2ZGb3Jt YXQpCiAgICAgICAgIHJlc3VsdHMuYWRkKCJ0ZXh0L3BsYWluIik7Ci0gICAgfQogfQogCiBWZWN0 b3I8U3RyaW5nPiBQYXN0ZWJvYXJkOjp0eXBlc1NhZmVGb3JCaW5kaW5ncygpCg==