188957 2018-08-26 16:57:00 -0700 [Attachment Support] [WK2] Images copied from Mail message view paste with the wrong file name in compose 2018-10-01 13:56:11 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes bdakin commit-queue darin mitz thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1453739 0 wenson_hsieh 2018-08-26 16:57:00 -0700 The resulting file names of the _WKAttachments end up looking something like "6E69C86F-D0D3-4451-830F-E2C96FD063E0@scv.apple.com". 1453740 1 webkit-bug-importer 2018-08-26 17:03:35 -0700 <rdar://problem/43737715> 1453741 2 348105 wenson_hsieh 2018-08-26 17:13:17 -0700 Created attachment 348105 Depends on webkit.org/b/188903 1453775 3 348113 wenson_hsieh 2018-08-26 19:57:42 -0700 Created attachment 348113 Rebase on trunk 1453881 4 348113 darin 2018-08-27 08:36:26 -0700 Comment on attachment 348113 Rebase on trunk View in context: https://bugs.webkit.org/attachment.cgi?id=348113&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:1334 > + auto mainResource = adoptNS([[WebResource alloc] initWithData:markupData URL:[NSURL URLWithString:@"foo.html"] MIMEType:@"text/html" textEncodingName:@"utf-8" frameName:nil]); > + auto pngResource = adoptNS([[WebResource alloc] initWithData:testImageData() URL:[NSURL URLWithString:@"1.png"] MIMEType:@"image/png" textEncodingName:nil frameName:nil]); > + auto gifResource = adoptNS([[WebResource alloc] initWithData:testGIFData() URL:[NSURL URLWithString:@"2.gif"] MIMEType:@"image/gif" textEncodingName:nil frameName:nil]); > + auto archive = adoptNS([[WebArchive alloc] initWithMainResource:mainResource.get() subresources:@[ pngResource.get(), gifResource.get() ] subframeArchives:@[ ]]); We should start using ARC for our unit tests. 1453888 5 348113 wenson_hsieh 2018-08-27 08:50:55 -0700 Comment on attachment 348113 Rebase on trunk View in context: https://bugs.webkit.org/attachment.cgi?id=348113&action=review >> Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:1334 >> + auto archive = adoptNS([[WebArchive alloc] initWithMainResource:mainResource.get() subresources:@[ pngResource.get(), gifResource.get() ] subframeArchives:@[ ]]); > > We should start using ARC for our unit tests. Noted! I suppose a good first step towards this is to add bridging casts as needed (in fact, there are several places in this file that directly cast NSStrings to CFStringRefs and vice versa). I'll be fixing these as I go, in subsequent patches. 1453895 6 348148 wenson_hsieh 2018-08-27 09:07:20 -0700 Created attachment 348148 Patch for landing 1453929 7 348148 commit-queue 2018-08-27 09:45:31 -0700 Comment on attachment 348148 Patch for landing Clearing flags on attachment: 348148 Committed r235375: <https://trac.webkit.org/changeset/235375> 348105 2018-08-26 17:13:17 -0700 2018-08-26 19:57:41 -0700 Depends on webkit.org/b/188903 bug-188957-20180826171316.patch text/plain 6801 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzM4YTY4N2Q2YTI0ZWY0 NzUxMTM4MTI3ZWI2OTNlYTBlYmY3MjQ1My4uOGEyZjdlMDBmNjhhM2ZjMTUzYmE2MTkyYjNlYmQw NjM3MzcyNTQ1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA4LTI2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtBdHRhY2htZW50 IFN1cHBvcnRdIFtXSzJdIEltYWdlcyBjb3BpZWQgZnJvbSBNYWlsIG1lc3NhZ2UgdmlldyBwYXN0 ZSB3aXRoIHRoZSB3cm9uZyBmaWxlIG5hbWUgaW4gY29tcG9zZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4OTU3CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS80MzczNzcxNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBbGxvdyB0aGUgYWx0IGF0dHJpYnV0ZSBvZiBhIHBhc3RlZCBpbWFnZSBlbGVtZW50 IHRvIGRldGVybWluZSB0aGUgbmFtZSBvZiBhbiBpbWFnZSBhdHRhY2htZW50LCByYXRoZXIgdGhh bgorICAgICAgICB1c2luZyB0aGUgc291cmNlIFVSTCdzIGxhc3QgcGF0aCBjb21wb25lbnQgZmly c3QuIFRoaXMgaXMgYmVjYXVzZSBpbiBzb21lIGNsaWVudHMsIHN1Y2ggYXMgTWFpbCwgdGhlIHNv dXJjZSBvZgorICAgICAgICB0aGUgaW1hZ2UgZWxlbWVudCBpcyBzb21lIG5vbmRlc2NyaXB0IFVV SUQsIGFuZCB0aGUgYWx0IHRleHQgY29udGFpbnMgdGhlIHJlYWwgbmFtZSBvZiB0aGUgaW1hZ2Uu CisKKyAgICAgICAgVGVzdDogV0tBdHRhY2htZW50VGVzdHMuUGFzdGVXZWJBcmNoaXZlQ29udGFp bmluZ0ltYWdlcworCisgICAgICAgICogZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29j b2EubW06CisgICAgICAgIChXZWJDb3JlOjpyZXBsYWNlUmljaENvbnRlbnRXaXRoQXR0YWNobWVu dHMpOgorCiAyMDE4LTA4LTI1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgogCiAgICAgICAgIFtDb2NvYV0gRXhjZXB0aW9uIChmaWxlVHlwZSAnZHluLmFncTh1JyBpcyBu b3QgYSB2YWxpZCBVVEkpIHJhaXNlZCB3aGVuIGRyYWdnaW5nIGFuIGF0dGFjaG1lbnQgd2hvc2Ug ZmlsZSB3cmFwcGVyIGlzIGEgZGlyZWN0b3J5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvY29jb2EvV2ViQ29udGVudFJlYWRlckNvY29hLm1tCmluZGV4IGM4ODNhMjM2OWFkMzZm NzAxMmNiYzQ4NmNmYWQwYmMwMmIwNGM0M2MuLmU4ODUwODQzMDE5YjE3Njg5MGRhNjA2NWZhNWYw MDQzNGM0Njc4NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvV2Vi Q29udGVudFJlYWRlckNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2Ev V2ViQ29udGVudFJlYWRlckNvY29hLm1tCkBAIC0yODYsNyArMjg2LDkgQEAgc3RhdGljIHZvaWQg cmVwbGFjZVJpY2hDb250ZW50V2l0aEF0dGFjaG1lbnRzKEZyYW1lJiBmcmFtZSwgRG9jdW1lbnRG cmFnbWVudCYgZnIKICAgICAgICAgaWYgKHJlc291cmNlID09IHVybFRvUmVzb3VyY2VNYXAuZW5k KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBhdXRvIG5hbWUgPSBVUkxQYXJz ZXIgeyByZXNvdXJjZVVSTFN0cmluZyB9LnJlc3VsdCgpLmxhc3RQYXRoQ29tcG9uZW50KCk7Cisg ICAgICAgIGF1dG8gbmFtZSA9IGltYWdlLmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24o SFRNTE5hbWVzOjphbHRBdHRyKTsKKyAgICAgICAgaWYgKG5hbWUuaXNFbXB0eSgpKQorICAgICAg ICAgICAgbmFtZSA9IFVSTFBhcnNlciB7IHJlc291cmNlVVJMU3RyaW5nIH0ucmVzdWx0KCkubGFz dFBhdGhDb21wb25lbnQoKTsKICAgICAgICAgaWYgKG5hbWUuaXNFbXB0eSgpKQogICAgICAgICAg ICAgbmFtZSA9IEF0b21pY1N0cmluZygibWVkaWEiKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGNkOTJhNjU0OGVjNDQyYzRhYTQ5M2Y1NzI5 ZTcwYWIwYWQ4NTUwODYuLjJlNWNmMTQxNWQxM2FiOTlkMjQ0NjdhYTE3MDY2NzYzNzE1ZjNhODAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxOC0wOC0yNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxl LmNvbT4KKworICAgICAgICBbQXR0YWNobWVudCBTdXBwb3J0XSBbV0syXSBJbWFnZXMgY29waWVk IGZyb20gTWFpbCBtZXNzYWdlIHZpZXcgcGFzdGUgd2l0aCB0aGUgd3JvbmcgZmlsZSBuYW1lIGlu IGNvbXBvc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4ODk1NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDM3Mzc3MTU+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IEFQSSB0ZXN0IHRv IHZlcmlmeSB0aGF0IHBhc3RpbmcgYSB3ZWIgYXJjaGl2ZSBjb250YWluaW5nIHNldmVyYWwgaW1h Z2UgZWxlbWVudHMgd2l0aCBhbHQgYXR0cmlidXRlcworICAgICAgICBnZW5lcmF0ZXMgX1dLQXR0 YWNobWVudHMgd2hvc2UgbmFtZXMgcmVmbGVjdCB0aG9zZSBhbHQgYXR0cmlidXRlcy4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMu bW06CisgICAgICAgICh0ZXN0R0lGRmlsZVVSTCk6CisgICAgICAgICh0ZXN0R0lGRGF0YSk6Cisg ICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAxOC0wOC0yNSAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIEV4Y2VwdGlvbiAo ZmlsZVR5cGUgJ2R5bi5hZ3E4dScgaXMgbm90IGEgdmFsaWQgVVRJKSByYWlzZWQgd2hlbiBkcmFn Z2luZyBhbiBhdHRhY2htZW50IHdob3NlIGZpbGUgd3JhcHBlciBpcyBhIGRpcmVjdG9yeQpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1l bnRUZXN0cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRh Y2htZW50VGVzdHMubW0KaW5kZXggMWZlMGUyYzI2YWE0ZjFjN2RmODVhZDY3OWQxYTc5NThhNmVj ZGM4Yi4uYmQyZmM1ZjU0Njc4MGNiYmM3MDY2YzU1ZDA0ZjM3ZWI4YWMzMmRiOSAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0 cy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNo bWVudFRlc3RzLm1tCkBAIC0zMiw3ICszMiw3IEBACiAjaW1wb3J0ICJXS1dlYlZpZXdDb25maWd1 cmF0aW9uRXh0cmFzLmgiCiAjaW1wb3J0IDxXZWJLaXQvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUu aD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQcml2YXRlLmg+Ci0jaW1wb3J0IDxXZWJLaXQv V2ViS2l0Lmg+CisjaW1wb3J0IDxXZWJLaXQvV2ViQXJjaGl2ZS5oPgogI2ltcG9ydCA8V2ViS2l0 L1dlYktpdFByaXZhdGUuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIApAQCAtMTkzLDYg KzE5MywxNiBAQCBzdGF0aWMgTlNEYXRhICp0ZXN0SW1hZ2VEYXRhKCkKICAgICByZXR1cm4gW05T RGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZVUkw6dGVzdEltYWdlRmlsZVVSTCgpXTsKIH0KIAorc3Rh dGljIE5TVVJMICp0ZXN0R0lGRmlsZVVSTCgpCit7CisgICAgcmV0dXJuIFtbTlNCdW5kbGUgbWFp bkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJhcHBsZSIgd2l0aEV4dGVuc2lvbjpAImdpZiIgc3Vi ZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXTsKK30KKworc3RhdGljIE5TRGF0 YSAqdGVzdEdJRkRhdGEoKQoreworICAgIHJldHVybiBbTlNEYXRhIGRhdGFXaXRoQ29udGVudHNP ZlVSTDp0ZXN0R0lGRmlsZVVSTCgpXTsKK30KKwogc3RhdGljIE5TVVJMICp0ZXN0UERGRmlsZVVS TCgpCiB7CiAgICAgcmV0dXJuIFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6 QCJ0ZXN0IiB3aXRoRXh0ZW5zaW9uOkAicGRmIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJ LnJlc291cmNlcyJdOwpAQCAtMTMxNCw2ICsxMzI0LDQ2IEBAIFRFU1QoV0tBdHRhY2htZW50VGVz dHMsIE1vdmVBdHRhY2htZW50RWxlbWVudEFzSWNvbkJ5RHJhZ2dpbmcpCiAgICAgW3NpbXVsYXRv ciBlbmREYXRhVHJhbnNmZXJdOwogfQogCitURVNUKFdLQXR0YWNobWVudFRlc3RzLCBQYXN0ZVdl YkFyY2hpdmVDb250YWluaW5nSW1hZ2VzKQoreworICAgIE5TRGF0YSAqbWFya3VwRGF0YSA9IFtA IjxpbWcgc3JjPScxLnBuZycgYWx0PSdmb28nPjxkaXY+PGJyPjwvZGl2PjxpbWcgc3JjPScyLmdp ZicgYWx0PSdiYXInPiIgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddOwor CisgICAgYXV0byBtYWluUmVzb3VyY2UgPSBhZG9wdE5TKFtbV2ViUmVzb3VyY2UgYWxsb2NdIGlu aXRXaXRoRGF0YTptYXJrdXBEYXRhIFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImZvby5odG1s Il0gTUlNRVR5cGU6QCJ0ZXh0L2h0bWwiIHRleHRFbmNvZGluZ05hbWU6QCJ1dGYtOCIgZnJhbWVO YW1lOm5pbF0pOworICAgIGF1dG8gcG5nUmVzb3VyY2UgPSBhZG9wdE5TKFtbV2ViUmVzb3VyY2Ug YWxsb2NdIGluaXRXaXRoRGF0YTp0ZXN0SW1hZ2VEYXRhKCkgVVJMOltOU1VSTCBVUkxXaXRoU3Ry aW5nOkAiMS5wbmciXSBNSU1FVHlwZTpAImltYWdlL3BuZyIgdGV4dEVuY29kaW5nTmFtZTpuaWwg ZnJhbWVOYW1lOm5pbF0pOworICAgIGF1dG8gZ2lmUmVzb3VyY2UgPSBhZG9wdE5TKFtbV2ViUmVz b3VyY2UgYWxsb2NdIGluaXRXaXRoRGF0YTp0ZXN0R0lGRGF0YSgpIFVSTDpbTlNVUkwgVVJMV2l0 aFN0cmluZzpAIjIuZ2lmIl0gTUlNRVR5cGU6QCJpbWFnZS9naWYiIHRleHRFbmNvZGluZ05hbWU6 bmlsIGZyYW1lTmFtZTpuaWxdKTsKKyAgICBhdXRvIGFyY2hpdmUgPSBhZG9wdE5TKFtbV2ViQXJj aGl2ZSBhbGxvY10gaW5pdFdpdGhNYWluUmVzb3VyY2U6bWFpblJlc291cmNlLmdldCgpIHN1YnJl c291cmNlczpAWyBwbmdSZXNvdXJjZS5nZXQoKSwgZ2lmUmVzb3VyY2UuZ2V0KCkgXSBzdWJmcmFt ZUFyY2hpdmVzOkBbIF1dKTsKKworI2lmIFBMQVRGT1JNKE1BQykKKyAgICBOU1Bhc3RlYm9hcmQg KnBhc3RlYm9hcmQgPSBbTlNQYXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXTsKKyAgICBbcGFz dGVib2FyZCBkZWNsYXJlVHlwZXM6QFtXZWJBcmNoaXZlUGJvYXJkVHlwZV0gb3duZXI6bmlsXTsK KyAgICBbcGFzdGVib2FyZCBzZXREYXRhOlthcmNoaXZlIGRhdGFdIGZvclR5cGU6V2ViQXJjaGl2 ZVBib2FyZFR5cGVdOworI2Vsc2UKKyAgICBVSVBhc3RlYm9hcmQgKnBhc3RlYm9hcmQgPSBbVUlQ YXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXTsKKyAgICBbcGFzdGVib2FyZCBzZXREYXRhOlth cmNoaXZlIGRhdGFdIGZvclBhc3RlYm9hcmRUeXBlOldlYkFyY2hpdmVQYm9hcmRUeXBlXTsKKyNl bmRpZgorCisgICAgUmV0YWluUHRyPF9XS0F0dGFjaG1lbnQ+IGdpZkF0dGFjaG1lbnQ7CisgICAg UmV0YWluUHRyPF9XS0F0dGFjaG1lbnQ+IHBuZ0F0dGFjaG1lbnQ7CisgICAgYXV0byB3ZWJWaWV3 ID0gd2ViVmlld0ZvclRlc3RpbmdBdHRhY2htZW50cygpOworCisgICAgT2JzZXJ2ZUF0dGFjaG1l bnRVcGRhdGVzRm9yU2NvcGUgb2JzZXJ2ZXIod2ViVmlldy5nZXQoKSk7CisgICAgW3dlYlZpZXcg X3N5bmNocm9ub3VzbHlFeGVjdXRlRWRpdENvbW1hbmQ6QCJQYXN0ZSIgYXJndW1lbnQ6bmlsXTsK KyAgICBbd2ViVmlldyBleHBlY3RFbGVtZW50Q291bnQ6MiB0YWdOYW1lOkAiSU1HIl07CisKKyAg ICBmb3IgKF9XS0F0dGFjaG1lbnQgKmF0dGFjaG1lbnQgaW4gb2JzZXJ2ZXIub2JzZXJ2ZXIoKS5p bnNlcnRlZCkgeworICAgICAgICBpZiAoW2F0dGFjaG1lbnQuaW5mby5jb250ZW50VHlwZSBpc0Vx dWFsVG9TdHJpbmc6QCJpbWFnZS9wbmciXSkKKyAgICAgICAgICAgIHBuZ0F0dGFjaG1lbnQgPSBh dHRhY2htZW50OworICAgICAgICBlbHNlIGlmIChbYXR0YWNobWVudC5pbmZvLmNvbnRlbnRUeXBl IGlzRXF1YWxUb1N0cmluZzpAImltYWdlL2dpZiJdKQorICAgICAgICAgICAgZ2lmQXR0YWNobWVu dCA9IGF0dGFjaG1lbnQ7CisgICAgfQorCisgICAgRVhQRUNUX1dLX1NUUkVRKCJmb28iLCBbcG5n QXR0YWNobWVudCBpbmZvXS5uYW1lKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoImJhciIsIFtnaWZB dHRhY2htZW50IGluZm9dLm5hbWUpOworICAgIFtwbmdBdHRhY2htZW50IGV4cGVjdFJlcXVlc3Rl ZERhdGFUb0JlOnRlc3RJbWFnZURhdGEoKV07CisgICAgW2dpZkF0dGFjaG1lbnQgZXhwZWN0UmVx dWVzdGVkRGF0YVRvQmU6dGVzdEdJRkRhdGEoKV07CisgICAgb2JzZXJ2ZXIuZXhwZWN0QXR0YWNo bWVudFVwZGF0ZXMoQFsgXSwgQFsgcG5nQXR0YWNobWVudC5nZXQoKSwgZ2lmQXR0YWNobWVudC5n ZXQoKSBdKTsKK30KKwogI3ByYWdtYSBtYXJrIC0gUGxhdGZvcm0tc3BlY2lmaWMgdGVzdHMKIAog I2lmIFBMQVRGT1JNKE1BQykK 348113 2018-08-26 19:57:42 -0700 2018-08-27 08:51:42 -0700 Rebase on trunk bug-188957-20180826195741.patch text/plain 6801 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTMyN2Y5OTdhZDg3NTE3 YzczZTY5ODdkYzFlYWYwZjY0OWI0OGUxOS4uNWM4NWUyMjQ0OGMwYzgxM2QzY2Q5ZTFjNzNkOTU1 N2YwMTQzZjUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA4LTI2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtBdHRhY2htZW50 IFN1cHBvcnRdIFtXSzJdIEltYWdlcyBjb3BpZWQgZnJvbSBNYWlsIG1lc3NhZ2UgdmlldyBwYXN0 ZSB3aXRoIHRoZSB3cm9uZyBmaWxlIG5hbWUgaW4gY29tcG9zZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4OTU3CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS80MzczNzcxNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBbGxvdyB0aGUgYWx0IGF0dHJpYnV0ZSBvZiBhIHBhc3RlZCBpbWFnZSBlbGVtZW50 IHRvIGRldGVybWluZSB0aGUgbmFtZSBvZiBhbiBpbWFnZSBhdHRhY2htZW50LCByYXRoZXIgdGhh bgorICAgICAgICB1c2luZyB0aGUgc291cmNlIFVSTCdzIGxhc3QgcGF0aCBjb21wb25lbnQgZmly c3QuIFRoaXMgaXMgYmVjYXVzZSBpbiBzb21lIGNsaWVudHMsIHN1Y2ggYXMgTWFpbCwgdGhlIHNv dXJjZSBvZgorICAgICAgICB0aGUgaW1hZ2UgZWxlbWVudCBpcyBzb21lIG5vbmRlc2NyaXB0IFVV SUQsIGFuZCB0aGUgYWx0IHRleHQgY29udGFpbnMgdGhlIHJlYWwgbmFtZSBvZiB0aGUgaW1hZ2Uu CisKKyAgICAgICAgVGVzdDogV0tBdHRhY2htZW50VGVzdHMuUGFzdGVXZWJBcmNoaXZlQ29udGFp bmluZ0ltYWdlcworCisgICAgICAgICogZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29j b2EubW06CisgICAgICAgIChXZWJDb3JlOjpyZXBsYWNlUmljaENvbnRlbnRXaXRoQXR0YWNobWVu dHMpOgorCiAyMDE4LTA4LTI2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgogCiAgICAgICAgIFtDb2NvYV0gRXhjZXB0aW9uIChmaWxlVHlwZSAnZHluLmFncTh1JyBpcyBu b3QgYSB2YWxpZCBVVEkpIHJhaXNlZCB3aGVuIGRyYWdnaW5nIGFuIGF0dGFjaG1lbnQgd2hvc2Ug ZmlsZSB3cmFwcGVyIGlzIGEgZGlyZWN0b3J5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvY29jb2EvV2ViQ29udGVudFJlYWRlckNvY29hLm1tCmluZGV4IGM4ODNhMjM2OWFkMzZm NzAxMmNiYzQ4NmNmYWQwYmMwMmIwNGM0M2MuLmU4ODUwODQzMDE5YjE3Njg5MGRhNjA2NWZhNWYw MDQzNGM0Njc4NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvV2Vi Q29udGVudFJlYWRlckNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2Ev V2ViQ29udGVudFJlYWRlckNvY29hLm1tCkBAIC0yODYsNyArMjg2LDkgQEAgc3RhdGljIHZvaWQg cmVwbGFjZVJpY2hDb250ZW50V2l0aEF0dGFjaG1lbnRzKEZyYW1lJiBmcmFtZSwgRG9jdW1lbnRG cmFnbWVudCYgZnIKICAgICAgICAgaWYgKHJlc291cmNlID09IHVybFRvUmVzb3VyY2VNYXAuZW5k KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBhdXRvIG5hbWUgPSBVUkxQYXJz ZXIgeyByZXNvdXJjZVVSTFN0cmluZyB9LnJlc3VsdCgpLmxhc3RQYXRoQ29tcG9uZW50KCk7Cisg ICAgICAgIGF1dG8gbmFtZSA9IGltYWdlLmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24o SFRNTE5hbWVzOjphbHRBdHRyKTsKKyAgICAgICAgaWYgKG5hbWUuaXNFbXB0eSgpKQorICAgICAg ICAgICAgbmFtZSA9IFVSTFBhcnNlciB7IHJlc291cmNlVVJMU3RyaW5nIH0ucmVzdWx0KCkubGFz dFBhdGhDb21wb25lbnQoKTsKICAgICAgICAgaWYgKG5hbWUuaXNFbXB0eSgpKQogICAgICAgICAg ICAgbmFtZSA9IEF0b21pY1N0cmluZygibWVkaWEiKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGZmOGQ4MmVmMDUzZTczMmEzNDg0Njc4N2Mx NTg2ODc4YTc0NTRkZWMuLjVjMmRiYzA2OTRjZGU2NzMxYWUwY2YzMTg5YTlkNzFjZDE4ODAyY2Yg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxOC0wOC0yNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxl LmNvbT4KKworICAgICAgICBbQXR0YWNobWVudCBTdXBwb3J0XSBbV0syXSBJbWFnZXMgY29waWVk IGZyb20gTWFpbCBtZXNzYWdlIHZpZXcgcGFzdGUgd2l0aCB0aGUgd3JvbmcgZmlsZSBuYW1lIGlu IGNvbXBvc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4ODk1NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDM3Mzc3MTU+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IEFQSSB0ZXN0IHRv IHZlcmlmeSB0aGF0IHBhc3RpbmcgYSB3ZWIgYXJjaGl2ZSBjb250YWluaW5nIHNldmVyYWwgaW1h Z2UgZWxlbWVudHMgd2l0aCBhbHQgYXR0cmlidXRlcworICAgICAgICBnZW5lcmF0ZXMgX1dLQXR0 YWNobWVudHMgd2hvc2UgbmFtZXMgcmVmbGVjdCB0aG9zZSBhbHQgYXR0cmlidXRlcy4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMu bW06CisgICAgICAgICh0ZXN0R0lGRmlsZVVSTCk6CisgICAgICAgICh0ZXN0R0lGRGF0YSk6Cisg ICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAxOC0wOC0yNiAgV2Vuc29uIEhzaWVo ICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIEV4Y2VwdGlvbiAo ZmlsZVR5cGUgJ2R5bi5hZ3E4dScgaXMgbm90IGEgdmFsaWQgVVRJKSByYWlzZWQgd2hlbiBkcmFn Z2luZyBhbiBhdHRhY2htZW50IHdob3NlIGZpbGUgd3JhcHBlciBpcyBhIGRpcmVjdG9yeQpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1l bnRUZXN0cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRh Y2htZW50VGVzdHMubW0KaW5kZXggMWZlMGUyYzI2YWE0ZjFjN2RmODVhZDY3OWQxYTc5NThhNmVj ZGM4Yi4uYmQyZmM1ZjU0Njc4MGNiYmM3MDY2YzU1ZDA0ZjM3ZWI4YWMzMmRiOSAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0 cy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNo bWVudFRlc3RzLm1tCkBAIC0zMiw3ICszMiw3IEBACiAjaW1wb3J0ICJXS1dlYlZpZXdDb25maWd1 cmF0aW9uRXh0cmFzLmgiCiAjaW1wb3J0IDxXZWJLaXQvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUu aD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQcml2YXRlLmg+Ci0jaW1wb3J0IDxXZWJLaXQv V2ViS2l0Lmg+CisjaW1wb3J0IDxXZWJLaXQvV2ViQXJjaGl2ZS5oPgogI2ltcG9ydCA8V2ViS2l0 L1dlYktpdFByaXZhdGUuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIApAQCAtMTkzLDYg KzE5MywxNiBAQCBzdGF0aWMgTlNEYXRhICp0ZXN0SW1hZ2VEYXRhKCkKICAgICByZXR1cm4gW05T RGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZVUkw6dGVzdEltYWdlRmlsZVVSTCgpXTsKIH0KIAorc3Rh dGljIE5TVVJMICp0ZXN0R0lGRmlsZVVSTCgpCit7CisgICAgcmV0dXJuIFtbTlNCdW5kbGUgbWFp bkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJhcHBsZSIgd2l0aEV4dGVuc2lvbjpAImdpZiIgc3Vi ZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXTsKK30KKworc3RhdGljIE5TRGF0 YSAqdGVzdEdJRkRhdGEoKQoreworICAgIHJldHVybiBbTlNEYXRhIGRhdGFXaXRoQ29udGVudHNP ZlVSTDp0ZXN0R0lGRmlsZVVSTCgpXTsKK30KKwogc3RhdGljIE5TVVJMICp0ZXN0UERGRmlsZVVS TCgpCiB7CiAgICAgcmV0dXJuIFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6 QCJ0ZXN0IiB3aXRoRXh0ZW5zaW9uOkAicGRmIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJ LnJlc291cmNlcyJdOwpAQCAtMTMxNCw2ICsxMzI0LDQ2IEBAIFRFU1QoV0tBdHRhY2htZW50VGVz dHMsIE1vdmVBdHRhY2htZW50RWxlbWVudEFzSWNvbkJ5RHJhZ2dpbmcpCiAgICAgW3NpbXVsYXRv ciBlbmREYXRhVHJhbnNmZXJdOwogfQogCitURVNUKFdLQXR0YWNobWVudFRlc3RzLCBQYXN0ZVdl YkFyY2hpdmVDb250YWluaW5nSW1hZ2VzKQoreworICAgIE5TRGF0YSAqbWFya3VwRGF0YSA9IFtA IjxpbWcgc3JjPScxLnBuZycgYWx0PSdmb28nPjxkaXY+PGJyPjwvZGl2PjxpbWcgc3JjPScyLmdp ZicgYWx0PSdiYXInPiIgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddOwor CisgICAgYXV0byBtYWluUmVzb3VyY2UgPSBhZG9wdE5TKFtbV2ViUmVzb3VyY2UgYWxsb2NdIGlu aXRXaXRoRGF0YTptYXJrdXBEYXRhIFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImZvby5odG1s Il0gTUlNRVR5cGU6QCJ0ZXh0L2h0bWwiIHRleHRFbmNvZGluZ05hbWU6QCJ1dGYtOCIgZnJhbWVO YW1lOm5pbF0pOworICAgIGF1dG8gcG5nUmVzb3VyY2UgPSBhZG9wdE5TKFtbV2ViUmVzb3VyY2Ug YWxsb2NdIGluaXRXaXRoRGF0YTp0ZXN0SW1hZ2VEYXRhKCkgVVJMOltOU1VSTCBVUkxXaXRoU3Ry aW5nOkAiMS5wbmciXSBNSU1FVHlwZTpAImltYWdlL3BuZyIgdGV4dEVuY29kaW5nTmFtZTpuaWwg ZnJhbWVOYW1lOm5pbF0pOworICAgIGF1dG8gZ2lmUmVzb3VyY2UgPSBhZG9wdE5TKFtbV2ViUmVz b3VyY2UgYWxsb2NdIGluaXRXaXRoRGF0YTp0ZXN0R0lGRGF0YSgpIFVSTDpbTlNVUkwgVVJMV2l0 aFN0cmluZzpAIjIuZ2lmIl0gTUlNRVR5cGU6QCJpbWFnZS9naWYiIHRleHRFbmNvZGluZ05hbWU6 bmlsIGZyYW1lTmFtZTpuaWxdKTsKKyAgICBhdXRvIGFyY2hpdmUgPSBhZG9wdE5TKFtbV2ViQXJj aGl2ZSBhbGxvY10gaW5pdFdpdGhNYWluUmVzb3VyY2U6bWFpblJlc291cmNlLmdldCgpIHN1YnJl c291cmNlczpAWyBwbmdSZXNvdXJjZS5nZXQoKSwgZ2lmUmVzb3VyY2UuZ2V0KCkgXSBzdWJmcmFt ZUFyY2hpdmVzOkBbIF1dKTsKKworI2lmIFBMQVRGT1JNKE1BQykKKyAgICBOU1Bhc3RlYm9hcmQg KnBhc3RlYm9hcmQgPSBbTlNQYXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXTsKKyAgICBbcGFz dGVib2FyZCBkZWNsYXJlVHlwZXM6QFtXZWJBcmNoaXZlUGJvYXJkVHlwZV0gb3duZXI6bmlsXTsK KyAgICBbcGFzdGVib2FyZCBzZXREYXRhOlthcmNoaXZlIGRhdGFdIGZvclR5cGU6V2ViQXJjaGl2 ZVBib2FyZFR5cGVdOworI2Vsc2UKKyAgICBVSVBhc3RlYm9hcmQgKnBhc3RlYm9hcmQgPSBbVUlQ YXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXTsKKyAgICBbcGFzdGVib2FyZCBzZXREYXRhOlth cmNoaXZlIGRhdGFdIGZvclBhc3RlYm9hcmRUeXBlOldlYkFyY2hpdmVQYm9hcmRUeXBlXTsKKyNl bmRpZgorCisgICAgUmV0YWluUHRyPF9XS0F0dGFjaG1lbnQ+IGdpZkF0dGFjaG1lbnQ7CisgICAg UmV0YWluUHRyPF9XS0F0dGFjaG1lbnQ+IHBuZ0F0dGFjaG1lbnQ7CisgICAgYXV0byB3ZWJWaWV3 ID0gd2ViVmlld0ZvclRlc3RpbmdBdHRhY2htZW50cygpOworCisgICAgT2JzZXJ2ZUF0dGFjaG1l bnRVcGRhdGVzRm9yU2NvcGUgb2JzZXJ2ZXIod2ViVmlldy5nZXQoKSk7CisgICAgW3dlYlZpZXcg X3N5bmNocm9ub3VzbHlFeGVjdXRlRWRpdENvbW1hbmQ6QCJQYXN0ZSIgYXJndW1lbnQ6bmlsXTsK KyAgICBbd2ViVmlldyBleHBlY3RFbGVtZW50Q291bnQ6MiB0YWdOYW1lOkAiSU1HIl07CisKKyAg ICBmb3IgKF9XS0F0dGFjaG1lbnQgKmF0dGFjaG1lbnQgaW4gb2JzZXJ2ZXIub2JzZXJ2ZXIoKS5p bnNlcnRlZCkgeworICAgICAgICBpZiAoW2F0dGFjaG1lbnQuaW5mby5jb250ZW50VHlwZSBpc0Vx dWFsVG9TdHJpbmc6QCJpbWFnZS9wbmciXSkKKyAgICAgICAgICAgIHBuZ0F0dGFjaG1lbnQgPSBh dHRhY2htZW50OworICAgICAgICBlbHNlIGlmIChbYXR0YWNobWVudC5pbmZvLmNvbnRlbnRUeXBl IGlzRXF1YWxUb1N0cmluZzpAImltYWdlL2dpZiJdKQorICAgICAgICAgICAgZ2lmQXR0YWNobWVu dCA9IGF0dGFjaG1lbnQ7CisgICAgfQorCisgICAgRVhQRUNUX1dLX1NUUkVRKCJmb28iLCBbcG5n QXR0YWNobWVudCBpbmZvXS5uYW1lKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoImJhciIsIFtnaWZB dHRhY2htZW50IGluZm9dLm5hbWUpOworICAgIFtwbmdBdHRhY2htZW50IGV4cGVjdFJlcXVlc3Rl ZERhdGFUb0JlOnRlc3RJbWFnZURhdGEoKV07CisgICAgW2dpZkF0dGFjaG1lbnQgZXhwZWN0UmVx dWVzdGVkRGF0YVRvQmU6dGVzdEdJRkRhdGEoKV07CisgICAgb2JzZXJ2ZXIuZXhwZWN0QXR0YWNo bWVudFVwZGF0ZXMoQFsgXSwgQFsgcG5nQXR0YWNobWVudC5nZXQoKSwgZ2lmQXR0YWNobWVudC5n ZXQoKSBdKTsKK30KKwogI3ByYWdtYSBtYXJrIC0gUGxhdGZvcm0tc3BlY2lmaWMgdGVzdHMKIAog I2lmIFBMQVRGT1JNKE1BQykK 348148 2018-08-27 09:07:20 -0700 2018-08-27 09:45:31 -0700 Patch for landing bug-188957-20180827090719.patch text/plain 6806 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTVmMDIzNjMzNjdkYmE0 NTczOWVjZDdiYjIxZGUzMzQ1MTY4ODEyMy4uMTBlNTM3NDAyMDJlOTkzY2FmMjYwNWNmMWZiODA5 YmM5MzE1NTk5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA4LTI3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtBdHRhY2htZW50 IFN1cHBvcnRdIFtXSzJdIEltYWdlcyBjb3BpZWQgZnJvbSBNYWlsIG1lc3NhZ2UgdmlldyBwYXN0 ZSB3aXRoIHRoZSB3cm9uZyBmaWxlIG5hbWUgaW4gY29tcG9zZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4OTU3CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS80MzczNzcxNT4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAg ICAgICBBbGxvdyB0aGUgYWx0IGF0dHJpYnV0ZSBvZiBhIHBhc3RlZCBpbWFnZSBlbGVtZW50IHRv IGRldGVybWluZSB0aGUgbmFtZSBvZiBhbiBpbWFnZSBhdHRhY2htZW50LCByYXRoZXIgdGhhbgor ICAgICAgICB1c2luZyB0aGUgc291cmNlIFVSTCdzIGxhc3QgcGF0aCBjb21wb25lbnQgZmlyc3Qu IFRoaXMgaXMgYmVjYXVzZSBpbiBzb21lIGNsaWVudHMsIHN1Y2ggYXMgTWFpbCwgdGhlIHNvdXJj ZSBvZgorICAgICAgICB0aGUgaW1hZ2UgZWxlbWVudCBpcyBzb21lIG5vbmRlc2NyaXB0IFVVSUQs IGFuZCB0aGUgYWx0IHRleHQgY29udGFpbnMgdGhlIHJlYWwgbmFtZSBvZiB0aGUgaW1hZ2UuCisK KyAgICAgICAgVGVzdDogV0tBdHRhY2htZW50VGVzdHMuUGFzdGVXZWJBcmNoaXZlQ29udGFpbmlu Z0ltYWdlcworCisgICAgICAgICogZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2Eu bW06CisgICAgICAgIChXZWJDb3JlOjpyZXBsYWNlUmljaENvbnRlbnRXaXRoQXR0YWNobWVudHMp OgorCiAyMDE4LTA4LTI2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAg ICAgICBNYWtlIElEQkN1cnNvcjo6bV9yZXF1ZXN0IGEgV2Vha1B0cgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQppbmRleCAx YzkxMzUxYjczYWY0N2Y5NzFiOWNlMTc0MzRjOGQ1NmI0NWE0MGQ0Li42MTA5YzM4MTVhMDc1ZjNm OTEzODAwODA4ZTM4MGQyZmNjOGRlMWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQpAQCAtMjg2LDcgKzI4Niw5IEBA IHN0YXRpYyB2b2lkIHJlcGxhY2VSaWNoQ29udGVudFdpdGhBdHRhY2htZW50cyhGcmFtZSYgZnJh bWUsIERvY3VtZW50RnJhZ21lbnQmIGZyCiAgICAgICAgIGlmIChyZXNvdXJjZSA9PSB1cmxUb1Jl c291cmNlTWFwLmVuZCgpKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgYXV0byBu YW1lID0gVVJMUGFyc2VyIHsgcmVzb3VyY2VVUkxTdHJpbmcgfS5yZXN1bHQoKS5sYXN0UGF0aENv bXBvbmVudCgpOworICAgICAgICBhdXRvIG5hbWUgPSBpbWFnZS5hdHRyaWJ1dGVXaXRob3V0U3lu Y2hyb25pemF0aW9uKEhUTUxOYW1lczo6YWx0QXR0cik7CisgICAgICAgIGlmIChuYW1lLmlzRW1w dHkoKSkKKyAgICAgICAgICAgIG5hbWUgPSBVUkxQYXJzZXIgeyByZXNvdXJjZVVSTFN0cmluZyB9 LnJlc3VsdCgpLmxhc3RQYXRoQ29tcG9uZW50KCk7CiAgICAgICAgIGlmIChuYW1lLmlzRW1wdHko KSkKICAgICAgICAgICAgIG5hbWUgPSBBdG9taWNTdHJpbmcoIm1lZGlhIik7CiAKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2M2E4NzVjYzU4MDJi YmZjMmQ3YjYxMjc1OGJjZWMyZjdiN2MxNzkyLi45NWJiYTBjYzM0OTQyNjZjNjQwZDM1M2VhNTVh ZTg3M2Q4ZTgyZWM1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDgtMjcgIFdlbnNvbiBIc2llaCAgPHdlbnNv bl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW0F0dGFjaG1lbnQgU3VwcG9ydF0gW1dLMl0g SW1hZ2VzIGNvcGllZCBmcm9tIE1haWwgbWVzc2FnZSB2aWV3IHBhc3RlIHdpdGggdGhlIHdyb25n IGZpbGUgbmFtZSBpbiBjb21wb3NlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODg5NTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQzNzM3NzE1Pgor CisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIEFkZCBhIG5ldyBB UEkgdGVzdCB0byB2ZXJpZnkgdGhhdCBwYXN0aW5nIGEgd2ViIGFyY2hpdmUgY29udGFpbmluZyBz ZXZlcmFsIGltYWdlIGVsZW1lbnRzIHdpdGggYWx0IGF0dHJpYnV0ZXMKKyAgICAgICAgZ2VuZXJh dGVzIF9XS0F0dGFjaG1lbnRzIHdob3NlIG5hbWVzIHJlZmxlY3QgdGhvc2UgYWx0IGF0dHJpYnV0 ZXMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNo bWVudFRlc3RzLm1tOgorICAgICAgICAodGVzdEdJRkZpbGVVUkwpOgorICAgICAgICAodGVzdEdJ RkRhdGEpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMTgtMDgtMjYgIFNh bSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVc2luZyBfV0tSZW1vdGVPYmpl Y3RJbnRlcmZhY2Ugd2l0aCBhIHByb3RvY29sIHRoYXQgaW5oZXJpdHMgZnJvbSBhIG5vbi1OU09i amVjdCBwcm90b2NvbCBjcmFzaGVzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1dLQXR0YWNobWVudFRlc3RzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbQppbmRleCBkZDI2ODc5NDFm ODYzNjMyZjExNWZmMjljNWZiMjk3Y2QyMzAzOWM4Li4zZjFlN2U2ODQyZTczNDEzNGI4ZTQwZWI2 OGI0NzJkYjM4M2ViZjg1IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1dLQXR0YWNobWVudFRlc3RzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0KQEAgLTMyLDcgKzMyLDcgQEAK ICNpbXBvcnQgIldLV2ViVmlld0NvbmZpZ3VyYXRpb25FeHRyYXMuaCIKICNpbXBvcnQgPFdlYktp dC9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2ViVmlld1By aXZhdGUuaD4KLSNpbXBvcnQgPFdlYktpdC9XZWJLaXQuaD4KKyNpbXBvcnQgPFdlYktpdC9XZWJB cmNoaXZlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViS2l0UHJpdmF0ZS5oPgogI2ltcG9ydCA8d3Rm L1JldGFpblB0ci5oPgogCkBAIC0xOTMsNiArMTkzLDE2IEBAIHN0YXRpYyBOU0RhdGEgKnRlc3RJ bWFnZURhdGEoKQogICAgIHJldHVybiBbTlNEYXRhIGRhdGFXaXRoQ29udGVudHNPZlVSTDp0ZXN0 SW1hZ2VGaWxlVVJMKCldOwogfQogCitzdGF0aWMgTlNVUkwgKnRlc3RHSUZGaWxlVVJMKCkKK3sK KyAgICByZXR1cm4gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImFwcGxl IiB3aXRoRXh0ZW5zaW9uOkAiZ2lmIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291 cmNlcyJdOworfQorCitzdGF0aWMgTlNEYXRhICp0ZXN0R0lGRGF0YSgpCit7CisgICAgcmV0dXJu IFtOU0RhdGEgZGF0YVdpdGhDb250ZW50c09mVVJMOnRlc3RHSUZGaWxlVVJMKCldOworfQorCiBz dGF0aWMgTlNVUkwgKnRlc3RQREZGaWxlVVJMKCkKIHsKICAgICByZXR1cm4gW1tOU0J1bmRsZSBt YWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAInRlc3QiIHdpdGhFeHRlbnNpb246QCJwZGYiIHN1 YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl07CkBAIC0xMjAyLDYgKzEyMTIs NDYgQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgTW92ZUF0dGFjaG1lbnRFbGVtZW50QXNJY29u QnlEcmFnZ2luZykKICAgICBbc2ltdWxhdG9yIGVuZERhdGFUcmFuc2Zlcl07CiB9CiAKK1RFU1Qo V0tBdHRhY2htZW50VGVzdHMsIFBhc3RlV2ViQXJjaGl2ZUNvbnRhaW5pbmdJbWFnZXMpCit7Cisg ICAgTlNEYXRhICptYXJrdXBEYXRhID0gW0AiPGltZyBzcmM9JzEucG5nJyBhbHQ9J2Zvbyc+PGRp dj48YnI+PC9kaXY+PGltZyBzcmM9JzIuZ2lmJyBhbHQ9J2Jhcic+IiBkYXRhVXNpbmdFbmNvZGlu ZzpOU1VURjhTdHJpbmdFbmNvZGluZ107CisKKyAgICBhdXRvIG1haW5SZXNvdXJjZSA9IGFkb3B0 TlMoW1tXZWJSZXNvdXJjZSBhbGxvY10gaW5pdFdpdGhEYXRhOm1hcmt1cERhdGEgVVJMOltOU1VS TCBVUkxXaXRoU3RyaW5nOkAiZm9vLmh0bWwiXSBNSU1FVHlwZTpAInRleHQvaHRtbCIgdGV4dEVu Y29kaW5nTmFtZTpAInV0Zi04IiBmcmFtZU5hbWU6bmlsXSk7CisgICAgYXV0byBwbmdSZXNvdXJj ZSA9IGFkb3B0TlMoW1tXZWJSZXNvdXJjZSBhbGxvY10gaW5pdFdpdGhEYXRhOnRlc3RJbWFnZURh dGEoKSBVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCIxLnBuZyJdIE1JTUVUeXBlOkAiaW1hZ2Uv cG5nIiB0ZXh0RW5jb2RpbmdOYW1lOm5pbCBmcmFtZU5hbWU6bmlsXSk7CisgICAgYXV0byBnaWZS ZXNvdXJjZSA9IGFkb3B0TlMoW1tXZWJSZXNvdXJjZSBhbGxvY10gaW5pdFdpdGhEYXRhOnRlc3RH SUZEYXRhKCkgVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiMi5naWYiXSBNSU1FVHlwZTpAImlt YWdlL2dpZiIgdGV4dEVuY29kaW5nTmFtZTpuaWwgZnJhbWVOYW1lOm5pbF0pOworICAgIGF1dG8g YXJjaGl2ZSA9IGFkb3B0TlMoW1tXZWJBcmNoaXZlIGFsbG9jXSBpbml0V2l0aE1haW5SZXNvdXJj ZTooX19icmlkZ2UgV2ViUmVzb3VyY2UgKiltYWluUmVzb3VyY2UuZ2V0KCkgc3VicmVzb3VyY2Vz OkBbIChfX2JyaWRnZSBXZWJSZXNvdXJjZSAqKXBuZ1Jlc291cmNlLmdldCgpLCAoX19icmlkZ2Ug V2ViUmVzb3VyY2UgKilnaWZSZXNvdXJjZS5nZXQoKSBdIHN1YmZyYW1lQXJjaGl2ZXM6QFsgXV0p OworCisjaWYgUExBVEZPUk0oTUFDKQorICAgIE5TUGFzdGVib2FyZCAqcGFzdGVib2FyZCA9IFtO U1Bhc3RlYm9hcmQgZ2VuZXJhbFBhc3RlYm9hcmRdOworICAgIFtwYXN0ZWJvYXJkIGRlY2xhcmVU eXBlczpAW1dlYkFyY2hpdmVQYm9hcmRUeXBlXSBvd25lcjpuaWxdOworICAgIFtwYXN0ZWJvYXJk IHNldERhdGE6W2FyY2hpdmUgZGF0YV0gZm9yVHlwZTpXZWJBcmNoaXZlUGJvYXJkVHlwZV07Cisj ZWxzZQorICAgIFVJUGFzdGVib2FyZCAqcGFzdGVib2FyZCA9IFtVSVBhc3RlYm9hcmQgZ2VuZXJh bFBhc3RlYm9hcmRdOworICAgIFtwYXN0ZWJvYXJkIHNldERhdGE6W2FyY2hpdmUgZGF0YV0gZm9y UGFzdGVib2FyZFR5cGU6V2ViQXJjaGl2ZVBib2FyZFR5cGVdOworI2VuZGlmCisKKyAgICBSZXRh aW5QdHI8X1dLQXR0YWNobWVudD4gZ2lmQXR0YWNobWVudDsKKyAgICBSZXRhaW5QdHI8X1dLQXR0 YWNobWVudD4gcG5nQXR0YWNobWVudDsKKyAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3Rm9yVGVz dGluZ0F0dGFjaG1lbnRzKCk7CisKKyAgICBPYnNlcnZlQXR0YWNobWVudFVwZGF0ZXNGb3JTY29w ZSBvYnNlcnZlcigoX19icmlkZ2UgVGVzdFdLV2ViVmlldyAqKXdlYlZpZXcuZ2V0KCkpOworICAg IFt3ZWJWaWV3IF9zeW5jaHJvbm91c2x5RXhlY3V0ZUVkaXRDb21tYW5kOkAiUGFzdGUiIGFyZ3Vt ZW50Om5pbF07CisgICAgW3dlYlZpZXcgZXhwZWN0RWxlbWVudENvdW50OjIgdGFnTmFtZTpAIklN RyJdOworCisgICAgZm9yIChfV0tBdHRhY2htZW50ICphdHRhY2htZW50IGluIG9ic2VydmVyLm9i c2VydmVyKCkuaW5zZXJ0ZWQpIHsKKyAgICAgICAgaWYgKFthdHRhY2htZW50LmluZm8uY29udGVu dFR5cGUgaXNFcXVhbFRvU3RyaW5nOkAiaW1hZ2UvcG5nIl0pCisgICAgICAgICAgICBwbmdBdHRh Y2htZW50ID0gYXR0YWNobWVudDsKKyAgICAgICAgZWxzZSBpZiAoW2F0dGFjaG1lbnQuaW5mby5j b250ZW50VHlwZSBpc0VxdWFsVG9TdHJpbmc6QCJpbWFnZS9naWYiXSkKKyAgICAgICAgICAgIGdp ZkF0dGFjaG1lbnQgPSBhdHRhY2htZW50OworICAgIH0KKworICAgIEVYUEVDVF9XS19TVFJFUSgi Zm9vIiwgW3BuZ0F0dGFjaG1lbnQgaW5mb10ubmFtZSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKCJi YXIiLCBbZ2lmQXR0YWNobWVudCBpbmZvXS5uYW1lKTsKKyAgICBbcG5nQXR0YWNobWVudCBleHBl Y3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SW1hZ2VEYXRhKCldOworICAgIFtnaWZBdHRhY2htZW50 IGV4cGVjdFJlcXVlc3RlZERhdGFUb0JlOnRlc3RHSUZEYXRhKCldOworICAgIG9ic2VydmVyLmV4 cGVjdEF0dGFjaG1lbnRVcGRhdGVzKEBbIF0sIEBbIChfX2JyaWRnZSBfV0tBdHRhY2htZW50ICop cG5nQXR0YWNobWVudC5nZXQoKSwgKF9fYnJpZGdlIF9XS0F0dGFjaG1lbnQgKilnaWZBdHRhY2ht ZW50LmdldCgpIF0pOworfQorCiAjcHJhZ21hIG1hcmsgLSBQbGF0Zm9ybS1zcGVjaWZpYyB0ZXN0 cwogCiAjaWYgUExBVEZPUk0oTUFDKQo=