236405 2022-02-09 13:46:33 -0800 Mail attachment switched to TIFF and balloons in size after markup. 2022-02-10 09:06:28 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1839393 0 megan_gardner 2022-02-09 13:46:33 -0800 Mail attachment switched to TIFF and baloons in size after markup. 1839413 1 451446 megan_gardner 2022-02-09 14:46:00 -0800 Created attachment 451446 Patch 1839427 2 451446 thorton 2022-02-09 15:08:54 -0800 Comment on attachment 451446 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451446&action=review > Source/WebKit/ChangeLog:3 > + Mail attachment switched to TIFF and baloons in size after markup. "balloons" > Source/WebKit/UIProcess/API/Cocoa/APIAttachmentCocoa.mm:157 > +NSData* Attachment::enclosingImageNSData() const all your nsdata stars are on the wrong side > Source/WebKit/UIProcess/API/Cocoa/APIAttachmentCocoa.mm:160 > + return NULL; nil in a variety of places > Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm:216 > + auto attachment = page()->attachmentForIdentifier(m_context.controlledImageAttachmentID()); > + auto itemProvider = adoptNS([[NSItemProvider alloc] initWithItem:attachment->enclosingImageNSData() typeIdentifier:attachment->utiType()]); I think there might be cases where we don't have an API attachment backing a controlled image? but I'm not sure. Maybe fall back to the old thing if you fail to get the attachment? Or maybe Wenson will tell you I'm wrong. 1839431 3 451446 wenson_hsieh 2022-02-09 15:20:21 -0800 Comment on attachment 451446 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451446&action=review > Source/WebKit/UIProcess/API/Cocoa/APIAttachmentCocoa.mm:171 > + NSData *data = [fileWrapper regularFileContents]; > + if (!data) > + return NULL; > + > + return data; Nit - I would just write this `return fileWrapper.regularFileContents;` >> Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm:216 >> + auto itemProvider = adoptNS([[NSItemProvider alloc] initWithItem:attachment->enclosingImageNSData() typeIdentifier:attachment->utiType()]); > > I think there might be cases where we don't have an API attachment backing a controlled image? but I'm not sure. Maybe fall back to the old thing if you fail to get the attachment? Or maybe Wenson will tell you I'm wrong. My understanding was that we would only allow mark up on images that are attachment-backed (i.e., backed by <object> in legacy WK1 compose). I did verify that in legacy Mail compose, remote images cannot be marked up (by replying to an email with remote images). But at any rate, using the image bitmap data as a fallback seems sensible! 1839435 4 451455 megan_gardner 2022-02-09 15:34:37 -0800 Created attachment 451455 Patch 1839445 5 451455 wenson_hsieh 2022-02-09 16:22:29 -0800 Comment on attachment 451455 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451455&action=review > Source/WebKit/UIProcess/API/APIAttachment.cpp:106 > +NSData* Attachment::enclosingImageNSData() const Nit - * is still on the wrong side here. > Source/WebKit/UIProcess/API/APIAttachment.cpp:108 > + return nullptr; Nit - `return nil;` 1839511 6 451487 megan_gardner 2022-02-09 19:47:01 -0800 Created attachment 451487 Patch for landing 1839514 7 wenson_hsieh 2022-02-09 20:00:12 -0800 The Windows build failures in https://ews-build.webkit.org/#/builders/12/builds/72990 seem legit. 1839520 8 451490 megan_gardner 2022-02-09 20:23:32 -0800 Created attachment 451490 Patch 1839675 9 451540 megan_gardner 2022-02-10 08:31:42 -0800 Created attachment 451540 Patch for landing 1839708 10 ews-feeder 2022-02-10 09:05:34 -0800 Committed r289541 (247072@main): <https://commits.webkit.org/247072@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451540. 1839709 11 webkit-bug-importer 2022-02-10 09:06:28 -0800 <rdar://problem/88758362> 451446 2022-02-09 14:46:00 -0800 2022-02-09 15:34:35 -0800 Patch bug-236405-20220209144559.patch text/plain 6871 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMWQwMWY5NGNhOTc4MDlh OGEwZTM2MmY4MmZhODVlOGU0NWEzOWYuLmMwMmRmYTE3ZmZmYTU4NmFkMGE0NDZkM2NiNjQ1YjVk Yjk3ZjIzNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjItMDItMDkgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBNYWlsIGF0dGFjaG1l bnQgc3dpdGNoZWQgdG8gVElGRiBhbmQgYmFsb29ucyBpbiBzaXplIGFmdGVyIG1hcmt1cC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQwNQorICAg ICAgICByZGFyOi8vODczNTg5MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIHB1bGxpbmcgZGF0YSBmcm9tIHRoZSB3ZWJwcm9jZXNzIHRvIHBh c3MgdG8gdGhlIFNoYXJpbmcgU2VydmljZQorICAgICAgICBmb3IgbWFya3VwLCB3ZSB3b3VsZCBj b252ZXJ0IGl0IHRvIFRJRkYgZm9ybWF0LiBUaGlzIHdvdWxkIGNhdXNlIGZpbGVzCisgICAgICAg IHRvIGluY3JlYXNlIGluIHNpemUsIGFuZCBsb3NlIHRoZWlyIG9yaWdpbmFsIGZvcm1hdHRpbmcs IGFzIHdlbGwgYXMgb3V0cmlnaHQKKyAgICAgICAgYnJlYWsgUERGcy4gSW5zdGVhZCB3ZSBzaG91 bGQgYmUgcHVsbGluZyB0aGUgZGF0YSBmcm9tIHRoZSBhdHRhY2htZW50LCB3aGljaAorICAgICAg ICBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgVUkgcHJvY2VzcyBhbmQgaXMgdGhlIHNvdXJjZSBvZiB0 cnV0aCBmb3IgdGhhdCBkYXRhIGFueXdheXMuCisgICAgICAgIFRoaXMgYWxsb3dzIHVzIHRvIGdp dmUgdGhlIGNvcnJlY3QgdHlwZSB0byB0aGUgc2hhcmluZyBzZXJ2aWNlLCBhbmQgd2Ugc2hvdWxk CisgICAgICAgIHRha2UgdGhlIGRhdGEgYmFjayBhcyB0aGUgc2FtZSBvcmlnaW5hbCB0eXBlIHdo ZW4gZ2V0dGluZyB0aGUgZGF0YSBiYWNrIGZyb20KKyAgICAgICAgbWFya3VwLiAKKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQVBJQXR0YWNobWVudC5jcHA6CisgICAgICAgIChBUEk6OkF0dGFj aG1lbnQ6OmVuY2xvc2luZ0ltYWdlRGF0YSBjb25zdCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9BUElBdHRhY2htZW50Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElBdHRh Y2htZW50Q29jb2EubW06CisgICAgICAgIChBUEk6OkF0dGFjaG1lbnQ6OmVuY2xvc2luZ0ltYWdl TlNEYXRhIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLU2hhcmluZ1NlcnZpY2VQ aWNrZXJEZWxlZ2F0ZS5tbToKKyAgICAgICAgKC1bV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVn YXRlIHNoYXJpbmdTZXJ2aWNlOmRpZFNoYXJlSXRlbXM6XSk6CisgICAgICAgICogVUlQcm9jZXNz L21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250 ZXh0TWVudVByb3h5TWFjOjpzZXR1cFNlcnZpY2VzTWVudSk6CisKIDIwMjItMDItMDkgIEFudG9p bmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW21vZGVsXSBpbXByb3Zl IHNpemluZyBvbiBtYWNPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0FQSUF0dGFjaG1lbnQuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUF0dGFj aG1lbnQuY3BwCmluZGV4IDE0OTBjNTExYmRjMzhiZDhhYjRhNjk1YWVjZjMwNmQ5NWZhYTM5Njku LjY1MmUzMWRhMDEyZjhhZWFmMTcxN2ZjNDUzZGE5NzY3YTQ5NWUxMzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQXR0YWNobWVudC5jcHAKQEAgLTEwMyw2ICsxMDMsMTEg QEAgUmVmUHRyPFdlYkNvcmU6OkZyYWdtZW50ZWRTaGFyZWRCdWZmZXI+IEF0dGFjaG1lbnQ6OmVu Y2xvc2luZ0ltYWdlRGF0YSgpIGNvbnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKK05TRGF0 YSogQXR0YWNobWVudDo6ZW5jbG9zaW5nSW1hZ2VOU0RhdGEoKSBjb25zdAoreworICAgIHJldHVy biBudWxscHRyOworfQorCiBSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiBBdHRhY2htZW50 OjpjcmVhdGVTZXJpYWxpemVkUmVwcmVzZW50YXRpb24oKSBjb25zdAogewogICAgIHJldHVybiBu dWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUF0dGFj aG1lbnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmgKaW5k ZXggZmU1MGU1MzhiOGViYjM1MWE0ODM2ZDFkZDg5M2QxNDdhNTZhODc3YS4uMjU4MGIyMTY4OWJj NTU3MWZjNWI1NzExY2ZkYWFhZTU3N2RkNWJhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0FQSUF0dGFjaG1lbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQVBJQXR0YWNobWVudC5oCkBAIC04NCw2ICs4NCw3IEBAIHB1YmxpYzoKICAgICBib29s IGlzRW1wdHkoKSBjb25zdDsKIAogICAgIFJlZlB0cjxXZWJDb3JlOjpGcmFnbWVudGVkU2hhcmVk QnVmZmVyPiBlbmNsb3NpbmdJbWFnZURhdGEoKSBjb25zdDsKKyAgICBOU0RhdGEqIGVuY2xvc2lu Z0ltYWdlTlNEYXRhKCkgY29uc3Q7CiAgICAgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gZmlsZVNp emVGb3JEaXNwbGF5KCkgY29uc3Q7CiAKICAgICB2b2lkIHNldEhhc0VuY2xvc2luZ0ltYWdlKGJv b2wgaGFzRW5jbG9zaW5nSW1hZ2UpIHsgbV9oYXNFbmNsb3NpbmdJbWFnZSA9IGhhc0VuY2xvc2lu Z0ltYWdlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev QVBJQXR0YWNobWVudENvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L0FQSUF0dGFjaG1lbnRDb2NvYS5tbQppbmRleCBkZmVmM2UwNzBmOTYxNjMwNDk3MTQ0ZGFmM2Yz MDBjYjRjYTUxOTVmLi4zY2E5MmFlZDU2YTUxMmMwNGNmM2M2NGYxN2M4YTFjMGMyMzFkNTMyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJQXR0YWNobWVu dENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElBdHRh Y2htZW50Q29jb2EubW0KQEAgLTE1NCw2ICsxNTQsMjMgQEAgUmVmUHRyPFdlYkNvcmU6OkZyYWdt ZW50ZWRTaGFyZWRCdWZmZXI+IEF0dGFjaG1lbnQ6OmVuY2xvc2luZ0ltYWdlRGF0YSgpIGNvbnN0 CiAgICAgcmV0dXJuIFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGRhdGEpOwogfQogCitO U0RhdGEqIEF0dGFjaG1lbnQ6OmVuY2xvc2luZ0ltYWdlTlNEYXRhKCkgY29uc3QKK3sKKyAgICBp ZiAoIW1faGFzRW5jbG9zaW5nSW1hZ2UpCisgICAgICAgIHJldHVybiBOVUxMOworCisgICAgYXV0 byBmaWxlV3JhcHBlciA9IHRoaXMtPmZpbGVXcmFwcGVyKCk7CisKKyAgICBpZiAoIVtmaWxlV3Jh cHBlciBpc1JlZ3VsYXJGaWxlXSkKKyAgICAgICAgcmV0dXJuIE5VTEw7CisKKyAgICBOU0RhdGEg KmRhdGEgPSBbZmlsZVdyYXBwZXIgcmVndWxhckZpbGVDb250ZW50c107CisgICAgaWYgKCFkYXRh KQorICAgICAgICByZXR1cm4gTlVMTDsKKworICAgIHJldHVybiBkYXRhOworfQorCiBib29sIEF0 dGFjaG1lbnQ6OmlzRW1wdHkoKSBjb25zdAogewogICAgIHJldHVybiAhbV9maWxlV3JhcHBlciAm JiAhbV9maWxlV3JhcHBlckdlbmVyYXRvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL21hYy9XS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUubW0gYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9tYWMvV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRlLm1tCmluZGV4 IGI4ZGY5N2FjNDM4MjNiNmJkNGE1MjY3MTg3ZDQ0MjFkYWFiNGM3MjAuLmIzMzczMWVmZTMzZmEw MjJhMDg1NDhiMWU5NmEwYWFhOTZlNmM4N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL21hYy9XS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZS5tbQpA QCAtMTQ5LDcgKzE0OSw4IEBACiAgICAgICAgIAogICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RF Q0xBUkFUSU9OU19CRUdJTgogICAgICAgICBXZWFrUHRyIHdlYWtQYWdlID0gX21lbnVQcm94eS0+ cGFnZSgpOwotICAgICAgICBbaXRlbVByb3ZpZGVyIGxvYWREYXRhUmVwcmVzZW50YXRpb25Gb3JU eXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKilrVVRUeXBlRGF0YSBjb21wbGV0aW9uSGFuZGxlcjpb d2Vha1BhZ2UsIGF0dGFjaG1lbnRJRCA9IF9hdHRhY2htZW50SURdKE5TRGF0YSAqZGF0YSwgTlNF cnJvciAqZXJyb3IpIHsKKyAgICAgICAgTlNTdHJpbmcgKml0ZW1VVEkgPSBpdGVtUHJvdmlkZXIu cmVnaXN0ZXJlZFR5cGVJZGVudGlmaWVycy5maXJzdE9iamVjdDsKKyAgICAgICAgW2l0ZW1Qcm92 aWRlciBsb2FkRGF0YVJlcHJlc2VudGF0aW9uRm9yVHlwZUlkZW50aWZpZXI6aXRlbVVUSSBjb21w bGV0aW9uSGFuZGxlcjpbd2Vha1BhZ2UsIGF0dGFjaG1lbnRJRCA9IF9hdHRhY2htZW50SUQsIGl0 ZW1VVEldKE5TRGF0YSAqZGF0YSwgTlNFcnJvciAqZXJyb3IpIHsKICAgICAgICAgICAgIFJlZlB0 ciB3ZWJQYWdlID0gd2Vha1BhZ2UuZ2V0KCk7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGlm ICghd2ViUGFnZSkKQEAgLTE2Myw3ICsxNjQsNyBAQAogICAgICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgICAgIAogICAgICAgICAgICAgYXV0byBhdHRhY2htZW50ID0gd3JhcHBlcihhcGlB dHRhY2htZW50KTsKLSAgICAgICAgICAgIFthdHRhY2htZW50IHNldERhdGE6ZGF0YSBuZXdDb250 ZW50VHlwZTpTdHJpbmcoTlNQYXN0ZWJvYXJkVHlwZVRJRkYpXTsKKyAgICAgICAgICAgIFthdHRh Y2htZW50IHNldERhdGE6ZGF0YSBuZXdDb250ZW50VHlwZTppdGVtVVRJXTsKICAgICAgICAgICAg IHdlYlBhZ2UtPmRpZEludmFsaWRhdGVEYXRhRm9yQXR0YWNobWVudCgqYXBpQXR0YWNobWVudC5n ZXQoKSk7CiAgICAgICAgIH1dOwogICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9O U19FTkQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0 TWVudVByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRN ZW51UHJveHlNYWMubW0KaW5kZXggZTFmMDJhNzA5NjNjOTUwYTA4MGQyY2NjNmRjZTEzNmMyZmQx YzU0Yy4uZGFlMzA2NTUxOWEwODQ0NGI3ZTNlNDNhOGRmOTRlMGU2NWNlYjZkOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMu bW0KQEAgLTIxMiwxNiArMjEyLDggQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzZXR1 cFNlcnZpY2VzTWVudSgpCiAgICAgYm9vbCBoYXNDb250cm9sbGVkSW1hZ2UgPSBtX2NvbnRleHQu Y29udHJvbGxlZEltYWdlKCk7CiAgICAgTlNBcnJheSAqaXRlbXMgPSBuaWw7CiAgICAgaWYgKGhh c0NvbnRyb2xsZWRJbWFnZSkgewotICAgICAgICBSZWZQdHI8U2hhcmVhYmxlQml0bWFwPiBpbWFn ZSA9IG1fY29udGV4dC5jb250cm9sbGVkSW1hZ2UoKTsKLSAgICAgICAgaWYgKCFpbWFnZSkKLSAg ICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBhdXRvIGNnSW1hZ2UgPSBpbWFnZS0+bWFrZUNH SW1hZ2UoKTsKLSAgICAgICAgYXV0byBuc0ltYWdlID0gYWRvcHROUyhbW05TSW1hZ2UgYWxsb2Nd IGluaXRXaXRoQ0dJbWFnZTpjZ0ltYWdlLmdldCgpIHNpemU6aW1hZ2UtPnNpemUoKV0pOwotCi1B TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgotICAgICAgICBhdXRvIGl0ZW1Qcm92 aWRlciA9IGFkb3B0TlMoW1tOU0l0ZW1Qcm92aWRlciBhbGxvY10gaW5pdFdpdGhJdGVtOltuc0lt YWdlIFRJRkZSZXByZXNlbnRhdGlvbl0gdHlwZUlkZW50aWZpZXI6KF9fYnJpZGdlIE5TU3RyaW5n ICopa1VUVHlwZVRJRkZdKTsKLUFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAorICAg ICAgICBhdXRvIGF0dGFjaG1lbnQgPSBwYWdlKCktPmF0dGFjaG1lbnRGb3JJZGVudGlmaWVyKG1f Y29udGV4dC5jb250cm9sbGVkSW1hZ2VBdHRhY2htZW50SUQoKSk7CisgICAgICAgIGF1dG8gaXRl bVByb3ZpZGVyID0gYWRvcHROUyhbW05TSXRlbVByb3ZpZGVyIGFsbG9jXSBpbml0V2l0aEl0ZW06 YXR0YWNobWVudC0+ZW5jbG9zaW5nSW1hZ2VOU0RhdGEoKSB0eXBlSWRlbnRpZmllcjphdHRhY2ht ZW50LT51dGlUeXBlKCldKTsKICAgICAgICAgaXRlbXMgPSBAWyBpdGVtUHJvdmlkZXIuZ2V0KCkg XTsKICAgICB9IGVsc2UgaWYgKCFtX2NvbnRleHQuY29udHJvbGxlZFNlbGVjdGlvbkRhdGEoKS5p c0VtcHR5KCkpIHsKICAgICAgICAgYXV0byBzZWxlY3Rpb25EYXRhID0gYWRvcHROUyhbW05TRGF0 YSBhbGxvY10gaW5pdFdpdGhCeXRlczpzdGF0aWNfY2FzdDxjb25zdCB2b2lkKj4obV9jb250ZXh0 LmNvbnRyb2xsZWRTZWxlY3Rpb25EYXRhKCkuZGF0YSgpKSBsZW5ndGg6bV9jb250ZXh0LmNvbnRy b2xsZWRTZWxlY3Rpb25EYXRhKCkuc2l6ZSgpXSk7Cg== 451455 2022-02-09 15:34:37 -0800 2022-02-09 19:53:14 -0800 Patch bug-236405-20220209153436.patch text/plain 7562 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMWQwMWY5NGNhOTc4MDlh OGEwZTM2MmY4MmZhODVlOGU0NWEzOWYuLjBhZDk2MjU0Y2QwZDRlOGUzNTA0ZTliNjQ3Mzc5YTky YjQ3ZDUxZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjItMDItMDkgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBNYWlsIGF0dGFjaG1l bnQgc3dpdGNoZWQgdG8gVElGRiBhbmQgYmFsbG9vbnMgaW4gc2l6ZSBhZnRlciBtYXJrdXAuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY0MDUKKyAg ICAgICAgcmRhcjovLzg3MzU4OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiBwdWxsaW5nIGRhdGEgZnJvbSB0aGUgd2VicHJvY2VzcyB0byBw YXNzIHRvIHRoZSBTaGFyaW5nIFNlcnZpY2UKKyAgICAgICAgZm9yIG1hcmt1cCwgd2Ugd291bGQg Y29udmVydCBpdCB0byBUSUZGIGZvcm1hdC4gVGhpcyB3b3VsZCBjYXVzZSBmaWxlcworICAgICAg ICB0byBpbmNyZWFzZSBpbiBzaXplLCBhbmQgbG9zZSB0aGVpciBvcmlnaW5hbCBmb3JtYXR0aW5n LCBhcyB3ZWxsIGFzIG91dHJpZ2h0CisgICAgICAgIGJyZWFrIFBERnMuIEluc3RlYWQgd2Ugc2hv dWxkIGJlIHB1bGxpbmcgdGhlIGRhdGEgZnJvbSB0aGUgYXR0YWNobWVudCwgd2hpY2gKKyAgICAg ICAgYWxyZWFkeSBleGlzdHMgaW4gdGhlIFVJIHByb2Nlc3MgYW5kIGlzIHRoZSBzb3VyY2Ugb2Yg dHJ1dGggZm9yIHRoYXQgZGF0YSBhbnl3YXlzLgorICAgICAgICBUaGlzIGFsbG93cyB1cyB0byBn aXZlIHRoZSBjb3JyZWN0IHR5cGUgdG8gdGhlIHNoYXJpbmcgc2VydmljZSwgYW5kIHdlIHNob3Vs ZAorICAgICAgICB0YWtlIHRoZSBkYXRhIGJhY2sgYXMgdGhlIHNhbWUgb3JpZ2luYWwgdHlwZSB3 aGVuIGdldHRpbmcgdGhlIGRhdGEgYmFjayBmcm9tCisgICAgICAgIG1hcmt1cC4gCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0FQSUF0dGFjaG1lbnQuY3BwOgorICAgICAgICAoQVBJOjpBdHRh Y2htZW50OjplbmNsb3NpbmdJbWFnZURhdGEgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQVBJQXR0YWNobWVudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJQXR0 YWNobWVudENvY29hLm1tOgorICAgICAgICAoQVBJOjpBdHRhY2htZW50OjplbmNsb3NpbmdJbWFn ZU5TRGF0YSBjb25zdCk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS1NoYXJpbmdTZXJ2aWNl UGlja2VyRGVsZWdhdGUubW06CisgICAgICAgICgtW1dLU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxl Z2F0ZSBzaGFyaW5nU2VydmljZTpkaWRTaGFyZUl0ZW1zOl0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29u dGV4dE1lbnVQcm94eU1hYzo6c2V0dXBTZXJ2aWNlc01lbnUpOgorCiAyMDIyLTAyLTA5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFttb2RlbF0gaW1wcm92 ZSBzaXppbmcgb24gbWFjT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9BUElBdHRhY2htZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElBdHRh Y2htZW50LmNwcAppbmRleCAxNDkwYzUxMWJkYzM4YmQ4YWI0YTY5NWFlY2YzMDZkOTVmYWEzOTY5 Li42NTJlMzFkYTAxMmY4YWVhZjE3MTdmYzQ1M2RhOTc2N2E0OTVlMTM5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQXR0YWNobWVudC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUF0dGFjaG1lbnQuY3BwCkBAIC0xMDMsNiArMTAzLDEx IEBAIFJlZlB0cjxXZWJDb3JlOjpGcmFnbWVudGVkU2hhcmVkQnVmZmVyPiBBdHRhY2htZW50Ojpl bmNsb3NpbmdJbWFnZURhdGEoKSBjb25zdAogICAgIHJldHVybiBudWxscHRyOwogfQogCitOU0Rh dGEqIEF0dGFjaG1lbnQ6OmVuY2xvc2luZ0ltYWdlTlNEYXRhKCkgY29uc3QKK3sKKyAgICByZXR1 cm4gbnVsbHB0cjsKK30KKwogUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gQXR0YWNobWVu dDo6Y3JlYXRlU2VyaWFsaXplZFJlcHJlc2VudGF0aW9uKCkgY29uc3QKIHsKICAgICByZXR1cm4g bnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElBdHRh Y2htZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQXR0YWNobWVudC5oCmlu ZGV4IGZlNTBlNTM4YjhlYmIzNTFhNDgzNmQxZGQ4OTNkMTQ3YTU2YTg3N2EuLjQ4ZTZmZWM5Y2E1 ZTc0MWEyM2FhN2MzZTY3ZmZmZmE1MGE5NDI3Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0FQSUF0dGFjaG1lbnQuaApAQCAtODQsNiArODQsNyBAQCBwdWJsaWM6CiAgICAgYm9v bCBpc0VtcHR5KCkgY29uc3Q7CiAKICAgICBSZWZQdHI8V2ViQ29yZTo6RnJhZ21lbnRlZFNoYXJl ZEJ1ZmZlcj4gZW5jbG9zaW5nSW1hZ2VEYXRhKCkgY29uc3Q7CisgICAgTlNEYXRhICplbmNsb3Np bmdJbWFnZU5TRGF0YSgpIGNvbnN0OwogICAgIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZpbGVT aXplRm9yRGlzcGxheSgpIGNvbnN0OwogCiAgICAgdm9pZCBzZXRIYXNFbmNsb3NpbmdJbWFnZShi b29sIGhhc0VuY2xvc2luZ0ltYWdlKSB7IG1faGFzRW5jbG9zaW5nSW1hZ2UgPSBoYXNFbmNsb3Np bmdJbWFnZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L0FQSUF0dGFjaG1lbnRDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9BUElBdHRhY2htZW50Q29jb2EubW0KaW5kZXggZGZlZjNlMDcwZjk2MTYzMDQ5NzE0NGRhZjNm MzAwY2I0Y2E1MTk1Zi4uZTcyY2RlY2YwMGJlZTM0YzVjMzFiNTY3OTE0ZjllYWU5OGU3MGFjNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFjaG1l bnRDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJQXR0 YWNobWVudENvY29hLm1tCkBAIC0xNTQsNiArMTU0LDE5IEBAIFJlZlB0cjxXZWJDb3JlOjpGcmFn bWVudGVkU2hhcmVkQnVmZmVyPiBBdHRhY2htZW50OjplbmNsb3NpbmdJbWFnZURhdGEoKSBjb25z dAogICAgIHJldHVybiBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShkYXRhKTsKIH0KIAor TlNEYXRhICpBdHRhY2htZW50OjplbmNsb3NpbmdJbWFnZU5TRGF0YSgpIGNvbnN0Cit7CisgICAg aWYgKCFtX2hhc0VuY2xvc2luZ0ltYWdlKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgYXV0 byBmaWxlV3JhcHBlciA9IHRoaXMtPmZpbGVXcmFwcGVyKCk7CisKKyAgICBpZiAoIVtmaWxlV3Jh cHBlciBpc1JlZ3VsYXJGaWxlXSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJldHVybiBm aWxlV3JhcHBlci5yZWd1bGFyRmlsZUNvbnRlbnRzOworfQorCiBib29sIEF0dGFjaG1lbnQ6Omlz RW1wdHkoKSBjb25zdAogewogICAgIHJldHVybiAhbV9maWxlV3JhcHBlciAmJiAhbV9maWxlV3Jh cHBlckdlbmVyYXRvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9X S1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9tYWMvV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRlLm1tCmluZGV4IGI4ZGY5N2FjNDM4 MjNiNmJkNGE1MjY3MTg3ZDQ0MjFkYWFiNGM3MjAuLmIzMzczMWVmZTMzZmEwMjJhMDg1NDhiMWU5 NmEwYWFhOTZlNmM4N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9X S1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvbWFjL1dLU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZS5tbQpAQCAtMTQ5LDcgKzE0 OSw4IEBACiAgICAgICAgIAogICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19C RUdJTgogICAgICAgICBXZWFrUHRyIHdlYWtQYWdlID0gX21lbnVQcm94eS0+cGFnZSgpOwotICAg ICAgICBbaXRlbVByb3ZpZGVyIGxvYWREYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmll cjooTlNTdHJpbmcgKilrVVRUeXBlRGF0YSBjb21wbGV0aW9uSGFuZGxlcjpbd2Vha1BhZ2UsIGF0 dGFjaG1lbnRJRCA9IF9hdHRhY2htZW50SURdKE5TRGF0YSAqZGF0YSwgTlNFcnJvciAqZXJyb3Ip IHsKKyAgICAgICAgTlNTdHJpbmcgKml0ZW1VVEkgPSBpdGVtUHJvdmlkZXIucmVnaXN0ZXJlZFR5 cGVJZGVudGlmaWVycy5maXJzdE9iamVjdDsKKyAgICAgICAgW2l0ZW1Qcm92aWRlciBsb2FkRGF0 YVJlcHJlc2VudGF0aW9uRm9yVHlwZUlkZW50aWZpZXI6aXRlbVVUSSBjb21wbGV0aW9uSGFuZGxl cjpbd2Vha1BhZ2UsIGF0dGFjaG1lbnRJRCA9IF9hdHRhY2htZW50SUQsIGl0ZW1VVEldKE5TRGF0 YSAqZGF0YSwgTlNFcnJvciAqZXJyb3IpIHsKICAgICAgICAgICAgIFJlZlB0ciB3ZWJQYWdlID0g d2Vha1BhZ2UuZ2V0KCk7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGlmICghd2ViUGFnZSkK QEAgLTE2Myw3ICsxNjQsNyBAQAogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAg IAogICAgICAgICAgICAgYXV0byBhdHRhY2htZW50ID0gd3JhcHBlcihhcGlBdHRhY2htZW50KTsK LSAgICAgICAgICAgIFthdHRhY2htZW50IHNldERhdGE6ZGF0YSBuZXdDb250ZW50VHlwZTpTdHJp bmcoTlNQYXN0ZWJvYXJkVHlwZVRJRkYpXTsKKyAgICAgICAgICAgIFthdHRhY2htZW50IHNldERh dGE6ZGF0YSBuZXdDb250ZW50VHlwZTppdGVtVVRJXTsKICAgICAgICAgICAgIHdlYlBhZ2UtPmRp ZEludmFsaWRhdGVEYXRhRm9yQXR0YWNobWVudCgqYXBpQXR0YWNobWVudC5nZXQoKSk7CiAgICAg ICAgIH1dOwogICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFj Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMu bW0KaW5kZXggZTFmMDJhNzA5NjNjOTUwYTA4MGQyY2NjNmRjZTEzNmMyZmQxYzU0Yy4uNjhhYzc0 MTBmNTllYWU4NDU4YWY2NDIxZmMzZmQyYTAyNTk1ZjRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KQEAgLTIxMiwx NyArMjEyLDIzIEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2V0dXBTZXJ2aWNlc01l bnUoKQogICAgIGJvb2wgaGFzQ29udHJvbGxlZEltYWdlID0gbV9jb250ZXh0LmNvbnRyb2xsZWRJ bWFnZSgpOwogICAgIE5TQXJyYXkgKml0ZW1zID0gbmlsOwogICAgIGlmIChoYXNDb250cm9sbGVk SW1hZ2UpIHsKLSAgICAgICAgUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gaW1hZ2UgPSBtX2NvbnRl eHQuY29udHJvbGxlZEltYWdlKCk7Ci0gICAgICAgIGlmICghaW1hZ2UpCi0gICAgICAgICAgICBy ZXR1cm47Ci0KLSAgICAgICAgYXV0byBjZ0ltYWdlID0gaW1hZ2UtPm1ha2VDR0ltYWdlKCk7Ci0g ICAgICAgIGF1dG8gbnNJbWFnZSA9IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENH SW1hZ2U6Y2dJbWFnZS5nZXQoKSBzaXplOmltYWdlLT5zaXplKCldKTsKKyAgICAgICAgYXV0byBh dHRhY2htZW50ID0gcGFnZSgpLT5hdHRhY2htZW50Rm9ySWRlbnRpZmllcihtX2NvbnRleHQuY29u dHJvbGxlZEltYWdlQXR0YWNobWVudElEKCkpOworICAgICAgICBSZXRhaW5QdHI8TlNJdGVtUHJv dmlkZXI+IGl0ZW1Qcm92aWRlcjsKKyAgICAgICAgaWYgKGF0dGFjaG1lbnQpCisgICAgICAgICAg ICBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRXaXRo SXRlbTphdHRhY2htZW50LT5lbmNsb3NpbmdJbWFnZU5TRGF0YSgpIHR5cGVJZGVudGlmaWVyOmF0 dGFjaG1lbnQtPnV0aVR5cGUoKV0pOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIFJlZlB0 cjxTaGFyZWFibGVCaXRtYXA+IGltYWdlID0gbV9jb250ZXh0LmNvbnRyb2xsZWRJbWFnZSgpOwor ICAgICAgICAgICAgaWYgKCFpbWFnZSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICBhdXRvIGNnSW1hZ2UgPSBpbWFnZS0+bWFrZUNHSW1hZ2UoKTsKKyAgICAgICAgICAgIGF1 dG8gbnNJbWFnZSA9IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJ bWFnZS5nZXQoKSBzaXplOmltYWdlLT5zaXplKCldKTsKIAotQUxMT1dfREVQUkVDQVRFRF9ERUNM QVJBVElPTlNfQkVHSU4KLSAgICAgICAgYXV0byBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJ dGVtUHJvdmlkZXIgYWxsb2NdIGluaXRXaXRoSXRlbTpbbnNJbWFnZSBUSUZGUmVwcmVzZW50YXRp b25dIHR5cGVJZGVudGlmaWVyOihfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVUSUZGXSk7Ci1B TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKyAgICAgICAgICAgIEFMTE9XX0RFUFJF Q0FURURfREVDTEFSQVRJT05TX0JFR0lOCisgICAgICAgICAgICBpdGVtUHJvdmlkZXIgPSBhZG9w dE5TKFtbTlNJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRXaXRoSXRlbTpbbnNJbWFnZSBUSUZGUmVw cmVzZW50YXRpb25dIHR5cGVJZGVudGlmaWVyOihfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVU SUZGXSk7CisgICAgICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKyAg ICAgICAgfQogICAgICAgICBpdGVtcyA9IEBbIGl0ZW1Qcm92aWRlci5nZXQoKSBdOworICAgICAg ICAKICAgICB9IGVsc2UgaWYgKCFtX2NvbnRleHQuY29udHJvbGxlZFNlbGVjdGlvbkRhdGEoKS5p c0VtcHR5KCkpIHsKICAgICAgICAgYXV0byBzZWxlY3Rpb25EYXRhID0gYWRvcHROUyhbW05TRGF0 YSBhbGxvY10gaW5pdFdpdGhCeXRlczpzdGF0aWNfY2FzdDxjb25zdCB2b2lkKj4obV9jb250ZXh0 LmNvbnRyb2xsZWRTZWxlY3Rpb25EYXRhKCkuZGF0YSgpKSBsZW5ndGg6bV9jb250ZXh0LmNvbnRy b2xsZWRTZWxlY3Rpb25EYXRhKCkuc2l6ZSgpXSk7CiAgICAgICAgIGF1dG8gc2VsZWN0aW9uID0g YWRvcHROUyhbW05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhSVEZEOnNlbGVjdGlv bkRhdGEuZ2V0KCkgZG9jdW1lbnRBdHRyaWJ1dGVzOm5pbF0pOwo= 451487 2022-02-09 19:47:01 -0800 2022-02-10 08:31:39 -0800 Patch for landing bug-236405-20220209194700.patch text/plain 7556 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMWQwMWY5NGNhOTc4MDlh OGEwZTM2MmY4MmZhODVlOGU0NWEzOWYuLjg5ODNiYmQzMTQyNzlkOTI2MjliM2FjNTY5YTM0ODBi N2QzMTdkMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjItMDItMDkgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBNYWlsIGF0dGFjaG1l bnQgc3dpdGNoZWQgdG8gVElGRiBhbmQgYmFsbG9vbnMgaW4gc2l6ZSBhZnRlciBtYXJrdXAuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY0MDUKKyAg ICAgICAgcmRhcjovLzg3MzU4OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFdoZW4gcHVsbGluZyBkYXRhIGZyb20gdGhlIHdlYnByb2Nlc3MgdG8gcGFz cyB0byB0aGUgU2hhcmluZyBTZXJ2aWNlCisgICAgICAgIGZvciBtYXJrdXAsIHdlIHdvdWxkIGNv bnZlcnQgaXQgdG8gVElGRiBmb3JtYXQuIFRoaXMgd291bGQgY2F1c2UgZmlsZXMKKyAgICAgICAg dG8gaW5jcmVhc2UgaW4gc2l6ZSwgYW5kIGxvc2UgdGhlaXIgb3JpZ2luYWwgZm9ybWF0dGluZywg YXMgd2VsbCBhcyBvdXRyaWdodAorICAgICAgICBicmVhayBQREZzLiBJbnN0ZWFkIHdlIHNob3Vs ZCBiZSBwdWxsaW5nIHRoZSBkYXRhIGZyb20gdGhlIGF0dGFjaG1lbnQsIHdoaWNoCisgICAgICAg IGFscmVhZHkgZXhpc3RzIGluIHRoZSBVSSBwcm9jZXNzIGFuZCBpcyB0aGUgc291cmNlIG9mIHRy dXRoIGZvciB0aGF0IGRhdGEgYW55d2F5cy4KKyAgICAgICAgVGhpcyBhbGxvd3MgdXMgdG8gZ2l2 ZSB0aGUgY29ycmVjdCB0eXBlIHRvIHRoZSBzaGFyaW5nIHNlcnZpY2UsIGFuZCB3ZSBzaG91bGQK KyAgICAgICAgdGFrZSB0aGUgZGF0YSBiYWNrIGFzIHRoZSBzYW1lIG9yaWdpbmFsIHR5cGUgd2hl biBnZXR0aW5nIHRoZSBkYXRhIGJhY2sgZnJvbQorICAgICAgICBtYXJrdXAuIAorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmNwcDoKKyAgICAgICAgKEFQSTo6QXR0YWNo bWVudDo6ZW5jbG9zaW5nSW1hZ2VEYXRhIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0FQSUF0dGFjaG1lbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFj aG1lbnRDb2NvYS5tbToKKyAgICAgICAgKEFQSTo6QXR0YWNobWVudDo6ZW5jbG9zaW5nSW1hZ2VO U0RhdGEgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tTaGFyaW5nU2VydmljZVBp Y2tlckRlbGVnYXRlLm1tOgorICAgICAgICAoLVtXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdh dGUgc2hhcmluZ1NlcnZpY2U6ZGlkU2hhcmVJdGVtczpdKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv bWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRl eHRNZW51UHJveHlNYWM6OnNldHVwU2VydmljZXNNZW51KToKKwogMjAyMi0wMi0wOSAgQW50b2lu ZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbbW9kZWxdIGltcHJvdmUg c2l6aW5nIG9uIG1hY09TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv QVBJQXR0YWNobWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQXR0YWNo bWVudC5jcHAKaW5kZXggMTQ5MGM1MTFiZGMzOGJkOGFiNGE2OTVhZWNmMzA2ZDk1ZmFhMzk2OS4u NGQ1OTE5NDMyNjczMmUxNDg1YjJlOTM0NDk4NzE3ZWEyODYxYjdhNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUF0dGFjaG1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmNwcApAQCAtMTAzLDYgKzEwMywxMSBA QCBSZWZQdHI8V2ViQ29yZTo6RnJhZ21lbnRlZFNoYXJlZEJ1ZmZlcj4gQXR0YWNobWVudDo6ZW5j bG9zaW5nSW1hZ2VEYXRhKCkgY29uc3QKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAorTlNEYXRh ICpBdHRhY2htZW50OjplbmNsb3NpbmdJbWFnZU5TRGF0YSgpIGNvbnN0Cit7CisgICAgcmV0dXJu IG5pbDsKK30KKwogUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gQXR0YWNobWVudDo6Y3Jl YXRlU2VyaWFsaXplZFJlcHJlc2VudGF0aW9uKCkgY29uc3QKIHsKICAgICByZXR1cm4gbnVsbHB0 cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50 LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQXR0YWNobWVudC5oCmluZGV4IGZl NTBlNTM4YjhlYmIzNTFhNDgzNmQxZGQ4OTNkMTQ3YTU2YTg3N2EuLjQ4ZTZmZWM5Y2E1ZTc0MWEy M2FhN2MzZTY3ZmZmZmE1MGE5NDI3Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9BUElBdHRhY2htZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0FQSUF0dGFjaG1lbnQuaApAQCAtODQsNiArODQsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0Vt cHR5KCkgY29uc3Q7CiAKICAgICBSZWZQdHI8V2ViQ29yZTo6RnJhZ21lbnRlZFNoYXJlZEJ1ZmZl cj4gZW5jbG9zaW5nSW1hZ2VEYXRhKCkgY29uc3Q7CisgICAgTlNEYXRhICplbmNsb3NpbmdJbWFn ZU5TRGF0YSgpIGNvbnN0OwogICAgIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZpbGVTaXplRm9y RGlzcGxheSgpIGNvbnN0OwogCiAgICAgdm9pZCBzZXRIYXNFbmNsb3NpbmdJbWFnZShib29sIGhh c0VuY2xvc2luZ0ltYWdlKSB7IG1faGFzRW5jbG9zaW5nSW1hZ2UgPSBoYXNFbmNsb3NpbmdJbWFn ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0 dGFjaG1lbnRDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElB dHRhY2htZW50Q29jb2EubW0KaW5kZXggZGZlZjNlMDcwZjk2MTYzMDQ5NzE0NGRhZjNmMzAwY2I0 Y2E1MTk1Zi4uZTcyY2RlY2YwMGJlZTM0YzVjMzFiNTY3OTE0ZjllYWU5OGU3MGFjNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFjaG1lbnRDb2Nv YS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJQXR0YWNobWVu dENvY29hLm1tCkBAIC0xNTQsNiArMTU0LDE5IEBAIFJlZlB0cjxXZWJDb3JlOjpGcmFnbWVudGVk U2hhcmVkQnVmZmVyPiBBdHRhY2htZW50OjplbmNsb3NpbmdJbWFnZURhdGEoKSBjb25zdAogICAg IHJldHVybiBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShkYXRhKTsKIH0KIAorTlNEYXRh ICpBdHRhY2htZW50OjplbmNsb3NpbmdJbWFnZU5TRGF0YSgpIGNvbnN0Cit7CisgICAgaWYgKCFt X2hhc0VuY2xvc2luZ0ltYWdlKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgYXV0byBmaWxl V3JhcHBlciA9IHRoaXMtPmZpbGVXcmFwcGVyKCk7CisKKyAgICBpZiAoIVtmaWxlV3JhcHBlciBp c1JlZ3VsYXJGaWxlXSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJldHVybiBmaWxlV3Jh cHBlci5yZWd1bGFyRmlsZUNvbnRlbnRzOworfQorCiBib29sIEF0dGFjaG1lbnQ6OmlzRW1wdHko KSBjb25zdAogewogICAgIHJldHVybiAhbV9maWxlV3JhcHBlciAmJiAhbV9maWxlV3JhcHBlckdl bmVyYXRvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1NoYXJp bmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMv V0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRlLm1tCmluZGV4IGI4ZGY5N2FjNDM4MjNiNmJk NGE1MjY3MTg3ZDQ0MjFkYWFiNGM3MjAuLmIzMzczMWVmZTMzZmEwMjJhMDg1NDhiMWU5NmEwYWFh OTZlNmM4N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1NoYXJp bmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv bWFjL1dLU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZS5tbQpAQCAtMTQ5LDcgKzE0OSw4IEBA CiAgICAgICAgIAogICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgog ICAgICAgICBXZWFrUHRyIHdlYWtQYWdlID0gX21lbnVQcm94eS0+cGFnZSgpOwotICAgICAgICBb aXRlbVByb3ZpZGVyIGxvYWREYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjooTlNT dHJpbmcgKilrVVRUeXBlRGF0YSBjb21wbGV0aW9uSGFuZGxlcjpbd2Vha1BhZ2UsIGF0dGFjaG1l bnRJRCA9IF9hdHRhY2htZW50SURdKE5TRGF0YSAqZGF0YSwgTlNFcnJvciAqZXJyb3IpIHsKKyAg ICAgICAgTlNTdHJpbmcgKml0ZW1VVEkgPSBpdGVtUHJvdmlkZXIucmVnaXN0ZXJlZFR5cGVJZGVu dGlmaWVycy5maXJzdE9iamVjdDsKKyAgICAgICAgW2l0ZW1Qcm92aWRlciBsb2FkRGF0YVJlcHJl c2VudGF0aW9uRm9yVHlwZUlkZW50aWZpZXI6aXRlbVVUSSBjb21wbGV0aW9uSGFuZGxlcjpbd2Vh a1BhZ2UsIGF0dGFjaG1lbnRJRCA9IF9hdHRhY2htZW50SUQsIGl0ZW1VVEldKE5TRGF0YSAqZGF0 YSwgTlNFcnJvciAqZXJyb3IpIHsKICAgICAgICAgICAgIFJlZlB0ciB3ZWJQYWdlID0gd2Vha1Bh Z2UuZ2V0KCk7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGlmICghd2ViUGFnZSkKQEAgLTE2 Myw3ICsxNjQsNyBAQAogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIAogICAg ICAgICAgICAgYXV0byBhdHRhY2htZW50ID0gd3JhcHBlcihhcGlBdHRhY2htZW50KTsKLSAgICAg ICAgICAgIFthdHRhY2htZW50IHNldERhdGE6ZGF0YSBuZXdDb250ZW50VHlwZTpTdHJpbmcoTlNQ YXN0ZWJvYXJkVHlwZVRJRkYpXTsKKyAgICAgICAgICAgIFthdHRhY2htZW50IHNldERhdGE6ZGF0 YSBuZXdDb250ZW50VHlwZTppdGVtVVRJXTsKICAgICAgICAgICAgIHdlYlBhZ2UtPmRpZEludmFs aWRhdGVEYXRhRm9yQXR0YWNobWVudCgqYXBpQXR0YWNobWVudC5nZXQoKSk7CiAgICAgICAgIH1d OwogICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KaW5k ZXggZTFmMDJhNzA5NjNjOTUwYTA4MGQyY2NjNmRjZTEzNmMyZmQxYzU0Yy4uNjhhYzc0MTBmNTll YWU4NDU4YWY2NDIxZmMzZmQyYTAyNTk1ZjRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KQEAgLTIxMiwxNyArMjEy LDIzIEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2V0dXBTZXJ2aWNlc01lbnUoKQog ICAgIGJvb2wgaGFzQ29udHJvbGxlZEltYWdlID0gbV9jb250ZXh0LmNvbnRyb2xsZWRJbWFnZSgp OwogICAgIE5TQXJyYXkgKml0ZW1zID0gbmlsOwogICAgIGlmIChoYXNDb250cm9sbGVkSW1hZ2Up IHsKLSAgICAgICAgUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gaW1hZ2UgPSBtX2NvbnRleHQuY29u dHJvbGxlZEltYWdlKCk7Ci0gICAgICAgIGlmICghaW1hZ2UpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgYXV0byBjZ0ltYWdlID0gaW1hZ2UtPm1ha2VDR0ltYWdlKCk7Ci0gICAgICAg IGF1dG8gbnNJbWFnZSA9IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6 Y2dJbWFnZS5nZXQoKSBzaXplOmltYWdlLT5zaXplKCldKTsKKyAgICAgICAgYXV0byBhdHRhY2ht ZW50ID0gcGFnZSgpLT5hdHRhY2htZW50Rm9ySWRlbnRpZmllcihtX2NvbnRleHQuY29udHJvbGxl ZEltYWdlQXR0YWNobWVudElEKCkpOworICAgICAgICBSZXRhaW5QdHI8TlNJdGVtUHJvdmlkZXI+ IGl0ZW1Qcm92aWRlcjsKKyAgICAgICAgaWYgKGF0dGFjaG1lbnQpCisgICAgICAgICAgICBpdGVt UHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRXaXRoSXRlbTph dHRhY2htZW50LT5lbmNsb3NpbmdJbWFnZU5TRGF0YSgpIHR5cGVJZGVudGlmaWVyOmF0dGFjaG1l bnQtPnV0aVR5cGUoKV0pOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIFJlZlB0cjxTaGFy ZWFibGVCaXRtYXA+IGltYWdlID0gbV9jb250ZXh0LmNvbnRyb2xsZWRJbWFnZSgpOworICAgICAg ICAgICAgaWYgKCFpbWFnZSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBh dXRvIGNnSW1hZ2UgPSBpbWFnZS0+bWFrZUNHSW1hZ2UoKTsKKyAgICAgICAgICAgIGF1dG8gbnNJ bWFnZSA9IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJbWFnZS5n ZXQoKSBzaXplOmltYWdlLT5zaXplKCldKTsKIAotQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElP TlNfQkVHSU4KLSAgICAgICAgYXV0byBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJdGVtUHJv dmlkZXIgYWxsb2NdIGluaXRXaXRoSXRlbTpbbnNJbWFnZSBUSUZGUmVwcmVzZW50YXRpb25dIHR5 cGVJZGVudGlmaWVyOihfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVUSUZGXSk7Ci1BTExPV19E RVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKyAgICAgICAgICAgIEFMTE9XX0RFUFJFQ0FURURf REVDTEFSQVRJT05TX0JFR0lOCisgICAgICAgICAgICBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtb TlNJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRXaXRoSXRlbTpbbnNJbWFnZSBUSUZGUmVwcmVzZW50 YXRpb25dIHR5cGVJZGVudGlmaWVyOihfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVUSUZGXSk7 CisgICAgICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKyAgICAgICAg fQogICAgICAgICBpdGVtcyA9IEBbIGl0ZW1Qcm92aWRlci5nZXQoKSBdOworICAgICAgICAKICAg ICB9IGVsc2UgaWYgKCFtX2NvbnRleHQuY29udHJvbGxlZFNlbGVjdGlvbkRhdGEoKS5pc0VtcHR5 KCkpIHsKICAgICAgICAgYXV0byBzZWxlY3Rpb25EYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxv Y10gaW5pdFdpdGhCeXRlczpzdGF0aWNfY2FzdDxjb25zdCB2b2lkKj4obV9jb250ZXh0LmNvbnRy b2xsZWRTZWxlY3Rpb25EYXRhKCkuZGF0YSgpKSBsZW5ndGg6bV9jb250ZXh0LmNvbnRyb2xsZWRT ZWxlY3Rpb25EYXRhKCkuc2l6ZSgpXSk7CiAgICAgICAgIGF1dG8gc2VsZWN0aW9uID0gYWRvcHRO UyhbW05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhSVEZEOnNlbGVjdGlvbkRhdGEu Z2V0KCkgZG9jdW1lbnRBdHRyaWJ1dGVzOm5pbF0pOwo= 451490 2022-02-09 20:23:32 -0800 2022-02-10 08:31:40 -0800 Patch bug-236405-20220209202331.patch text/plain 6971 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMWQwMWY5NGNhOTc4MDlh OGEwZTM2MmY4MmZhODVlOGU0NWEzOWYuLjg5ODNiYmQzMTQyNzlkOTI2MjliM2FjNTY5YTM0ODBi N2QzMTdkMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjItMDItMDkgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBNYWlsIGF0dGFjaG1l bnQgc3dpdGNoZWQgdG8gVElGRiBhbmQgYmFsbG9vbnMgaW4gc2l6ZSBhZnRlciBtYXJrdXAuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY0MDUKKyAg ICAgICAgcmRhcjovLzg3MzU4OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFdoZW4gcHVsbGluZyBkYXRhIGZyb20gdGhlIHdlYnByb2Nlc3MgdG8gcGFz cyB0byB0aGUgU2hhcmluZyBTZXJ2aWNlCisgICAgICAgIGZvciBtYXJrdXAsIHdlIHdvdWxkIGNv bnZlcnQgaXQgdG8gVElGRiBmb3JtYXQuIFRoaXMgd291bGQgY2F1c2UgZmlsZXMKKyAgICAgICAg dG8gaW5jcmVhc2UgaW4gc2l6ZSwgYW5kIGxvc2UgdGhlaXIgb3JpZ2luYWwgZm9ybWF0dGluZywg YXMgd2VsbCBhcyBvdXRyaWdodAorICAgICAgICBicmVhayBQREZzLiBJbnN0ZWFkIHdlIHNob3Vs ZCBiZSBwdWxsaW5nIHRoZSBkYXRhIGZyb20gdGhlIGF0dGFjaG1lbnQsIHdoaWNoCisgICAgICAg IGFscmVhZHkgZXhpc3RzIGluIHRoZSBVSSBwcm9jZXNzIGFuZCBpcyB0aGUgc291cmNlIG9mIHRy dXRoIGZvciB0aGF0IGRhdGEgYW55d2F5cy4KKyAgICAgICAgVGhpcyBhbGxvd3MgdXMgdG8gZ2l2 ZSB0aGUgY29ycmVjdCB0eXBlIHRvIHRoZSBzaGFyaW5nIHNlcnZpY2UsIGFuZCB3ZSBzaG91bGQK KyAgICAgICAgdGFrZSB0aGUgZGF0YSBiYWNrIGFzIHRoZSBzYW1lIG9yaWdpbmFsIHR5cGUgd2hl biBnZXR0aW5nIHRoZSBkYXRhIGJhY2sgZnJvbQorICAgICAgICBtYXJrdXAuIAorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmNwcDoKKyAgICAgICAgKEFQSTo6QXR0YWNo bWVudDo6ZW5jbG9zaW5nSW1hZ2VEYXRhIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0FQSUF0dGFjaG1lbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFj aG1lbnRDb2NvYS5tbToKKyAgICAgICAgKEFQSTo6QXR0YWNobWVudDo6ZW5jbG9zaW5nSW1hZ2VO U0RhdGEgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tTaGFyaW5nU2VydmljZVBp Y2tlckRlbGVnYXRlLm1tOgorICAgICAgICAoLVtXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdh dGUgc2hhcmluZ1NlcnZpY2U6ZGlkU2hhcmVJdGVtczpdKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv bWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRl eHRNZW51UHJveHlNYWM6OnNldHVwU2VydmljZXNNZW51KToKKwogMjAyMi0wMi0wOSAgQW50b2lu ZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbbW9kZWxdIGltcHJvdmUg c2l6aW5nIG9uIG1hY09TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv QVBJQXR0YWNobWVudC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUF0dGFjaG1l bnQuaAppbmRleCBmZTUwZTUzOGI4ZWJiMzUxYTQ4MzZkMWRkODkzZDE0N2E1NmE4NzdhLi43OThl NWViZDZkYjI3YWIzNTM0NTU3OWE3NTc1OWI2ZWRkZTI2MGY3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQXR0YWNobWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmgKQEAgLTg0LDYgKzg0LDkgQEAgcHVibGljOgog ICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0OwogCiAgICAgUmVmUHRyPFdlYkNvcmU6OkZyYWdtZW50 ZWRTaGFyZWRCdWZmZXI+IGVuY2xvc2luZ0ltYWdlRGF0YSgpIGNvbnN0OworI2lmIFBMQVRGT1JN KENPQ09BKQorICAgIE5TRGF0YSAqZW5jbG9zaW5nSW1hZ2VOU0RhdGEoKSBjb25zdDsKKyNlbmRp ZgogICAgIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZpbGVTaXplRm9yRGlzcGxheSgpIGNvbnN0 OwogCiAgICAgdm9pZCBzZXRIYXNFbmNsb3NpbmdJbWFnZShib29sIGhhc0VuY2xvc2luZ0ltYWdl KSB7IG1faGFzRW5jbG9zaW5nSW1hZ2UgPSBoYXNFbmNsb3NpbmdJbWFnZTsgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFjaG1lbnRDb2NvYS5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElBdHRhY2htZW50Q29jb2Eu bW0KaW5kZXggZGZlZjNlMDcwZjk2MTYzMDQ5NzE0NGRhZjNmMzAwY2I0Y2E1MTk1Zi4uZTcyY2Rl Y2YwMGJlZTM0YzVjMzFiNTY3OTE0ZjllYWU5OGU3MGFjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFjaG1lbnRDb2NvYS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJQXR0YWNobWVudENvY29hLm1tCkBAIC0x NTQsNiArMTU0LDE5IEBAIFJlZlB0cjxXZWJDb3JlOjpGcmFnbWVudGVkU2hhcmVkQnVmZmVyPiBB dHRhY2htZW50OjplbmNsb3NpbmdJbWFnZURhdGEoKSBjb25zdAogICAgIHJldHVybiBXZWJDb3Jl OjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShkYXRhKTsKIH0KIAorTlNEYXRhICpBdHRhY2htZW50Ojpl bmNsb3NpbmdJbWFnZU5TRGF0YSgpIGNvbnN0Cit7CisgICAgaWYgKCFtX2hhc0VuY2xvc2luZ0lt YWdlKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgYXV0byBmaWxlV3JhcHBlciA9IHRoaXMt PmZpbGVXcmFwcGVyKCk7CisKKyAgICBpZiAoIVtmaWxlV3JhcHBlciBpc1JlZ3VsYXJGaWxlXSkK KyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJldHVybiBmaWxlV3JhcHBlci5yZWd1bGFyRmls ZUNvbnRlbnRzOworfQorCiBib29sIEF0dGFjaG1lbnQ6OmlzRW1wdHkoKSBjb25zdAogewogICAg IHJldHVybiAhbV9maWxlV3JhcHBlciAmJiAhbV9maWxlV3JhcHBlckdlbmVyYXRvcjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1NoYXJpbmdTZXJ2aWNlUGlja2Vy RGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tTaGFyaW5nU2Vydmlj ZVBpY2tlckRlbGVnYXRlLm1tCmluZGV4IGI4ZGY5N2FjNDM4MjNiNmJkNGE1MjY3MTg3ZDQ0MjFk YWFiNGM3MjAuLmIzMzczMWVmZTMzZmEwMjJhMDg1NDhiMWU5NmEwYWFhOTZlNmM4N2MgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1NoYXJpbmdTZXJ2aWNlUGlja2Vy RGVsZWdhdGUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLU2hhcmluZ1Nl cnZpY2VQaWNrZXJEZWxlZ2F0ZS5tbQpAQCAtMTQ5LDcgKzE0OSw4IEBACiAgICAgICAgIAogICAg ICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgICAgICBXZWFrUHRy IHdlYWtQYWdlID0gX21lbnVQcm94eS0+cGFnZSgpOwotICAgICAgICBbaXRlbVByb3ZpZGVyIGxv YWREYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKilrVVRUeXBl RGF0YSBjb21wbGV0aW9uSGFuZGxlcjpbd2Vha1BhZ2UsIGF0dGFjaG1lbnRJRCA9IF9hdHRhY2ht ZW50SURdKE5TRGF0YSAqZGF0YSwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgTlNTdHJpbmcg Kml0ZW1VVEkgPSBpdGVtUHJvdmlkZXIucmVnaXN0ZXJlZFR5cGVJZGVudGlmaWVycy5maXJzdE9i amVjdDsKKyAgICAgICAgW2l0ZW1Qcm92aWRlciBsb2FkRGF0YVJlcHJlc2VudGF0aW9uRm9yVHlw ZUlkZW50aWZpZXI6aXRlbVVUSSBjb21wbGV0aW9uSGFuZGxlcjpbd2Vha1BhZ2UsIGF0dGFjaG1l bnRJRCA9IF9hdHRhY2htZW50SUQsIGl0ZW1VVEldKE5TRGF0YSAqZGF0YSwgTlNFcnJvciAqZXJy b3IpIHsKICAgICAgICAgICAgIFJlZlB0ciB3ZWJQYWdlID0gd2Vha1BhZ2UuZ2V0KCk7CiAgICAg ICAgICAgICAKICAgICAgICAgICAgIGlmICghd2ViUGFnZSkKQEAgLTE2Myw3ICsxNjQsNyBAQAog ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIAogICAgICAgICAgICAgYXV0byBh dHRhY2htZW50ID0gd3JhcHBlcihhcGlBdHRhY2htZW50KTsKLSAgICAgICAgICAgIFthdHRhY2ht ZW50IHNldERhdGE6ZGF0YSBuZXdDb250ZW50VHlwZTpTdHJpbmcoTlNQYXN0ZWJvYXJkVHlwZVRJ RkYpXTsKKyAgICAgICAgICAgIFthdHRhY2htZW50IHNldERhdGE6ZGF0YSBuZXdDb250ZW50VHlw ZTppdGVtVVRJXTsKICAgICAgICAgICAgIHdlYlBhZ2UtPmRpZEludmFsaWRhdGVEYXRhRm9yQXR0 YWNobWVudCgqYXBpQXR0YWNobWVudC5nZXQoKSk7CiAgICAgICAgIH1dOwogICAgICAgICBBTExP V19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KaW5kZXggZTFmMDJhNzA5NjNj OTUwYTA4MGQyY2NjNmRjZTEzNmMyZmQxYzU0Yy4uNjhhYzc0MTBmNTllYWU4NDU4YWY2NDIxZmMz ZmQyYTAyNTk1ZjRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dl YkNvbnRleHRNZW51UHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj L1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KQEAgLTIxMiwxNyArMjEyLDIzIEBAIHZvaWQgV2Vi Q29udGV4dE1lbnVQcm94eU1hYzo6c2V0dXBTZXJ2aWNlc01lbnUoKQogICAgIGJvb2wgaGFzQ29u dHJvbGxlZEltYWdlID0gbV9jb250ZXh0LmNvbnRyb2xsZWRJbWFnZSgpOwogICAgIE5TQXJyYXkg Kml0ZW1zID0gbmlsOwogICAgIGlmIChoYXNDb250cm9sbGVkSW1hZ2UpIHsKLSAgICAgICAgUmVm UHRyPFNoYXJlYWJsZUJpdG1hcD4gaW1hZ2UgPSBtX2NvbnRleHQuY29udHJvbGxlZEltYWdlKCk7 Ci0gICAgICAgIGlmICghaW1hZ2UpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgYXV0 byBjZ0ltYWdlID0gaW1hZ2UtPm1ha2VDR0ltYWdlKCk7Ci0gICAgICAgIGF1dG8gbnNJbWFnZSA9 IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJbWFnZS5nZXQoKSBz aXplOmltYWdlLT5zaXplKCldKTsKKyAgICAgICAgYXV0byBhdHRhY2htZW50ID0gcGFnZSgpLT5h dHRhY2htZW50Rm9ySWRlbnRpZmllcihtX2NvbnRleHQuY29udHJvbGxlZEltYWdlQXR0YWNobWVu dElEKCkpOworICAgICAgICBSZXRhaW5QdHI8TlNJdGVtUHJvdmlkZXI+IGl0ZW1Qcm92aWRlcjsK KyAgICAgICAgaWYgKGF0dGFjaG1lbnQpCisgICAgICAgICAgICBpdGVtUHJvdmlkZXIgPSBhZG9w dE5TKFtbTlNJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRXaXRoSXRlbTphdHRhY2htZW50LT5lbmNs b3NpbmdJbWFnZU5TRGF0YSgpIHR5cGVJZGVudGlmaWVyOmF0dGFjaG1lbnQtPnV0aVR5cGUoKV0p OworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGlt YWdlID0gbV9jb250ZXh0LmNvbnRyb2xsZWRJbWFnZSgpOworICAgICAgICAgICAgaWYgKCFpbWFn ZSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBhdXRvIGNnSW1hZ2UgPSBp bWFnZS0+bWFrZUNHSW1hZ2UoKTsKKyAgICAgICAgICAgIGF1dG8gbnNJbWFnZSA9IGFkb3B0TlMo W1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJbWFnZS5nZXQoKSBzaXplOmltYWdl LT5zaXplKCldKTsKIAotQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KLSAgICAg ICAgYXV0byBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJdGVtUHJvdmlkZXIgYWxsb2NdIGlu aXRXaXRoSXRlbTpbbnNJbWFnZSBUSUZGUmVwcmVzZW50YXRpb25dIHR5cGVJZGVudGlmaWVyOihf X2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVUSUZGXSk7Ci1BTExPV19ERVBSRUNBVEVEX0RFQ0xB UkFUSU9OU19FTkQKKyAgICAgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JF R0lOCisgICAgICAgICAgICBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJdGVtUHJvdmlkZXIg YWxsb2NdIGluaXRXaXRoSXRlbTpbbnNJbWFnZSBUSUZGUmVwcmVzZW50YXRpb25dIHR5cGVJZGVu dGlmaWVyOihfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVUSUZGXSk7CisgICAgICAgICAgICBB TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKyAgICAgICAgfQogICAgICAgICBpdGVt cyA9IEBbIGl0ZW1Qcm92aWRlci5nZXQoKSBdOworICAgICAgICAKICAgICB9IGVsc2UgaWYgKCFt X2NvbnRleHQuY29udHJvbGxlZFNlbGVjdGlvbkRhdGEoKS5pc0VtcHR5KCkpIHsKICAgICAgICAg YXV0byBzZWxlY3Rpb25EYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRl czpzdGF0aWNfY2FzdDxjb25zdCB2b2lkKj4obV9jb250ZXh0LmNvbnRyb2xsZWRTZWxlY3Rpb25E YXRhKCkuZGF0YSgpKSBsZW5ndGg6bV9jb250ZXh0LmNvbnRyb2xsZWRTZWxlY3Rpb25EYXRhKCku c2l6ZSgpXSk7CiAgICAgICAgIGF1dG8gc2VsZWN0aW9uID0gYWRvcHROUyhbW05TQXR0cmlidXRl ZFN0cmluZyBhbGxvY10gaW5pdFdpdGhSVEZEOnNlbGVjdGlvbkRhdGEuZ2V0KCkgZG9jdW1lbnRB dHRyaWJ1dGVzOm5pbF0pOwo= 451540 2022-02-10 08:31:42 -0800 2022-02-10 09:05:36 -0800 Patch for landing bug-236405-20220210083141.patch text/plain 6971 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIyMWQwMWY5NGNhOTc4MDlh OGEwZTM2MmY4MmZhODVlOGU0NWEzOWYuLjg5ODNiYmQzMTQyNzlkOTI2MjliM2FjNTY5YTM0ODBi N2QzMTdkMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjItMDItMDkgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBNYWlsIGF0dGFjaG1l bnQgc3dpdGNoZWQgdG8gVElGRiBhbmQgYmFsbG9vbnMgaW4gc2l6ZSBhZnRlciBtYXJrdXAuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY0MDUKKyAg ICAgICAgcmRhcjovLzg3MzU4OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFdoZW4gcHVsbGluZyBkYXRhIGZyb20gdGhlIHdlYnByb2Nlc3MgdG8gcGFz cyB0byB0aGUgU2hhcmluZyBTZXJ2aWNlCisgICAgICAgIGZvciBtYXJrdXAsIHdlIHdvdWxkIGNv bnZlcnQgaXQgdG8gVElGRiBmb3JtYXQuIFRoaXMgd291bGQgY2F1c2UgZmlsZXMKKyAgICAgICAg dG8gaW5jcmVhc2UgaW4gc2l6ZSwgYW5kIGxvc2UgdGhlaXIgb3JpZ2luYWwgZm9ybWF0dGluZywg YXMgd2VsbCBhcyBvdXRyaWdodAorICAgICAgICBicmVhayBQREZzLiBJbnN0ZWFkIHdlIHNob3Vs ZCBiZSBwdWxsaW5nIHRoZSBkYXRhIGZyb20gdGhlIGF0dGFjaG1lbnQsIHdoaWNoCisgICAgICAg IGFscmVhZHkgZXhpc3RzIGluIHRoZSBVSSBwcm9jZXNzIGFuZCBpcyB0aGUgc291cmNlIG9mIHRy dXRoIGZvciB0aGF0IGRhdGEgYW55d2F5cy4KKyAgICAgICAgVGhpcyBhbGxvd3MgdXMgdG8gZ2l2 ZSB0aGUgY29ycmVjdCB0eXBlIHRvIHRoZSBzaGFyaW5nIHNlcnZpY2UsIGFuZCB3ZSBzaG91bGQK KyAgICAgICAgdGFrZSB0aGUgZGF0YSBiYWNrIGFzIHRoZSBzYW1lIG9yaWdpbmFsIHR5cGUgd2hl biBnZXR0aW5nIHRoZSBkYXRhIGJhY2sgZnJvbQorICAgICAgICBtYXJrdXAuIAorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmNwcDoKKyAgICAgICAgKEFQSTo6QXR0YWNo bWVudDo6ZW5jbG9zaW5nSW1hZ2VEYXRhIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0FQSUF0dGFjaG1lbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFj aG1lbnRDb2NvYS5tbToKKyAgICAgICAgKEFQSTo6QXR0YWNobWVudDo6ZW5jbG9zaW5nSW1hZ2VO U0RhdGEgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tTaGFyaW5nU2VydmljZVBp Y2tlckRlbGVnYXRlLm1tOgorICAgICAgICAoLVtXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdh dGUgc2hhcmluZ1NlcnZpY2U6ZGlkU2hhcmVJdGVtczpdKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv bWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRl eHRNZW51UHJveHlNYWM6OnNldHVwU2VydmljZXNNZW51KToKKwogMjAyMi0wMi0wOSAgQW50b2lu ZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbbW9kZWxdIGltcHJvdmUg c2l6aW5nIG9uIG1hY09TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv QVBJQXR0YWNobWVudC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUF0dGFjaG1l bnQuaAppbmRleCBmZTUwZTUzOGI4ZWJiMzUxYTQ4MzZkMWRkODkzZDE0N2E1NmE4NzdhLi43OThl NWViZDZkYjI3YWIzNTM0NTU3OWE3NTc1OWI2ZWRkZTI2MGY3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQXR0YWNobWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9BUElBdHRhY2htZW50LmgKQEAgLTg0LDYgKzg0LDkgQEAgcHVibGljOgog ICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0OwogCiAgICAgUmVmUHRyPFdlYkNvcmU6OkZyYWdtZW50 ZWRTaGFyZWRCdWZmZXI+IGVuY2xvc2luZ0ltYWdlRGF0YSgpIGNvbnN0OworI2lmIFBMQVRGT1JN KENPQ09BKQorICAgIE5TRGF0YSAqZW5jbG9zaW5nSW1hZ2VOU0RhdGEoKSBjb25zdDsKKyNlbmRp ZgogICAgIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZpbGVTaXplRm9yRGlzcGxheSgpIGNvbnN0 OwogCiAgICAgdm9pZCBzZXRIYXNFbmNsb3NpbmdJbWFnZShib29sIGhhc0VuY2xvc2luZ0ltYWdl KSB7IG1faGFzRW5jbG9zaW5nSW1hZ2UgPSBoYXNFbmNsb3NpbmdJbWFnZTsgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFjaG1lbnRDb2NvYS5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElBdHRhY2htZW50Q29jb2Eu bW0KaW5kZXggZGZlZjNlMDcwZjk2MTYzMDQ5NzE0NGRhZjNmMzAwY2I0Y2E1MTk1Zi4uZTcyY2Rl Y2YwMGJlZTM0YzVjMzFiNTY3OTE0ZjllYWU5OGU3MGFjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSUF0dGFjaG1lbnRDb2NvYS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJQXR0YWNobWVudENvY29hLm1tCkBAIC0x NTQsNiArMTU0LDE5IEBAIFJlZlB0cjxXZWJDb3JlOjpGcmFnbWVudGVkU2hhcmVkQnVmZmVyPiBB dHRhY2htZW50OjplbmNsb3NpbmdJbWFnZURhdGEoKSBjb25zdAogICAgIHJldHVybiBXZWJDb3Jl OjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShkYXRhKTsKIH0KIAorTlNEYXRhICpBdHRhY2htZW50Ojpl bmNsb3NpbmdJbWFnZU5TRGF0YSgpIGNvbnN0Cit7CisgICAgaWYgKCFtX2hhc0VuY2xvc2luZ0lt YWdlKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgYXV0byBmaWxlV3JhcHBlciA9IHRoaXMt PmZpbGVXcmFwcGVyKCk7CisKKyAgICBpZiAoIVtmaWxlV3JhcHBlciBpc1JlZ3VsYXJGaWxlXSkK KyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJldHVybiBmaWxlV3JhcHBlci5yZWd1bGFyRmls ZUNvbnRlbnRzOworfQorCiBib29sIEF0dGFjaG1lbnQ6OmlzRW1wdHkoKSBjb25zdAogewogICAg IHJldHVybiAhbV9maWxlV3JhcHBlciAmJiAhbV9maWxlV3JhcHBlckdlbmVyYXRvcjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1NoYXJpbmdTZXJ2aWNlUGlja2Vy RGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tTaGFyaW5nU2Vydmlj ZVBpY2tlckRlbGVnYXRlLm1tCmluZGV4IGI4ZGY5N2FjNDM4MjNiNmJkNGE1MjY3MTg3ZDQ0MjFk YWFiNGM3MjAuLmIzMzczMWVmZTMzZmEwMjJhMDg1NDhiMWU5NmEwYWFhOTZlNmM4N2MgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1NoYXJpbmdTZXJ2aWNlUGlja2Vy RGVsZWdhdGUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLU2hhcmluZ1Nl cnZpY2VQaWNrZXJEZWxlZ2F0ZS5tbQpAQCAtMTQ5LDcgKzE0OSw4IEBACiAgICAgICAgIAogICAg ICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgICAgICBXZWFrUHRy IHdlYWtQYWdlID0gX21lbnVQcm94eS0+cGFnZSgpOwotICAgICAgICBbaXRlbVByb3ZpZGVyIGxv YWREYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKilrVVRUeXBl RGF0YSBjb21wbGV0aW9uSGFuZGxlcjpbd2Vha1BhZ2UsIGF0dGFjaG1lbnRJRCA9IF9hdHRhY2ht ZW50SURdKE5TRGF0YSAqZGF0YSwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgTlNTdHJpbmcg Kml0ZW1VVEkgPSBpdGVtUHJvdmlkZXIucmVnaXN0ZXJlZFR5cGVJZGVudGlmaWVycy5maXJzdE9i amVjdDsKKyAgICAgICAgW2l0ZW1Qcm92aWRlciBsb2FkRGF0YVJlcHJlc2VudGF0aW9uRm9yVHlw ZUlkZW50aWZpZXI6aXRlbVVUSSBjb21wbGV0aW9uSGFuZGxlcjpbd2Vha1BhZ2UsIGF0dGFjaG1l bnRJRCA9IF9hdHRhY2htZW50SUQsIGl0ZW1VVEldKE5TRGF0YSAqZGF0YSwgTlNFcnJvciAqZXJy b3IpIHsKICAgICAgICAgICAgIFJlZlB0ciB3ZWJQYWdlID0gd2Vha1BhZ2UuZ2V0KCk7CiAgICAg ICAgICAgICAKICAgICAgICAgICAgIGlmICghd2ViUGFnZSkKQEAgLTE2Myw3ICsxNjQsNyBAQAog ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIAogICAgICAgICAgICAgYXV0byBh dHRhY2htZW50ID0gd3JhcHBlcihhcGlBdHRhY2htZW50KTsKLSAgICAgICAgICAgIFthdHRhY2ht ZW50IHNldERhdGE6ZGF0YSBuZXdDb250ZW50VHlwZTpTdHJpbmcoTlNQYXN0ZWJvYXJkVHlwZVRJ RkYpXTsKKyAgICAgICAgICAgIFthdHRhY2htZW50IHNldERhdGE6ZGF0YSBuZXdDb250ZW50VHlw ZTppdGVtVVRJXTsKICAgICAgICAgICAgIHdlYlBhZ2UtPmRpZEludmFsaWRhdGVEYXRhRm9yQXR0 YWNobWVudCgqYXBpQXR0YWNobWVudC5nZXQoKSk7CiAgICAgICAgIH1dOwogICAgICAgICBBTExP V19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KaW5kZXggZTFmMDJhNzA5NjNj OTUwYTA4MGQyY2NjNmRjZTEzNmMyZmQxYzU0Yy4uNjhhYzc0MTBmNTllYWU4NDU4YWY2NDIxZmMz ZmQyYTAyNTk1ZjRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dl YkNvbnRleHRNZW51UHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj L1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KQEAgLTIxMiwxNyArMjEyLDIzIEBAIHZvaWQgV2Vi Q29udGV4dE1lbnVQcm94eU1hYzo6c2V0dXBTZXJ2aWNlc01lbnUoKQogICAgIGJvb2wgaGFzQ29u dHJvbGxlZEltYWdlID0gbV9jb250ZXh0LmNvbnRyb2xsZWRJbWFnZSgpOwogICAgIE5TQXJyYXkg Kml0ZW1zID0gbmlsOwogICAgIGlmIChoYXNDb250cm9sbGVkSW1hZ2UpIHsKLSAgICAgICAgUmVm UHRyPFNoYXJlYWJsZUJpdG1hcD4gaW1hZ2UgPSBtX2NvbnRleHQuY29udHJvbGxlZEltYWdlKCk7 Ci0gICAgICAgIGlmICghaW1hZ2UpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgYXV0 byBjZ0ltYWdlID0gaW1hZ2UtPm1ha2VDR0ltYWdlKCk7Ci0gICAgICAgIGF1dG8gbnNJbWFnZSA9 IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJbWFnZS5nZXQoKSBz aXplOmltYWdlLT5zaXplKCldKTsKKyAgICAgICAgYXV0byBhdHRhY2htZW50ID0gcGFnZSgpLT5h dHRhY2htZW50Rm9ySWRlbnRpZmllcihtX2NvbnRleHQuY29udHJvbGxlZEltYWdlQXR0YWNobWVu dElEKCkpOworICAgICAgICBSZXRhaW5QdHI8TlNJdGVtUHJvdmlkZXI+IGl0ZW1Qcm92aWRlcjsK KyAgICAgICAgaWYgKGF0dGFjaG1lbnQpCisgICAgICAgICAgICBpdGVtUHJvdmlkZXIgPSBhZG9w dE5TKFtbTlNJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRXaXRoSXRlbTphdHRhY2htZW50LT5lbmNs b3NpbmdJbWFnZU5TRGF0YSgpIHR5cGVJZGVudGlmaWVyOmF0dGFjaG1lbnQtPnV0aVR5cGUoKV0p OworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGlt YWdlID0gbV9jb250ZXh0LmNvbnRyb2xsZWRJbWFnZSgpOworICAgICAgICAgICAgaWYgKCFpbWFn ZSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBhdXRvIGNnSW1hZ2UgPSBp bWFnZS0+bWFrZUNHSW1hZ2UoKTsKKyAgICAgICAgICAgIGF1dG8gbnNJbWFnZSA9IGFkb3B0TlMo W1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJbWFnZS5nZXQoKSBzaXplOmltYWdl LT5zaXplKCldKTsKIAotQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KLSAgICAg ICAgYXV0byBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJdGVtUHJvdmlkZXIgYWxsb2NdIGlu aXRXaXRoSXRlbTpbbnNJbWFnZSBUSUZGUmVwcmVzZW50YXRpb25dIHR5cGVJZGVudGlmaWVyOihf X2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVUSUZGXSk7Ci1BTExPV19ERVBSRUNBVEVEX0RFQ0xB UkFUSU9OU19FTkQKKyAgICAgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JF R0lOCisgICAgICAgICAgICBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJdGVtUHJvdmlkZXIg YWxsb2NdIGluaXRXaXRoSXRlbTpbbnNJbWFnZSBUSUZGUmVwcmVzZW50YXRpb25dIHR5cGVJZGVu dGlmaWVyOihfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVUSUZGXSk7CisgICAgICAgICAgICBB TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKyAgICAgICAgfQogICAgICAgICBpdGVt cyA9IEBbIGl0ZW1Qcm92aWRlci5nZXQoKSBdOworICAgICAgICAKICAgICB9IGVsc2UgaWYgKCFt X2NvbnRleHQuY29udHJvbGxlZFNlbGVjdGlvbkRhdGEoKS5pc0VtcHR5KCkpIHsKICAgICAgICAg YXV0byBzZWxlY3Rpb25EYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRl czpzdGF0aWNfY2FzdDxjb25zdCB2b2lkKj4obV9jb250ZXh0LmNvbnRyb2xsZWRTZWxlY3Rpb25E YXRhKCkuZGF0YSgpKSBsZW5ndGg6bV9jb250ZXh0LmNvbnRyb2xsZWRTZWxlY3Rpb25EYXRhKCku c2l6ZSgpXSk7CiAgICAgICAgIGF1dG8gc2VsZWN0aW9uID0gYWRvcHROUyhbW05TQXR0cmlidXRl ZFN0cmluZyBhbGxvY10gaW5pdFdpdGhSVEZEOnNlbGVjdGlvbkRhdGEuZ2V0KCkgZG9jdW1lbnRB dHRyaWJ1dGVzOm5pbF0pOwo=