214665 2020-07-22 16:49:24 -0700 [IPC hardening] WebKit::ArgumentCoder<BlobPart>::decode() and encode() should use enum BlobPart::Type 2020-07-23 11:46:08 -0700 1 1 1 Unclassified WebKit WebKit2 Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ddkilzer ddkilzer darin useafterfree webkit-bug-importer oldest_to_newest 1674044 0 ddkilzer 2020-07-22 16:49:24 -0700 WebCore::ArgumentCoder<BlobPart>::decode() and encode() should use enum BlobPart::Type. We can also get rid of a default: case label in decode() while we're here to make -Wimplicit-fallthrough emit a warning if a new enum is added. <rdar://problem/65777948> 1674048 1 404997 ddkilzer 2020-07-22 17:06:10 -0700 Created attachment 404997 Patch v1 1674070 2 404997 darin 2020-07-22 18:25:10 -0700 Comment on attachment 404997 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=404997&action=review > Source/WebCore/platform/network/BlobPart.h:100 > +namespace WTF { > + > +template<> struct EnumTraits<WebCore::BlobPart::Type> { > + using values = EnumValues< > + WebCore::BlobPart::Type, > + WebCore::BlobPart::Type::Data, > + WebCore::BlobPart::Type::Blob > + >; > +}; > + > +} // namespace WTF Instead of this, I suggest: enum class Type : bool { Data, Blob }; 1674255 3 404997 ddkilzer 2020-07-23 09:49:26 -0700 Comment on attachment 404997 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=404997&action=review >> Source/WebCore/platform/network/BlobPart.h:100 >> +} // namespace WTF > > Instead of this, I suggest: > > enum class Type : bool { Data, Blob }; Will fix before landing. Thanks! 1674263 4 405051 ddkilzer 2020-07-23 10:19:40 -0700 Created attachment 405051 Patch for landing 1674265 5 405051 darin 2020-07-23 10:22:43 -0700 Comment on attachment 405051 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=405051&action=review > Source/WebKit/Shared/WebCoreArgumentCoders.cpp:2481 > case BlobPart::Data: Seems like this won’t compile: Needs to be BlobPart::Type::Data. > Source/WebKit/Shared/WebCoreArgumentCoders.cpp:2484 > case BlobPart::Blob: Ditto. > Source/WebKit/Shared/WebCoreArgumentCoders.cpp:2506 > case BlobPart::Blob: { Here too, and above. 1674269 6 405053 ddkilzer 2020-07-23 10:29:08 -0700 Created attachment 405053 Patch for landing v2 1674304 7 405053 ddkilzer 2020-07-23 11:42:42 -0700 Comment on attachment 405053 Patch for landing v2 Adding cq+ since there are no logic changes from "Patch v1", and the patch built on all platforms. 1674307 8 ews-feeder 2020-07-23 11:46:05 -0700 Committed r264780: <https://trac.webkit.org/changeset/264780> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405053. 404997 2020-07-22 17:06:10 -0700 2020-07-23 09:49:26 -0700 Patch v1 bug-214665-20200722170657.patch text/plain 4937 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNkZmFjYzg5NzgxZjU0 YTI1ZjE4NmQ4YmY0MzAyNDc5ZGM3YjRlZS4uOGE4Mjc4MjUwMTQwZDgwMGE5MGU2OWQ2NzJiNjMy YjFjOWIzOWFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA3LTIyICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgW0lQQyBoYXJkZW5pbmdd IFdlYktpdDo6QXJndW1lbnRDb2RlcjxCbG9iUGFydD46OmRlY29kZSgpIGFuZCBlbmNvZGUoKSBz aG91bGQgdXNlIGVudW0gQmxvYlBhcnQ6OlR5cGUKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9y Zy9iLzIxNDY2NT4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1Nzc3OTQ4PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9CbG9iUGFydC5oOgorICAgICAgICAoV1RGOjpFbnVtVHJhaXRzPFdlYkNvcmU6OkJsb2JQYXJ0 OjpUeXBlPik6IEFkZC4KKyAgICAgICAgLSBVc2VkIHRvIHZhbGlkYXRlIGVudW0gdmFsdWVzIGZv ciBJUEMuCisKIDIwMjAtMDctMjIgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CiAKICAgICAgICAgQXJ0aWNsZSBoZWFkbGluZXMgYXJlIHNwbGl0IGFjcm9zcyBtdWx0aXBs ZSBsaW5lcyBhZnRlciB0cmFuc2xhdGluZyB0YWdlc3NjaGF1LmRlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0MmJj ZGIzOWMzN2Y5ZGQyNmU0YmNkNjdiOGUzMGZlN2IwNDIwZTUuLjkzOTYwNzk0ZTUyNGFhNTFiNmU1 NGI4YzkyZTIxNDIwMmFkNTE5YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDct MjIgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBbSVBDIGhh cmRlbmluZ10gV2ViS2l0OjpBcmd1bWVudENvZGVyPEJsb2JQYXJ0Pjo6ZGVjb2RlKCkgYW5kIGVu Y29kZSgpIHNob3VsZCB1c2UgZW51bSBCbG9iUGFydDo6VHlwZQorICAgICAgICA8aHR0cHM6Ly93 ZWJraXQub3JnL2IvMjE0NjY1PgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjU3Nzc5NDg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxC bG9iUGFydD46OmVuY29kZSk6CisgICAgICAgIC0gRW5jb2RlIHVzaW5nIFdlYkNvcmU6OkJsb2JQ YXJ0OjpUeXBlIHZhbHVlLgorICAgICAgICAtIENoYW5nZSBicmVhayBzdGF0ZW1lbnRzIHRvIGVh cmx5IHJldHVybiBzdGF0ZW1lbnRzLgorICAgICAgICAtIEFkZCBBU1NFUlRfTk9UX1JFQUNIRUQo KSB0byBjYXRjaCBidWdzLgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPEJsb2JQYXJ0Pjo6 ZGVjb2RlKToKKyAgICAgICAgLSBEZWNvZGUgdXNpbmcgT3B0aW9uYWw8V2ViQ29yZTo6QmxvYlBh cnQ6OlR5cGU+IHZhcmlhYmxlLgorICAgICAgICAtIENoYW5nZSBicmVhayBzdGF0ZW1lbnRzIHRv IGVhcmx5IHJldHVybiBzdGF0ZW1lbnRzLgorICAgICAgICAtIFJlbW92ZSBkZWZhdWx0OiBsYWJl bCwgbW92ZSBgcmV0dXJuIFdURjo6bnVsbG9wdGAgdG8gdGhlIGVuZAorICAgICAgICAgIG9mIHRo ZSBtZXRob2QsIGFuZCBhZGQgQVNTRVJUX05PVF9SRUFDSEVEKCkgdG8gY2F0Y2ggYnVncy4KKwog MjAyMC0wNy0yMiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAg IEZvbGxvdy11cDogW0lQQyBoYXJkZW5pbmddIFdlYktpdDo6T2JqQ09iamVjdEdyYXBoOjpkZWNv ZGUoKSBhbmQgZW5jb2RlKCkgc2hvdWxkIHVzZSBlbnVtIE9iakNUeXBlIHR5cGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlBhcnQuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlBhcnQuaAppbmRleCAwNDFjMjlhMzEyZjA5ODE3 ZjhlY2YxNzM2MTYxM2NhZDJmZDZmNGRlLi43NTZmZTJjOTA3NmUxNDI2MDczZWEwMjdlOGJjOGY2 NWUwNTlkODZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Js b2JQYXJ0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUGFydC5o CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQtMjAyMCBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAg LTI1LDYgKzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlIDx3dGYvRW51bVRyYWl0 cy5oPgogI2luY2x1ZGUgPHd0Zi9VUkwuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtODQs NCArODUsMTYgQEAgcHJpdmF0ZToKICAgICBVUkwgbV91cmw7CiB9OwogCi19Cit9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCisKK25hbWVzcGFjZSBXVEYgeworCit0ZW1wbGF0ZTw+IHN0cnVjdCBFbnVt VHJhaXRzPFdlYkNvcmU6OkJsb2JQYXJ0OjpUeXBlPiB7CisgICAgdXNpbmcgdmFsdWVzID0gRW51 bVZhbHVlczwKKyAgICAgICAgV2ViQ29yZTo6QmxvYlBhcnQ6OlR5cGUsCisgICAgICAgIFdlYkNv cmU6OkJsb2JQYXJ0OjpUeXBlOjpEYXRhLAorICAgICAgICBXZWJDb3JlOjpCbG9iUGFydDo6VHlw ZTo6QmxvYgorICAgID47Cit9OworCit9IC8vIG5hbWVzcGFjZSBXVEYKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCmluZGV4IDNhMGQ0Yjg3MThlM2Vk NjRkOWNmYTIyMjQxZDNjNjE2ZDIzOGMxNzYuLjdmNWEzMjg3YTgxYzUxN2ZkNjkxZDlkNzg0MmRk Yjc4NmE1Y2MyZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1 bWVudENvZGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmNwcApAQCAtMjQ3NiwyMiArMjQ3NiwyMSBAQCBib29sIEFyZ3VtZW50Q29kZXI8Rmls dGVyT3BlcmF0aW9ucz46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBGaWx0ZXJPcGVyYXRpb25z JgogCiB2b2lkIEFyZ3VtZW50Q29kZXI8QmxvYlBhcnQ+OjplbmNvZGUoRW5jb2RlciYgZW5jb2Rl ciwgY29uc3QgQmxvYlBhcnQmIGJsb2JQYXJ0KQogewotICAgIGVuY29kZXIgPDwgc3RhdGljX2Nh c3Q8dWludDMyX3Q+KGJsb2JQYXJ0LnR5cGUoKSk7CisgICAgZW5jb2RlciA8PCBibG9iUGFydC50 eXBlKCk7CiAgICAgc3dpdGNoIChibG9iUGFydC50eXBlKCkpIHsKICAgICBjYXNlIEJsb2JQYXJ0 OjpEYXRhOgogICAgICAgICBlbmNvZGVyIDw8IGJsb2JQYXJ0LmRhdGEoKTsKLSAgICAgICAgYnJl YWs7CisgICAgICAgIHJldHVybjsKICAgICBjYXNlIEJsb2JQYXJ0OjpCbG9iOgogICAgICAgICBl bmNvZGVyIDw8IGJsb2JQYXJ0LnVybCgpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJu OwogICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAogT3B0aW9uYWw8QmxvYlBh cnQ+IEFyZ3VtZW50Q29kZXI8QmxvYlBhcnQ+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKIHsK LSAgICBCbG9iUGFydCBibG9iUGFydDsKLQotICAgIE9wdGlvbmFsPHVpbnQzMl90PiB0eXBlOwor ICAgIE9wdGlvbmFsPEJsb2JQYXJ0OjpUeXBlPiB0eXBlOwogICAgIGRlY29kZXIgPj4gdHlwZTsK ICAgICBpZiAoIXR5cGUpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CkBAIC0yNTAyLDIx ICsyNTAxLDE4IEBAIE9wdGlvbmFsPEJsb2JQYXJ0PiBBcmd1bWVudENvZGVyPEJsb2JQYXJ0Pjo6 ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiAgICAgICAgIGRlY29kZXIgPj4gZGF0YTsKICAgICAg ICAgaWYgKCFkYXRhKQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLSAgICAgICAg YmxvYlBhcnQgPSBCbG9iUGFydChXVEZNb3ZlKCpkYXRhKSk7Ci0gICAgICAgIGJyZWFrOworICAg ICAgICByZXR1cm4gQmxvYlBhcnQoV1RGTW92ZSgqZGF0YSkpOwogICAgIH0KICAgICBjYXNlIEJs b2JQYXJ0OjpCbG9iOiB7CiAgICAgICAgIFVSTCB1cmw7CiAgICAgICAgIGlmICghZGVjb2Rlci5k ZWNvZGUodXJsKSkKICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgICAgIGJs b2JQYXJ0ID0gQmxvYlBhcnQodXJsKTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybiBC bG9iUGFydCh1cmwpOwogICAgIH0KLSAgICBkZWZhdWx0OgotICAgICAgICByZXR1cm4gV1RGOjpu dWxsb3B0OwogICAgIH0KIAotICAgIHJldHVybiBibG9iUGFydDsKKyAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKKyAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogfQogCiB2b2lkIEFyZ3VtZW50Q29k ZXI8VGV4dEluZGljYXRvckRhdGE+OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlciwgY29uc3QgVGV4 dEluZGljYXRvckRhdGEmIHRleHRJbmRpY2F0b3JEYXRhKQo= 405051 2020-07-23 10:19:40 -0700 2020-07-23 10:28:58 -0700 Patch for landing bug-214665-20200723102030.patch text/plain 7297 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNkZmFjYzg5NzgxZjU0 YTI1ZjE4NmQ4YmY0MzAyNDc5ZGM3YjRlZS4uZTk1N2UzMDYyNGUxNjI5OTcyMmRiYWQyMTU5NWNm Y2VkZmVmMmMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA3LTIzICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgW0lQQyBoYXJkZW5pbmdd IFdlYktpdDo6QXJndW1lbnRDb2RlcjxCbG9iUGFydD46OmRlY29kZSgpIGFuZCBlbmNvZGUoKSBz aG91bGQgdXNlIGVudW0gQmxvYlBhcnQ6OlR5cGUKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9y Zy9iLzIxNDY2NT4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1Nzc3OTQ4PgorCisgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9C bG9iUGFydC5oOgorICAgICAgICAoV2ViQ29yZTo6QmxvYlBhcnQ6OlR5cGUpOgorICAgICAgICAt IENvbnZlcnQgdG8gYW4gZW51bSBjbGFzcyBvZiBzaXplIGBib29sYC4KKyAgICAgICAgKFdlYkNv cmU6OkJsb2JQYXJ0OjpCbG9iUGFydCk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUGFydDo6ZGF0 YSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUGFydDo6bW92ZURhdGEpOgorICAgICAg ICAoV2ViQ29yZTo6QmxvYlBhcnQ6OnVybCBjb25zdCk6CisgICAgICAgIC0gQ2hhbmdlIEJsb2JQ YXJ0OjpUeXBlIGVudW1zIHRvIHVzZSBmdWxseSBxdWFsaWZpZWQgbmFtZS4KKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL0Jsb2JSZWdpc3RyeUltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 QmxvYlJlZ2lzdHJ5SW1wbDo6cmVnaXN0ZXJCbG9iVVJMKToKKyAgICAgICAgLSBDaGFuZ2UgQmxv YlBhcnQ6OlR5cGUgZW51bXMgdG8gdXNlIGZ1bGx5IHF1YWxpZmllZCBuYW1lLgorCiAyMDIwLTA3 LTIyICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEFy dGljbGUgaGVhZGxpbmVzIGFyZSBzcGxpdCBhY3Jvc3MgbXVsdGlwbGUgbGluZXMgYWZ0ZXIgdHJh bnNsYXRpbmcgdGFnZXNzY2hhdS5kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjNDJiY2RiMzljMzdmOWRkMjZlNGJj ZDY3YjhlMzBmZTdiMDQyMGU1Li45Mzk2MDc5NGU1MjRhYTUxYjZlNTRiOGM5MmUyMTQyMDJhZDUx OWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA3LTIyICBEYXZpZCBLaWx6ZXIg IDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgW0lQQyBoYXJkZW5pbmddIFdlYktpdDo6 QXJndW1lbnRDb2RlcjxCbG9iUGFydD46OmRlY29kZSgpIGFuZCBlbmNvZGUoKSBzaG91bGQgdXNl IGVudW0gQmxvYlBhcnQ6OlR5cGUKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIxNDY2 NT4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1Nzc3OTQ4PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENv ZGVycy5jcHA6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8QmxvYlBhcnQ+OjplbmNvZGUp OgorICAgICAgICAtIEVuY29kZSB1c2luZyBXZWJDb3JlOjpCbG9iUGFydDo6VHlwZSB2YWx1ZS4K KyAgICAgICAgLSBDaGFuZ2UgYnJlYWsgc3RhdGVtZW50cyB0byBlYXJseSByZXR1cm4gc3RhdGVt ZW50cy4KKyAgICAgICAgLSBBZGQgQVNTRVJUX05PVF9SRUFDSEVEKCkgdG8gY2F0Y2ggYnVncy4K KyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxCbG9iUGFydD46OmRlY29kZSk6CisgICAgICAg IC0gRGVjb2RlIHVzaW5nIE9wdGlvbmFsPFdlYkNvcmU6OkJsb2JQYXJ0OjpUeXBlPiB2YXJpYWJs ZS4KKyAgICAgICAgLSBDaGFuZ2UgYnJlYWsgc3RhdGVtZW50cyB0byBlYXJseSByZXR1cm4gc3Rh dGVtZW50cy4KKyAgICAgICAgLSBSZW1vdmUgZGVmYXVsdDogbGFiZWwsIG1vdmUgYHJldHVybiBX VEY6Om51bGxvcHRgIHRvIHRoZSBlbmQKKyAgICAgICAgICBvZiB0aGUgbWV0aG9kLCBhbmQgYWRk IEFTU0VSVF9OT1RfUkVBQ0hFRCgpIHRvIGNhdGNoIGJ1Z3MuCisKIDIwMjAtMDctMjIgIERhdmlk IEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBGb2xsb3ctdXA6IFtJUEMg aGFyZGVuaW5nXSBXZWJLaXQ6Ok9iakNPYmplY3RHcmFwaDo6ZGVjb2RlKCkgYW5kIGVuY29kZSgp IHNob3VsZCB1c2UgZW51bSBPYmpDVHlwZSB0eXBlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL0Jsb2JQYXJ0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL0Jsb2JQYXJ0LmgKaW5kZXggMDQxYzI5YTMxMmYwOTgxN2Y4ZWNmMTczNjE2MTNjYWQy ZmQ2ZjRkZS4uMThhNjEzOWUwYjIzMzFkMThmYzJlNDViNWE2MDU2MzY5MjcxYThmYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUGFydC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlBhcnQuaApAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDE0LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zMSwyNCArMzEsMjQgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBCbG9iUGFydCB7CiBwdWJsaWM6Ci0gICAgZW51 bSBUeXBlIHsKKyAgICBlbnVtIGNsYXNzIFR5cGUgOiBib29sIHsKICAgICAgICAgRGF0YSwKICAg ICAgICAgQmxvYgogICAgIH07CiAKICAgICBCbG9iUGFydCgpCi0gICAgICAgIDogbV90eXBlKERh dGEpCisgICAgICAgIDogbV90eXBlKFR5cGU6OkRhdGEpCiAgICAgewogICAgIH0KIAogICAgIEJs b2JQYXJ0KFZlY3Rvcjx1aW50OF90PiYmIGRhdGEpCi0gICAgICAgIDogbV90eXBlKERhdGEpCisg ICAgICAgIDogbV90eXBlKFR5cGU6OkRhdGEpCiAgICAgICAgICwgbV9kYXRhKFdURk1vdmUoZGF0 YSkpCiAgICAgewogICAgIH0KIAogICAgIEJsb2JQYXJ0KGNvbnN0IFVSTCYgdXJsKQotICAgICAg ICA6IG1fdHlwZShCbG9iKQorICAgICAgICA6IG1fdHlwZShUeXBlOjpCbG9iKQogICAgICAgICAs IG1fdXJsKHVybCkKICAgICB7CiAgICAgfQpAQCAtNTcsMTkgKzU3LDE5IEBAIHB1YmxpYzoKIAog ICAgIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgZGF0YSgpIGNvbnN0CiAgICAgewotICAgICAgICBB U1NFUlQobV90eXBlID09IERhdGEpOworICAgICAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OkRh dGEpOwogICAgICAgICByZXR1cm4gbV9kYXRhOwogICAgIH0KIAogICAgIFZlY3Rvcjx1aW50OF90 PiBtb3ZlRGF0YSgpCiAgICAgewotICAgICAgICBBU1NFUlQobV90eXBlID09IERhdGEpOworICAg ICAgICBBU1NFUlQobV90eXBlID09IFR5cGU6OkRhdGEpOwogICAgICAgICByZXR1cm4gV1RGTW92 ZShtX2RhdGEpOwogICAgIH0KIAogICAgIGNvbnN0IFVSTCYgdXJsKCkgY29uc3QKICAgICB7Ci0g ICAgICAgIEFTU0VSVChtX3R5cGUgPT0gQmxvYik7CisgICAgICAgIEFTU0VSVChtX3R5cGUgPT0g VHlwZTo6QmxvYik7CiAgICAgICAgIHJldHVybiBtX3VybDsKICAgICB9CiAKQEAgLTg0LDQgKzg0 LDQgQEAgcHJpdmF0ZToKICAgICBVUkwgbV91cmw7CiB9OwogCi19Cit9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Jsb2JS ZWdpc3RyeUltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVn aXN0cnlJbXBsLmNwcAppbmRleCBiZTMzMGE1M2QzODMxOGUxNGQyZGYyOGM0YjZjZTU4NDY0NGM0 YzFhLi5jOWNhZjUxNmM5ZjdiMmRmZjc3NmJlMDQxYmE5OGU4M2E5OGI4ZWE0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Jsb2JSZWdpc3RyeUltcGwuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlZ2lzdHJ5SW1wbC5jcHAK QEAgLTEsNiArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMjAgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpA QCAtMTM0LDEzICsxMzQsMTMgQEAgdm9pZCBCbG9iUmVnaXN0cnlJbXBsOjpyZWdpc3RlckJsb2JV UkwoY29uc3QgVVJMJiB1cmwsIFZlY3RvcjxCbG9iUGFydD4mJiBibG9iUGEKIAogICAgIGZvciAo QmxvYlBhcnQmIHBhcnQgOiBibG9iUGFydHMpIHsKICAgICAgICAgc3dpdGNoIChwYXJ0LnR5cGUo KSkgewotICAgICAgICBjYXNlIEJsb2JQYXJ0OjpEYXRhOiB7CisgICAgICAgIGNhc2UgQmxvYlBh cnQ6OlR5cGU6OkRhdGE6IHsKICAgICAgICAgICAgIGF1dG8gbW92ZWREYXRhID0gcGFydC5tb3Zl RGF0YSgpOwogICAgICAgICAgICAgYXV0byBkYXRhID0gVGhyZWFkU2FmZURhdGFCdWZmZXI6OmNy ZWF0ZShXVEZNb3ZlKG1vdmVkRGF0YSkpOwogICAgICAgICAgICAgYmxvYkRhdGEtPmFwcGVuZERh dGEoZGF0YSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotICAgICAgICBjYXNlIEJs b2JQYXJ0OjpCbG9iOiB7CisgICAgICAgIGNhc2UgQmxvYlBhcnQ6OlR5cGU6OkJsb2I6IHsKICAg ICAgICAgICAgIGlmIChhdXRvIGJsb2IgPSBtX2Jsb2JzLmdldChwYXJ0LnVybCgpLnN0cmluZygp KSkgewogICAgICAgICAgICAgICAgIGZvciAoY29uc3QgQmxvYkRhdGFJdGVtJiBpdGVtIDogYmxv Yi0+aXRlbXMoKSkKICAgICAgICAgICAgICAgICAgICAgYmxvYkRhdGEtPm1faXRlbXMuYXBwZW5k KGl0ZW0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5j cHAKaW5kZXggM2EwZDRiODcxOGUzZWQ2NGQ5Y2ZhMjIyNDFkM2M2MTZkMjM4YzE3Ni4uN2Y1YTMy ODdhODFjNTE3ZmQ2OTFkOWQ3ODQyZGRiNzg2YTVjYzJkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCkBAIC0yNDc2LDIyICsyNDc2LDIxIEBA IGJvb2wgQXJndW1lbnRDb2RlcjxGaWx0ZXJPcGVyYXRpb25zPjo6ZGVjb2RlKERlY29kZXImIGRl Y29kZXIsIEZpbHRlck9wZXJhdGlvbnMmCiAKIHZvaWQgQXJndW1lbnRDb2RlcjxCbG9iUGFydD46 OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBCbG9iUGFydCYgYmxvYlBhcnQpCiB7Ci0g ICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDx1aW50MzJfdD4oYmxvYlBhcnQudHlwZSgpKTsKKyAg ICBlbmNvZGVyIDw8IGJsb2JQYXJ0LnR5cGUoKTsKICAgICBzd2l0Y2ggKGJsb2JQYXJ0LnR5cGUo KSkgewogICAgIGNhc2UgQmxvYlBhcnQ6OkRhdGE6CiAgICAgICAgIGVuY29kZXIgPDwgYmxvYlBh cnQuZGF0YSgpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgQmxv YlBhcnQ6OkJsb2I6CiAgICAgICAgIGVuY29kZXIgPDwgYmxvYlBhcnQudXJsKCk7Ci0gICAgICAg IGJyZWFrOworICAgICAgICByZXR1cm47CiAgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwogfQogCiBPcHRpb25hbDxCbG9iUGFydD4gQXJndW1lbnRDb2RlcjxCbG9iUGFydD46OmRlY29k ZShEZWNvZGVyJiBkZWNvZGVyKQogewotICAgIEJsb2JQYXJ0IGJsb2JQYXJ0OwotCi0gICAgT3B0 aW9uYWw8dWludDMyX3Q+IHR5cGU7CisgICAgT3B0aW9uYWw8QmxvYlBhcnQ6OlR5cGU+IHR5cGU7 CiAgICAgZGVjb2RlciA+PiB0eXBlOwogICAgIGlmICghdHlwZSkKICAgICAgICAgcmV0dXJuIFdU Rjo6bnVsbG9wdDsKQEAgLTI1MDIsMjEgKzI1MDEsMTggQEAgT3B0aW9uYWw8QmxvYlBhcnQ+IEFy Z3VtZW50Q29kZXI8QmxvYlBhcnQ+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKICAgICAgICAg ZGVjb2RlciA+PiBkYXRhOwogICAgICAgICBpZiAoIWRhdGEpCiAgICAgICAgICAgICByZXR1cm4g V1RGOjpudWxsb3B0OwotICAgICAgICBibG9iUGFydCA9IEJsb2JQYXJ0KFdURk1vdmUoKmRhdGEp KTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybiBCbG9iUGFydChXVEZNb3ZlKCpkYXRh KSk7CiAgICAgfQogICAgIGNhc2UgQmxvYlBhcnQ6OkJsb2I6IHsKICAgICAgICAgVVJMIHVybDsK ICAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZSh1cmwpKQogICAgICAgICAgICAgcmV0dXJuIFdU Rjo6bnVsbG9wdDsKLSAgICAgICAgYmxvYlBhcnQgPSBCbG9iUGFydCh1cmwpOwotICAgICAgICBi cmVhazsKKyAgICAgICAgcmV0dXJuIEJsb2JQYXJ0KHVybCk7CiAgICAgfQotICAgIGRlZmF1bHQ6 Ci0gICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAgICAgfQogCi0gICAgcmV0dXJuIGJsb2JQ YXJ0OworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBXVEY6Om51bGxvcHQ7 CiB9CiAKIHZvaWQgQXJndW1lbnRDb2RlcjxUZXh0SW5kaWNhdG9yRGF0YT46OmVuY29kZShFbmNv ZGVyJiBlbmNvZGVyLCBjb25zdCBUZXh0SW5kaWNhdG9yRGF0YSYgdGV4dEluZGljYXRvckRhdGEp Cg== 405053 2020-07-23 10:29:08 -0700 2020-07-23 11:46:07 -0700 Patch for landing v2 bug-214665-20200723102957.patch text/plain 7562 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNkZmFjYzg5NzgxZjU0 YTI1ZjE4NmQ4YmY0MzAyNDc5ZGM3YjRlZS4uZTk1N2UzMDYyNGUxNjI5OTcyMmRiYWQyMTU5NWNm Y2VkZmVmMmMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA3LTIzICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgW0lQQyBoYXJkZW5pbmdd IFdlYktpdDo6QXJndW1lbnRDb2RlcjxCbG9iUGFydD46OmRlY29kZSgpIGFuZCBlbmNvZGUoKSBz aG91bGQgdXNlIGVudW0gQmxvYlBhcnQ6OlR5cGUKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9y Zy9iLzIxNDY2NT4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1Nzc3OTQ4PgorCisgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9C bG9iUGFydC5oOgorICAgICAgICAoV2ViQ29yZTo6QmxvYlBhcnQ6OlR5cGUpOgorICAgICAgICAt IENvbnZlcnQgdG8gYW4gZW51bSBjbGFzcyBvZiBzaXplIGBib29sYC4KKyAgICAgICAgKFdlYkNv cmU6OkJsb2JQYXJ0OjpCbG9iUGFydCk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUGFydDo6ZGF0 YSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUGFydDo6bW92ZURhdGEpOgorICAgICAg ICAoV2ViQ29yZTo6QmxvYlBhcnQ6OnVybCBjb25zdCk6CisgICAgICAgIC0gQ2hhbmdlIEJsb2JQ YXJ0OjpUeXBlIGVudW1zIHRvIHVzZSBmdWxseSBxdWFsaWZpZWQgbmFtZS4KKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL0Jsb2JSZWdpc3RyeUltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 QmxvYlJlZ2lzdHJ5SW1wbDo6cmVnaXN0ZXJCbG9iVVJMKToKKyAgICAgICAgLSBDaGFuZ2UgQmxv YlBhcnQ6OlR5cGUgZW51bXMgdG8gdXNlIGZ1bGx5IHF1YWxpZmllZCBuYW1lLgorCiAyMDIwLTA3 LTIyICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEFy dGljbGUgaGVhZGxpbmVzIGFyZSBzcGxpdCBhY3Jvc3MgbXVsdGlwbGUgbGluZXMgYWZ0ZXIgdHJh bnNsYXRpbmcgdGFnZXNzY2hhdS5kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjNDJiY2RiMzljMzdmOWRkMjZlNGJj ZDY3YjhlMzBmZTdiMDQyMGU1Li5hMTU0ZjliM2FlN2VhMjQ3YzAxZGZiYzIwZTMwMTYxZmI4M2I2 NjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA3LTIyICBEYXZpZCBLaWx6ZXIg IDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgW0lQQyBoYXJkZW5pbmddIFdlYktpdDo6 QXJndW1lbnRDb2RlcjxCbG9iUGFydD46OmRlY29kZSgpIGFuZCBlbmNvZGUoKSBzaG91bGQgdXNl IGVudW0gQmxvYlBhcnQ6OlR5cGUKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIxNDY2 NT4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1Nzc3OTQ4PgorCisgICAgICAgIFJldmlld2Vk IGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVy cy5jcHA6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8QmxvYlBhcnQ+OjplbmNvZGUpOgor ICAgICAgICAtIENoYW5nZSBCbG9iUGFydDo6VHlwZSBlbnVtcyB0byB1c2UgZnVsbHkgcXVhbGlm aWVkIG5hbWUuCisgICAgICAgIC0gRW5jb2RlIHVzaW5nIFdlYkNvcmU6OkJsb2JQYXJ0OjpUeXBl IHZhbHVlLgorICAgICAgICAtIENoYW5nZSBicmVhayBzdGF0ZW1lbnRzIHRvIGVhcmx5IHJldHVy biBzdGF0ZW1lbnRzLgorICAgICAgICAtIEFkZCBBU1NFUlRfTk9UX1JFQUNIRUQoKSB0byBjYXRj aCBidWdzLgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPEJsb2JQYXJ0Pjo6ZGVjb2RlKToK KyAgICAgICAgLSBDaGFuZ2UgQmxvYlBhcnQ6OlR5cGUgZW51bXMgdG8gdXNlIGZ1bGx5IHF1YWxp ZmllZCBuYW1lLgorICAgICAgICAtIERlY29kZSB1c2luZyBPcHRpb25hbDxXZWJDb3JlOjpCbG9i UGFydDo6VHlwZT4gdmFyaWFibGUuCisgICAgICAgIC0gQ2hhbmdlIGJyZWFrIHN0YXRlbWVudHMg dG8gZWFybHkgcmV0dXJuIHN0YXRlbWVudHMuCisgICAgICAgIC0gUmVtb3ZlIGRlZmF1bHQ6IGxh YmVsLCBtb3ZlIGByZXR1cm4gV1RGOjpudWxsb3B0YCB0byB0aGUgZW5kCisgICAgICAgICAgb2Yg dGhlIG1ldGhvZCwgYW5kIGFkZCBBU1NFUlRfTk9UX1JFQUNIRUQoKSB0byBjYXRjaCBidWdzLgor CiAyMDIwLTA3LTIyICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAg ICAgRm9sbG93LXVwOiBbSVBDIGhhcmRlbmluZ10gV2ViS2l0OjpPYmpDT2JqZWN0R3JhcGg6OmRl Y29kZSgpIGFuZCBlbmNvZGUoKSBzaG91bGQgdXNlIGVudW0gT2JqQ1R5cGUgdHlwZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUGFydC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUGFydC5oCmluZGV4IDA0MWMyOWEzMTJmMDk4 MTdmOGVjZjE3MzYxNjEzY2FkMmZkNmY0ZGUuLjE4YTYxMzllMGIyMzMxZDE4ZmMyZTQ1YjVhNjA1 NjM2OTI3MWE4ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv QmxvYlBhcnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Jsb2JQYXJ0 LmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE0IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNC0yMDIwIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpA QCAtMzEsMjQgKzMxLDI0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQmxvYlBhcnQg ewogcHVibGljOgotICAgIGVudW0gVHlwZSB7CisgICAgZW51bSBjbGFzcyBUeXBlIDogYm9vbCB7 CiAgICAgICAgIERhdGEsCiAgICAgICAgIEJsb2IKICAgICB9OwogCiAgICAgQmxvYlBhcnQoKQot ICAgICAgICA6IG1fdHlwZShEYXRhKQorICAgICAgICA6IG1fdHlwZShUeXBlOjpEYXRhKQogICAg IHsKICAgICB9CiAKICAgICBCbG9iUGFydChWZWN0b3I8dWludDhfdD4mJiBkYXRhKQotICAgICAg ICA6IG1fdHlwZShEYXRhKQorICAgICAgICA6IG1fdHlwZShUeXBlOjpEYXRhKQogICAgICAgICAs IG1fZGF0YShXVEZNb3ZlKGRhdGEpKQogICAgIHsKICAgICB9CiAKICAgICBCbG9iUGFydChjb25z dCBVUkwmIHVybCkKLSAgICAgICAgOiBtX3R5cGUoQmxvYikKKyAgICAgICAgOiBtX3R5cGUoVHlw ZTo6QmxvYikKICAgICAgICAgLCBtX3VybCh1cmwpCiAgICAgewogICAgIH0KQEAgLTU3LDE5ICs1 NywxOSBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBWZWN0b3I8dWludDhfdD4mIGRhdGEoKSBjb25z dAogICAgIHsKLSAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBEYXRhKTsKKyAgICAgICAgQVNTRVJU KG1fdHlwZSA9PSBUeXBlOjpEYXRhKTsKICAgICAgICAgcmV0dXJuIG1fZGF0YTsKICAgICB9CiAK ICAgICBWZWN0b3I8dWludDhfdD4gbW92ZURhdGEoKQogICAgIHsKLSAgICAgICAgQVNTRVJUKG1f dHlwZSA9PSBEYXRhKTsKKyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlOjpEYXRhKTsKICAg ICAgICAgcmV0dXJuIFdURk1vdmUobV9kYXRhKTsKICAgICB9CiAKICAgICBjb25zdCBVUkwmIHVy bCgpIGNvbnN0CiAgICAgewotICAgICAgICBBU1NFUlQobV90eXBlID09IEJsb2IpOworICAgICAg ICBBU1NFUlQobV90eXBlID09IFR5cGU6OkJsb2IpOwogICAgICAgICByZXR1cm4gbV91cmw7CiAg ICAgfQogCkBAIC04NCw0ICs4NCw0IEBAIHByaXZhdGU6CiAgICAgVVJMIG1fdXJsOwogfTsKIAot fQorfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9CbG9iUmVnaXN0cnlJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvQmxvYlJlZ2lzdHJ5SW1wbC5jcHAKaW5kZXggYmUzMzBhNTNkMzgzMThlMTRk MmRmMjhjNGI2Y2U1ODQ2NDRjNGMxYS4uYzljYWY1MTZjOWY3YjJkZmY3NzZiZTA0MWJhOThlODNh OThiOGVhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9i UmVnaXN0cnlJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Js b2JSZWdpc3RyeUltcGwuY3BwCkBAIC0xLDYgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykg MjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAy MDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAx My0yMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK ICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucyBhcmUKQEAgLTEzNCwxMyArMTM0LDEzIEBAIHZvaWQgQmxvYlJlZ2lzdHJ5 SW1wbDo6cmVnaXN0ZXJCbG9iVVJMKGNvbnN0IFVSTCYgdXJsLCBWZWN0b3I8QmxvYlBhcnQ+JiYg YmxvYlBhCiAKICAgICBmb3IgKEJsb2JQYXJ0JiBwYXJ0IDogYmxvYlBhcnRzKSB7CiAgICAgICAg IHN3aXRjaCAocGFydC50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBCbG9iUGFydDo6RGF0YTogewor ICAgICAgICBjYXNlIEJsb2JQYXJ0OjpUeXBlOjpEYXRhOiB7CiAgICAgICAgICAgICBhdXRvIG1v dmVkRGF0YSA9IHBhcnQubW92ZURhdGEoKTsKICAgICAgICAgICAgIGF1dG8gZGF0YSA9IFRocmVh ZFNhZmVEYXRhQnVmZmVyOjpjcmVhdGUoV1RGTW92ZShtb3ZlZERhdGEpKTsKICAgICAgICAgICAg IGJsb2JEYXRhLT5hcHBlbmREYXRhKGRhdGEpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IH0KLSAgICAgICAgY2FzZSBCbG9iUGFydDo6QmxvYjogeworICAgICAgICBjYXNlIEJsb2JQYXJ0 OjpUeXBlOjpCbG9iOiB7CiAgICAgICAgICAgICBpZiAoYXV0byBibG9iID0gbV9ibG9icy5nZXQo cGFydC51cmwoKS5zdHJpbmcoKSkpIHsKICAgICAgICAgICAgICAgICBmb3IgKGNvbnN0IEJsb2JE YXRhSXRlbSYgaXRlbSA6IGJsb2ItPml0ZW1zKCkpCiAgICAgICAgICAgICAgICAgICAgIGJsb2JE YXRhLT5tX2l0ZW1zLmFwcGVuZChpdGVtKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hh cmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJD b3JlQXJndW1lbnRDb2RlcnMuY3BwCmluZGV4IDNhMGQ0Yjg3MThlM2VkNjRkOWNmYTIyMjQxZDNj NjE2ZDIzOGMxNzYuLjNlNTMyNTdjNWEwODliYzdmNTM3YTg3ZjhiZGEwMDQ4NWY1YmEwZTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAK KysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcApAQCAt MjQ3Niw0NyArMjQ3Niw0MyBAQCBib29sIEFyZ3VtZW50Q29kZXI8RmlsdGVyT3BlcmF0aW9ucz46 OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBGaWx0ZXJPcGVyYXRpb25zJgogCiB2b2lkIEFyZ3Vt ZW50Q29kZXI8QmxvYlBhcnQ+OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlciwgY29uc3QgQmxvYlBh cnQmIGJsb2JQYXJ0KQogewotICAgIGVuY29kZXIgPDwgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KGJs b2JQYXJ0LnR5cGUoKSk7CisgICAgZW5jb2RlciA8PCBibG9iUGFydC50eXBlKCk7CiAgICAgc3dp dGNoIChibG9iUGFydC50eXBlKCkpIHsKLSAgICBjYXNlIEJsb2JQYXJ0OjpEYXRhOgorICAgIGNh c2UgQmxvYlBhcnQ6OlR5cGU6OkRhdGE6CiAgICAgICAgIGVuY29kZXIgPDwgYmxvYlBhcnQuZGF0 YSgpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEJsb2JQYXJ0OjpCbG9iOgorICAgICAgICBy ZXR1cm47CisgICAgY2FzZSBCbG9iUGFydDo6VHlwZTo6QmxvYjoKICAgICAgICAgZW5jb2RlciA8 PCBibG9iUGFydC51cmwoKTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybjsKICAgICB9 CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKIE9wdGlvbmFsPEJsb2JQYXJ0PiBBcmd1 bWVudENvZGVyPEJsb2JQYXJ0Pjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7Ci0gICAgQmxv YlBhcnQgYmxvYlBhcnQ7Ci0KLSAgICBPcHRpb25hbDx1aW50MzJfdD4gdHlwZTsKKyAgICBPcHRp b25hbDxCbG9iUGFydDo6VHlwZT4gdHlwZTsKICAgICBkZWNvZGVyID4+IHR5cGU7CiAgICAgaWYg KCF0eXBlKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgc3dpdGNoICgqdHlw ZSkgewotICAgIGNhc2UgQmxvYlBhcnQ6OkRhdGE6IHsKKyAgICBjYXNlIEJsb2JQYXJ0OjpUeXBl OjpEYXRhOiB7CiAgICAgICAgIE9wdGlvbmFsPFZlY3Rvcjx1aW50OF90Pj4gZGF0YTsKICAgICAg ICAgZGVjb2RlciA+PiBkYXRhOwogICAgICAgICBpZiAoIWRhdGEpCiAgICAgICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwotICAgICAgICBibG9iUGFydCA9IEJsb2JQYXJ0KFdURk1vdmUoKmRh dGEpKTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybiBCbG9iUGFydChXVEZNb3ZlKCpk YXRhKSk7CiAgICAgfQotICAgIGNhc2UgQmxvYlBhcnQ6OkJsb2I6IHsKKyAgICBjYXNlIEJsb2JQ YXJ0OjpUeXBlOjpCbG9iOiB7CiAgICAgICAgIFVSTCB1cmw7CiAgICAgICAgIGlmICghZGVjb2Rl ci5kZWNvZGUodXJsKSkKICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgICAg IGJsb2JQYXJ0ID0gQmxvYlBhcnQodXJsKTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVy biBCbG9iUGFydCh1cmwpOwogICAgIH0KLSAgICBkZWZhdWx0OgotICAgICAgICByZXR1cm4gV1RG OjpudWxsb3B0OwogICAgIH0KIAotICAgIHJldHVybiBibG9iUGFydDsKKyAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKKyAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogfQogCiB2b2lkIEFyZ3VtZW50 Q29kZXI8VGV4dEluZGljYXRvckRhdGE+OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlciwgY29uc3Qg VGV4dEluZGljYXRvckRhdGEmIHRleHRJbmRpY2F0b3JEYXRhKQo=