235993 2022-02-01 17:50:55 -0800 Delete SelectionAcrossShadowBoundariesEnabled 2022-02-04 11:34:55 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa cdumez darin ews-watchlist japhet mifenton webkit-bug-importer wenson_hsieh oldest_to_newest 1836269 0 rniwa 2022-02-01 17:50:55 -0800 This runtime flag is always on. 1836271 1 450598 rniwa 2022-02-01 17:54:04 -0800 Created attachment 450598 Patch 1836854 2 450598 darin 2022-02-03 03:58:14 -0800 Comment on attachment 450598 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450598&action=review > Source/WebCore/editing/gtk/EditorGtk.cpp:120 > + pasteboardContent.markup = serializePreservingVisualAppearance(m_document.selection().selection(), ResolveURLs::YesExcludingLocalFileURLsForPrivacy, SerializeComposedTree::Yes : SerializeComposedTree::No); Editing mistake here. Left behind “: SerializedComposedTree::No”. > Source/WebCore/editing/libwpe/EditorLibWPE.cpp:68 > + pasteboardContent.markup = serializePreservingVisualAppearance(m_document.selection().selection(), ResolveURLs::YesExcludingLocalFileURLsForPrivacy, SerializeComposedTree::Yes : SerializeComposedTree::No); Ditto. 1837153 3 450832 rniwa 2022-02-03 15:52:35 -0800 Created attachment 450832 Patch 1837164 4 450832 darin 2022-02-03 16:37:33 -0800 Comment on attachment 450832 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450832&action=review > Source/WebCore/editing/Editor.cpp:3313 > + return selectedText(OptionSet { TextIteratorBehavior::EmitsImageAltText } | TextIteratorBehavior::TraversesFlatTree); Should use commas here instead: return selectedText({ TextIteratorBehavior::EmitsImageAltText, TextIteratorBehavior::TraversesFlatTree }); 1837258 5 rniwa 2022-02-03 21:47:25 -0800 (In reply to Darin Adler from comment #4) > Comment on attachment 450832 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=450832&action=review > > > Source/WebCore/editing/Editor.cpp:3313 > > + return selectedText(OptionSet { TextIteratorBehavior::EmitsImageAltText } | TextIteratorBehavior::TraversesFlatTree); > > Should use commas here instead: > > return selectedText({ TextIteratorBehavior::EmitsImageAltText, > TextIteratorBehavior::TraversesFlatTree }); Sure, will fix. 1837259 6 450865 rniwa 2022-02-03 21:48:12 -0800 Created attachment 450865 Patch for landing 1837273 7 ews-feeder 2022-02-03 22:38:26 -0800 Committed r289104 (246801@main): <https://commits.webkit.org/246801@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450865. 1837274 8 webkit-bug-importer 2022-02-03 22:39:25 -0800 <rdar://problem/88474922> 1837427 9 450865 darin 2022-02-04 08:15:21 -0800 Comment on attachment 450865 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=450865&action=review > Source/WebCore/editing/Editor.cpp:3313 > + return selectedText(OptionSet { TextIteratorBehavior::EmitsImageAltText, TextIteratorBehavior::TraversesFlatTree }); Maybe we can omit OptionSet here? I guess not because you would have tried that? 1837526 10 rniwa 2022-02-04 11:34:55 -0800 (In reply to Darin Adler from comment #9) > Comment on attachment 450865 [details] > Patch for landing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=450865&action=review > > > Source/WebCore/editing/Editor.cpp:3313 > > + return selectedText(OptionSet { TextIteratorBehavior::EmitsImageAltText, TextIteratorBehavior::TraversesFlatTree }); > > Maybe we can omit OptionSet here? I guess not because you would have tried > that? No, it didn't work. 450598 2022-02-01 17:54:04 -0800 2022-02-03 15:52:32 -0800 Patch bug-235993-20220201175404.patch text/plain 15378 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE1ODI3MTEwMTY0ZGEwMzI0YTU3ZWVh YzI3NDUxNDg5YjhiNzFmYWUuLjQ5NTg3OGRmZDgxZTUyZGZiNjY3OTZlMjRiNWIxNGE0MDE3OTU3 N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjItMDItMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdh QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRGVsZXRlIFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5k YXJpZXNFbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzU5OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgor CiAyMDIyLTAyLTAxICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtHVEtdW1dQRV0gRml4ZXMgZm9yIG5vbi11bmlmaWVkIGJ1aWxkcyBhZnRlciByMjg4 ODA3IGFuZCByMjg4ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM2YWY4YmM1MGExMDhjMDhmYzhmNTAxNzJi ZDVmOGJmYjY3MTVkOS4uMDE0MGVmNmM5N2MzYWE5NzYyZjRkYzAyNGJiYjBjZmE2NmUzZWYzMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAyLTAxICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERlbGV0ZSBTZWxlY3Rpb25BY3Jvc3NTaGFkb3dC b3VuZGFyaWVzRW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM1OTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRGVsZXRlIHRoaXMgcnVudGltZSBmbGFnIHdoaWNoIGhhcyBhbHdheXMgYmVlbiBl bmFibGVkIGZvciBhIHdoaWxlLgorCisgICAgICAgICogZWRpdGluZy9FZGl0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzZWxlY3RlZFRleHQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6RWRpdG9yOjpzZWxlY3RlZFRleHRGb3JEYXRhVHJhbnNmZXIgY29uc3QpOgorICAgICAg ICAqIGVkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaXNp YmxlU2VsZWN0aW9uOjphZGp1c3RTZWxlY3Rpb25Ub0F2b2lkQ3Jvc3NpbmdTaGFkb3dCb3VuZGFy aWVzKToKKyAgICAgICAgKiBlZGl0aW5nL2NvY29hL0VkaXRvckNvY29hLm1tOgorICAgICAgICAo V2ViQ29yZTo6RWRpdG9yOjpzZWxlY3Rpb25JbkhUTUxGb3JtYXQpOgorICAgICAgICAqIGVkaXRp bmcvZ3RrL0VkaXRvckd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OndyaXRlU2Vs ZWN0aW9uVG9QYXN0ZWJvYXJkKToKKyAgICAgICAgKiBlZGl0aW5nL2xpYndwZS9FZGl0b3JMaWJX UEUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjp3cml0ZVNlbGVjdGlvblRvUGFzdGVi b2FyZCk6CisgICAgICAgICogZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tOgorICAgICAgICAoV2Vi Q29yZTo6RWRpdG9yOjp3cml0ZUltYWdlVG9QYXN0ZWJvYXJkKToKKyAgICAgICAgKiBsb2FkZXIv YXJjaGl2ZS9jZi9MZWdhY3lXZWJBcmNoaXZlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2Fj eVdlYkFyY2hpdmU6OmNyZWF0ZUZyb21TZWxlY3Rpb24pOgorCiAyMDIyLTAyLTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVzZSBtb3JlIEF0b21TdHJpbmcg YW5kIHVuLWlubGluZSBjb2RlIGZvciBTY3JpcHRFbGVtZW50Q2FjaGVkU2NyaXB0RmV0Y2hlciBh bmQgaXRzIHN1YmNsYXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRleCBjZTJkMTY5 M2ZlOWJhOTM0NjJkNTU3Nzc4YzU0NjMyZGE2ODgxNDA0Li4xNmVhYWVhNTQ2MzhhYzVhZDk2Nzli OTllMjAxOGQyNzBjOTIwYmZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTggQEAKKzIwMjItMDItMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgRGVsZXRlIFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU5OTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcv V2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJl bmNlcy5tbToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMga2V5Z2VuRWxlbWVudEVuYWJsZWRd KToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRh cmllc0VuYWJsZWRdKToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2V0U2VsZWN0aW9uQWNy b3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQ6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2Vz IGlzWFNTQXVkaXRvckVuYWJsZWRdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2Vz UHJpdmF0ZS5oOgorCiAyMDIyLTAxLTMxICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIEZvbnRDYXNjYWRlOjpmb250TWV0cmljcygpIGFu ZCBSZW5kZXJTdHlsZTo6Zm9udE1ldHJpY3MoKSB0byBmb250TWV0cmljc09mUHJpbWFyeUZvbnQo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVu Y2VzSW50ZXJuYWwueWFtbCBiL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVm ZXJlbmNlc0ludGVybmFsLnlhbWwKaW5kZXggZDVhZjE4MTc5NThiZjY2YmE4YjdlZDRjODFjYWY5 MDMwYjFkNjg5OS4uYzQ1MTc2ZDkyNDE2ZTFiYzRhZTE4NDlmNWU1NDI5OWMyYjlhZGYzYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50 ZXJuYWwueWFtbAorKysgYi9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVy ZW5jZXNJbnRlcm5hbC55YW1sCkBAIC03MzQsMTggKzczNCw2IEBAIFNlY3VyZUNvbnRleHRDaGVj a3NFbmFibGVkOgogICAgIFdlYktpdDoKICAgICAgIGRlZmF1bHQ6IHRydWUKIAotU2VsZWN0aW9u QWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQ6Ci0gIHR5cGU6IGJvb2wKLSAgaHVtYW5SZWFk YWJsZU5hbWU6ICJTZWxlY3Rpb24gYWNyb3NzIHNoYWRvdyBET00iCi0gIGh1bWFuUmVhZGFibGVE ZXNjcmlwdGlvbjogIkFsbG93IHVzZXItaW5pdGlhdGVkIHNlbGVjdGlvbiBhY3Jvc3Mgc2hhZG93 IERPTSBib3VuZGFyaWVzIgotICBkZWZhdWx0VmFsdWU6Ci0gICAgV2ViS2l0TGVnYWN5OgotICAg ICAgZGVmYXVsdDogdHJ1ZQotICAgIFdlYktpdDoKLSAgICAgIGRlZmF1bHQ6IHRydWUKLSAgICBX ZWJDb3JlOgotICAgICAgZGVmYXVsdDogdHJ1ZQotICAgICAgCiBTZWxlY3Rpb25GbGlwcGluZ0Vu YWJsZWQ6CiAgIHR5cGU6IGJvb2wKICAgaHVtYW5SZWFkYWJsZU5hbWU6ICJTZWxlY3Rpb24gRmxp cHBpbmciCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5kZXggMTY2NTc4NDc3MzZkNDUzNGQy OGY4MDkyZDM1NTViZWU3MTZlZjA2YS4uMTg1ODkyNTJjYzY3YmNjYzNjYWM0N2RkMGFhMGNmZTU1 MThmZWI4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApAQCAtMzMwNSwxOCArMzMwNSwx MiBAQCB2b2lkIEVkaXRvcjo6Y2hhbmdlU2VsZWN0aW9uQWZ0ZXJDb21tYW5kKGNvbnN0IFZpc2li bGVTZWxlY3Rpb24mIG5ld1NlbGVjdGlvbiwgTwogCiBTdHJpbmcgRWRpdG9yOjpzZWxlY3RlZFRl eHQoKSBjb25zdAogewotICAgIFRleHRJdGVyYXRvckJlaGF2aW9ycyBiZWhhdmlvcnM7Ci0gICAg aWYgKG1fZG9jdW1lbnQuc2V0dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVz RW5hYmxlZCgpKQotICAgICAgICBiZWhhdmlvcnMuYWRkKFRleHRJdGVyYXRvckJlaGF2aW9yOjpU cmF2ZXJzZXNGbGF0VHJlZSk7Ci0gICAgcmV0dXJuIHNlbGVjdGVkVGV4dChiZWhhdmlvcnMpOwor ICAgIHJldHVybiBzZWxlY3RlZFRleHQoVGV4dEl0ZXJhdG9yQmVoYXZpb3I6OlRyYXZlcnNlc0Zs YXRUcmVlKTsKIH0KIAogU3RyaW5nIEVkaXRvcjo6c2VsZWN0ZWRUZXh0Rm9yRGF0YVRyYW5zZmVy KCkgY29uc3QKIHsKLSAgICBUZXh0SXRlcmF0b3JCZWhhdmlvcnMgYmVoYXZpb3JzIHsgVGV4dEl0 ZXJhdG9yQmVoYXZpb3I6OkVtaXRzSW1hZ2VBbHRUZXh0IH07Ci0gICAgaWYgKG1fZG9jdW1lbnQu c2V0dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZCgpKQotICAg ICAgICBiZWhhdmlvcnMuYWRkKFRleHRJdGVyYXRvckJlaGF2aW9yOjpUcmF2ZXJzZXNGbGF0VHJl ZSk7Ci0gICAgcmV0dXJuIHNlbGVjdGVkVGV4dChiZWhhdmlvcnMpOworICAgIHJldHVybiBzZWxl Y3RlZFRleHQoT3B0aW9uU2V0IHsgVGV4dEl0ZXJhdG9yQmVoYXZpb3I6OkVtaXRzSW1hZ2VBbHRU ZXh0IH0gfCBUZXh0SXRlcmF0b3JCZWhhdmlvcjo6VHJhdmVyc2VzRmxhdFRyZWUpOwogfQogCiBT dHJpbmcgRWRpdG9yOjpzZWxlY3RlZFRleHQoVGV4dEl0ZXJhdG9yQmVoYXZpb3JzIGJlaGF2aW9y cykgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVj dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwCmlu ZGV4IGQ0Njk3NzA5NjYyNTcxYTA4YzM2YTU3YjM3YWJiZTgyMDVlZGEwNjcuLjE3MDJiM2U5YWE4 ZjYzNTFiNmFhNTQ3NjgwNDU5NGU2NGEzOWRiZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9WaXNpYmxlU2VsZWN0aW9uLmNwcApAQCAtNTMxLDExICs1MzEsOSBAQCB2b2lkIFZpc2libGVT ZWxlY3Rpb246OmFkanVzdFNlbGVjdGlvblRvQXZvaWRDcm9zc2luZ1NoYWRvd0JvdW5kYXJpZXMo KQogICAgIGlmICgmc3RhcnROb2RlLT50cmVlU2NvcGUoKSA9PSAmZW5kTm9kZS0+dHJlZVNjb3Bl KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChzdGFydE5vZGUtPmRvY3VtZW50KCkuc2V0 dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZCgpKSB7Ci0gICAg ICAgIGlmICghaXNJblVzZXJBZ2VudFNoYWRvd1Jvb3RPckhhc0VkaXRhYmxlU2hhZG93QW5jZXN0 b3Ioc3RhcnROb2RlKQotICAgICAgICAgICAgJiYgIWlzSW5Vc2VyQWdlbnRTaGFkb3dSb290T3JI YXNFZGl0YWJsZVNoYWRvd0FuY2VzdG9yKGVuZE5vZGUpKQotICAgICAgICAgICAgcmV0dXJuOwot ICAgIH0KKyAgICBpZiAoIWlzSW5Vc2VyQWdlbnRTaGFkb3dSb290T3JIYXNFZGl0YWJsZVNoYWRv d0FuY2VzdG9yKHN0YXJ0Tm9kZSkKKyAgICAgICAgJiYgIWlzSW5Vc2VyQWdlbnRTaGFkb3dSb290 T3JIYXNFZGl0YWJsZVNoYWRvd0FuY2VzdG9yKGVuZE5vZGUpKQorICAgICAgICByZXR1cm47CiAK ICAgICAvLyBDb3JyZWN0IHRoZSBmb2N1cyBpZiBuZWNlc3NhcnkuCiAgICAgaWYgKG1fYW5jaG9y SXNGaXJzdCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9FZGl0 b3JDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRWRpdG9yQ29jb2EubW0K aW5kZXggMzhkYmQyNTkzYjg2YmJhOWE5MGNhZWIzMDBmZmFmMGY5YTkyODMzZi4uOTZjZWJmOTE1 YjkzYWY5MTMyYWE3N2QwMjFjMTZkOThkMGQ1OWMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9jb2NvYS9FZGl0b3JDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2NvY29hL0VkaXRvckNvY29hLm1tCkBAIC03NSw4ICs3NSw3IEBAIHN0YXRpYyBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBhcmNoaXZlZERhdGFGb3JBdHRyaWJ1dGVkU3RyaW5nKE5TQXR0cmlidXRl ZFN0cmluZyAqCiAKIFN0cmluZyBFZGl0b3I6OnNlbGVjdGlvbkluSFRNTEZvcm1hdCgpCiB7Ci0g ICAgcmV0dXJuIHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKG1fZG9jdW1lbnQu c2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdMb2NhbEZp bGVVUkxzRm9yUHJpdmFjeSwKLSAgICAgICAgbV9kb2N1bWVudC5zZXR0aW5ncygpLnNlbGVjdGlv bkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkgPyBTZXJpYWxpemVDb21wb3NlZFRyZWU6 OlllcyA6IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6Tm8pOworICAgIHJldHVybiBzZXJpYWxpemVQ cmVzZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZShtX2RvY3VtZW50LnNlbGVjdGlvbigpLnNlbGVjdGlv bigpLCBSZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxGaWxlVVJMc0ZvclByaXZhY3ksIFNl cmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVzKTsKIH0KIAogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VM RU1FTlQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2d0ay9FZGl0b3JHdGsu Y3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9ndGsvRWRpdG9yR3RrLmNwcAppbmRleCAzNmMw NGQ2MTBkODJjYzZjMGE5YzBkNjljZTEzNWQ4M2NiMDZhNjZiLi4wYzA1ZjcxMzVmM2MyMTE2MWU4 NTQ3M2IwOWZmMWNmZWQyZDVlMjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L2d0ay9FZGl0b3JHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvZ3RrL0VkaXRv ckd0ay5jcHAKQEAgLTExNyw4ICsxMTcsNyBAQCB2b2lkIEVkaXRvcjo6d3JpdGVTZWxlY3Rpb25U b1Bhc3RlYm9hcmQoUGFzdGVib2FyZCYgcGFzdGVib2FyZCkKICAgICBQYXN0ZWJvYXJkV2ViQ29u dGVudCBwYXN0ZWJvYXJkQ29udGVudDsKICAgICBwYXN0ZWJvYXJkQ29udGVudC5jYW5TbWFydENv cHlPckRlbGV0ZSA9IGNhblNtYXJ0Q29weU9yRGVsZXRlKCk7CiAgICAgcGFzdGVib2FyZENvbnRl bnQudGV4dCA9IHNlbGVjdGVkVGV4dEZvckRhdGFUcmFuc2ZlcigpOwotICAgIHBhc3RlYm9hcmRD b250ZW50Lm1hcmt1cCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKG1fZG9j dW1lbnQuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdM b2NhbEZpbGVVUkxzRm9yUHJpdmFjeSwKLSAgICAgICAgbV9kb2N1bWVudC5zZXR0aW5ncygpLnNl bGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkgPyBTZXJpYWxpemVDb21wb3Nl ZFRyZWU6OlllcyA6IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6Tm8pOworICAgIHBhc3RlYm9hcmRD b250ZW50Lm1hcmt1cCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKG1fZG9j dW1lbnQuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdM b2NhbEZpbGVVUkxzRm9yUHJpdmFjeSwgU2VyaWFsaXplQ29tcG9zZWRUcmVlOjpZZXMgOiBTZXJp YWxpemVDb21wb3NlZFRyZWU6Ok5vKTsKICAgICBwYXN0ZWJvYXJkQ29udGVudC5jb250ZW50T3Jp Z2luID0gbV9kb2N1bWVudC5vcmlnaW5JZGVudGlmaWVyRm9yUGFzdGVib2FyZCgpOwogICAgIHBh c3RlYm9hcmQud3JpdGUocGFzdGVib2FyZENvbnRlbnQpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9saWJ3cGUvRWRpdG9yTGliV1BFLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvbGlid3BlL0VkaXRvckxpYldQRS5jcHAKaW5kZXggODU5NWVkMWRkZjM4OTcxMTQy MmU0NTM5ODhkYmJjM2RlNWRlODcwMy4uNDY2NWY0NzY4Zjk3Y2U4MjgyMDMyMWZmMzRlZDQyNzlk YjBjZDQ2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9saWJ3cGUvRWRpdG9y TGliV1BFLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2xpYndwZS9FZGl0b3JMaWJX UEUuY3BwCkBAIC02NSw4ICs2NSw3IEBAIHZvaWQgRWRpdG9yOjp3cml0ZVNlbGVjdGlvblRvUGFz dGVib2FyZChQYXN0ZWJvYXJkJiBwYXN0ZWJvYXJkKQogewogICAgIFBhc3RlYm9hcmRXZWJDb250 ZW50IHBhc3RlYm9hcmRDb250ZW50OwogICAgIHBhc3RlYm9hcmRDb250ZW50LnRleHQgPSBzZWxl Y3RlZFRleHRGb3JEYXRhVHJhbnNmZXIoKTsKLSAgICBwYXN0ZWJvYXJkQ29udGVudC5tYXJrdXAg PSBzZXJpYWxpemVQcmVzZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZShtX2RvY3VtZW50LnNlbGVjdGlv bigpLnNlbGVjdGlvbigpLCBSZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxGaWxlVVJMc0Zv clByaXZhY3ksCi0gICAgICAgIG1fZG9jdW1lbnQuc2V0dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NT aGFkb3dCb3VuZGFyaWVzRW5hYmxlZCgpID8gU2VyaWFsaXplQ29tcG9zZWRUcmVlOjpZZXMgOiBT ZXJpYWxpemVDb21wb3NlZFRyZWU6Ok5vKTsKKyAgICBwYXN0ZWJvYXJkQ29udGVudC5tYXJrdXAg PSBzZXJpYWxpemVQcmVzZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZShtX2RvY3VtZW50LnNlbGVjdGlv bigpLnNlbGVjdGlvbigpLCBSZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxGaWxlVVJMc0Zv clByaXZhY3ksIFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVzIDogU2VyaWFsaXplQ29tcG9zZWRU cmVlOjpObyk7CiAgICAgcGFzdGVib2FyZC53cml0ZShwYXN0ZWJvYXJkQ29udGVudCk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbSBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbQppbmRleCAzMDM2Y2QzMmQ2Y2Q4 MzJjMjIwMjgzYTg0NDVhODk5YTVhNjZjYTNjLi4zMjI0M2ZiOWM2Y2Q3N2FlYTI1ZWM0NmQ1MGJk YmU0NTBiMWQxZGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0 b3JNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCkBA IC0zMzcsMTAgKzMzNyw4IEBAIHZvaWQgRWRpdG9yOjp3cml0ZUltYWdlVG9QYXN0ZWJvYXJkKFBh c3RlYm9hcmQmIHBhc3RlYm9hcmQsIEVsZW1lbnQmIGltYWdlRWxlbWVuCiAgICAgaWYgKCFwYXN0 ZWJvYXJkLmlzU3RhdGljKCkpCiAgICAgICAgIHBhc3RlYm9hcmRJbWFnZS5kYXRhSW5XZWJBcmNo aXZlRm9ybWF0ID0gaW1hZ2VJbldlYkFyY2hpdmVGb3JtYXQoaW1hZ2VFbGVtZW50KTsKIAotICAg IGlmIChhdXRvIGltYWdlUmFuZ2UgPSBtYWtlUmFuZ2VTZWxlY3RpbmdOb2RlKGltYWdlRWxlbWVu dCkpIHsKLSAgICAgICAgYXV0byBzZXJpYWxpemVDb21wb3NlZFRyZWUgPSBtX2RvY3VtZW50LnNl dHRpbmdzKCkuc2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQoKSA/IFNlcmlh bGl6ZUNvbXBvc2VkVHJlZTo6WWVzIDogU2VyaWFsaXplQ29tcG9zZWRUcmVlOjpObzsKLSAgICAg ICAgcGFzdGVib2FyZEltYWdlLmRhdGFJbkhUTUxGb3JtYXQgPSBzZXJpYWxpemVQcmVzZXJ2aW5n VmlzdWFsQXBwZWFyYW5jZShWaXNpYmxlU2VsZWN0aW9uIHsgKmltYWdlUmFuZ2UgfSwgUmVzb2x2 ZVVSTHM6Olllc0V4Y2x1ZGluZ0xvY2FsRmlsZVVSTHNGb3JQcml2YWN5LCBzZXJpYWxpemVDb21w b3NlZFRyZWUpOwotICAgIH0KKyAgICBpZiAoYXV0byBpbWFnZVJhbmdlID0gbWFrZVJhbmdlU2Vs ZWN0aW5nTm9kZShpbWFnZUVsZW1lbnQpKQorICAgICAgICBwYXN0ZWJvYXJkSW1hZ2UuZGF0YUlu SFRNTEZvcm1hdCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKFZpc2libGVT ZWxlY3Rpb24geyAqaW1hZ2VSYW5nZSB9LCBSZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxG aWxlVVJMc0ZvclByaXZhY3ksIFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVzKTsKIAogICAgIHBh c3RlYm9hcmRJbWFnZS51cmwudXJsID0gdXJsOwogICAgIHBhc3RlYm9hcmRJbWFnZS51cmwudGl0 bGUgPSB0aXRsZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2Nm L0xlZ2FjeVdlYkFyY2hpdmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2Yv TGVnYWN5V2ViQXJjaGl2ZS5jcHAKaW5kZXggNzExNTBjYmRkODk2OWU2YWYwMjg2ODRiNmJmNmNi YzBhNTBiMmZjOS4uN2Y0YmFkNmZjYzNhOWM5N2E2YTUxN2FiOWIyOWQwODBjYTlkYTcxYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2 ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJj aGl2ZS5jcHAKQEAgLTU5Niw4ICs1OTYsNyBAQCBSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gTGVn YWN5V2ViQXJjaGl2ZTo6Y3JlYXRlRnJvbVNlbGVjdGlvbihGcmFtZSogZnJhbWUpCiAgICAgYnVp bGRlci5hcHBlbmQoZG9jdW1lbnRUeXBlU3RyaW5nKCpkb2N1bWVudCkpOwogCiAgICAgVmVjdG9y PE5vZGUqPiBub2RlTGlzdDsKLSAgICBhdXRvIHNlcmlhbGl6ZUNvbXBvc2VkVHJlZSA9IGZyYW1l LT5zZXR0aW5ncygpLnNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkgPyBT ZXJpYWxpemVDb21wb3NlZFRyZWU6OlllcyA6IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6Tm87Ci0g ICAgYnVpbGRlci5hcHBlbmQoc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UoZnJh bWUtPnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLCBSZXNvbHZlVVJMczo6Tm8sIHNlcmlhbGl6ZUNv bXBvc2VkVHJlZSwgJm5vZGVMaXN0KSk7CisgICAgYnVpbGRlci5hcHBlbmQoc2VyaWFsaXplUHJl c2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UoZnJhbWUtPnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLCBS ZXNvbHZlVVJMczo6Tm8sIFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVzLCAmbm9kZUxpc3QpKTsK IAogICAgIGF1dG8gYXJjaGl2ZSA9IGNyZWF0ZShidWlsZGVyLnRvU3RyaW5nKCksICpmcmFtZSwg bm9kZUxpc3QsIG51bGxwdHIpOwogICAgIGlmICghYXJjaGl2ZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmggYi9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5o CmluZGV4IDIwZmNjZjc4MDBhZmI4OTI4ODQyYTllZTI1NzE1OWY5MjRiYTJkOGIuLmQyM2NiYmYw NjgxODQzNDBmYWEwZTA5NWEzNDU1NDQwYmY2OGQwMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKKysrIGIvU291 cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaApA QCAtMjQxLDcgKzI0MSw2IEBACiAjZGVmaW5lIFdlYktpdEluc3BlY3RvckFkZGl0aW9uc0VuYWJs ZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0SW5zcGVjdG9yQWRkaXRpb25zRW5hYmxlZCIKICNkZWZp bmUgV2ViS2l0QXJpYVJlZmxlY3Rpb25FbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdEFyaWFS ZWZsZWN0aW9uRW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0TWVkaWFDYXBhYmlsaXRpZXNFbmFibGVk UHJlZmVyZW5jZUtleSBAIldlYktpdE1lZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZCIKLSNkZWZpbmUg V2ViS2l0U2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWRQcmVmZXJlbmNlS2V5 IEAiV2ViS2l0U2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQiCiAjZGVmaW5l IFdlYktpdENTU0xvZ2ljYWxFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdENTU0xvZ2ljYWxF bmFibGVkIgogI2RlZmluZSBXZWJLaXRMaW5lSGVpZ2h0VW5pdHNFbmFibGVkUHJlZmVyZW5jZUtl eSBAIldlYktpdExpbmVIZWlnaHRVbml0c0VuYWJsZWQiCiAjZGVmaW5lIFdlYktpdERlYnVnSW5B cHBCcm93c2VyUHJpdmFjeUVuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0RGVidWdJbkFwcEJy b3dzZXJQcml2YWN5RW5hYmxlZCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJW aWV3L1dlYlByZWZlcmVuY2VzLm1tCmluZGV4IGVjMTkwZjBkZjkxNmJhYjhmZDlhYzFmMWM1MzRl ZTE2NWUxNjc5NTMuLjE2MzMzMGRlMTFiZGM4ZDg5NDIwZGRkYmM4NTkwNTJlYjhhNzhmMWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMu bW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5t bQpAQCAtMjg4MCwxNiArMjg4MCw2IEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNTdHJpbmc+JiBjbGFz c0lCQ3JlYXRvcklEKCkKICAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZsYWcgZm9yS2V5OldlYktp dE1lZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCi0tIChCT09MKXNl bGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkCi17Ci0gICAgcmV0dXJuIFtzZWxm IF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0U2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0Vu YWJsZWRQcmVmZXJlbmNlS2V5XTsKLX0KLQotLSAodm9pZClzZXRTZWxlY3Rpb25BY3Jvc3NTaGFk b3dCb3VuZGFyaWVzRW5hYmxlZDooQk9PTClmbGFnCi17Ci0gICAgW3NlbGYgX3NldEJvb2xWYWx1 ZTpmbGFnIGZvcktleTpXZWJLaXRTZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxl ZFByZWZlcmVuY2VLZXldOwotfQotCiAtIChCT09MKWNzc0xvZ2ljYWxFbmFibGVkCiB7CiAgICAg cmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0Q1NTTG9naWNhbEVuYWJsZWRQcmVm ZXJlbmNlS2V5XTsKQEAgLTM0MzAsNyArMzQyMCw3IEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNTdHJp bmc+JiBjbGFzc0lCQ3JlYXRvcklEKCkKIAogLSAoQk9PTClrZXlnZW5FbGVtZW50RW5hYmxlZAog ewotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gTk87CiB9CiAKIC0gKHZvaWQpc2V0S2V5 Z2VuRWxlbWVudEVuYWJsZWQ6KEJPT0wpZmxhZwpAQCAtMzQ3Nyw5ICszNDY3LDE4IEBAIHN0YXRp YyBSZXRhaW5QdHI8TlNTdHJpbmc+JiBjbGFzc0lCQ3JlYXRvcklEKCkKICAgICByZXR1cm4gTk87 CiB9CiAKKy0gKEJPT0wpc2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQKK3sK KyAgICByZXR1cm4gWUVTOworfQorCistICh2b2lkKXNldFNlbGVjdGlvbkFjcm9zc1NoYWRvd0Jv dW5kYXJpZXNFbmFibGVkOihCT09MKWZsYWcKK3sKK30KKwogLSAoQk9PTClpc1hTU0F1ZGl0b3JF bmFibGVkCiB7Ci0gICAgcmV0dXJuIEZBTFNFOworICAgIHJldHVybiBOTzsKIH0KIAogLSAodm9p ZClzZXRYU1NBdWRpdG9yRW5hYmxlZDooQk9PTClmbGFnCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oIGIvU291cmNlL1dl YktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCA3MmIw ZDQxMjIwMDU2NjI5MDI2OTc1YzAzMDU1NDAzMGJhYjdkZGZlLi4wM2Q4Mjg5YzY3YjNlNzdjYjEz MTI4MGUwM2Q1ZTlkMmQ1NWJhZDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgKQEAgLTIyNSw3ICsyMjUsNiBA QCBleHRlcm4gTlNTdHJpbmcgKldlYlByZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRlcm5h bE5vdGlmaWNhdGlvbiBXRUJLSVRfREVQUgogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgY2Fj aGVBUElFbmFibGVkOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgZG93bmxvYWRBdHRyaWJ1 dGVFbmFibGVkOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgZGlyZWN0b3J5VXBsb2FkRW5h YmxlZDsKLUBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIHNlbGVjdGlvbkFjcm9zc1NoYWRvd0Jv dW5kYXJpZXNFbmFibGVkOwogQHByb3BlcnR5IChub25hdG9taWMsIGdldHRlcj1jc3NMb2dpY2Fs RW5hYmxlZCkgQk9PTCBDU1NMb2dpY2FsRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBC T09MIGxpbmVIZWlnaHRVbml0c0VuYWJsZWQ7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBs YXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZDsKQEAgLTM3NCw2ICszNzMs NyBAQCBleHRlcm4gTlNTdHJpbmcgKldlYlByZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRl cm5hbE5vdGlmaWNhdGlvbiBXRUJLSVRfREVQUgogQHByb3BlcnR5IChub25hdG9taWMsIGdldHRl cj1pc0hpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQpIEJPT0wgaGl4aWU3NldlYlNvY2tl dFByb3RvY29sRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGFjY2VsZXJhdGVk MmRDYW52YXNFbmFibGVkOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgZXhwZXJpbWVudGFs Tm90aWZpY2F0aW9uc0VuYWJsZWQ7CitAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBzZWxlY3Rp b25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBn ZXR0ZXI9aXNYU1NBdWRpdG9yRW5hYmxlZCkgQk9PTCBYU1NBdWRpdG9yRW5hYmxlZDsKIAogLSAo dm9pZClzZXREaXNrSW1hZ2VDYWNoZUVuYWJsZWQ6KEJPT0wpZW5hYmxlZDsK 450832 2022-02-03 15:52:35 -0800 2022-02-03 21:48:10 -0800 Patch bug-235993-20220203155234.patch text/plain 15322 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE1ODI3MTEwMTY0ZGEwMzI0YTU3ZWVh YzI3NDUxNDg5YjhiNzFmYWUuLjQ5NTg3OGRmZDgxZTUyZGZiNjY3OTZlMjRiNWIxNGE0MDE3OTU3 N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjItMDItMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdh QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRGVsZXRlIFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5k YXJpZXNFbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzU5OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgor CiAyMDIyLTAyLTAxICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtHVEtdW1dQRV0gRml4ZXMgZm9yIG5vbi11bmlmaWVkIGJ1aWxkcyBhZnRlciByMjg4 ODA3IGFuZCByMjg4ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM2YWY4YmM1MGExMDhjMDhmYzhmNTAxNzJi ZDVmOGJmYjY3MTVkOS4uMDE0MGVmNmM5N2MzYWE5NzYyZjRkYzAyNGJiYjBjZmE2NmUzZWYzMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAyLTAxICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERlbGV0ZSBTZWxlY3Rpb25BY3Jvc3NTaGFkb3dC b3VuZGFyaWVzRW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM1OTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRGVsZXRlIHRoaXMgcnVudGltZSBmbGFnIHdoaWNoIGhhcyBhbHdheXMgYmVlbiBl bmFibGVkIGZvciBhIHdoaWxlLgorCisgICAgICAgICogZWRpdGluZy9FZGl0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzZWxlY3RlZFRleHQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6RWRpdG9yOjpzZWxlY3RlZFRleHRGb3JEYXRhVHJhbnNmZXIgY29uc3QpOgorICAgICAg ICAqIGVkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaXNp YmxlU2VsZWN0aW9uOjphZGp1c3RTZWxlY3Rpb25Ub0F2b2lkQ3Jvc3NpbmdTaGFkb3dCb3VuZGFy aWVzKToKKyAgICAgICAgKiBlZGl0aW5nL2NvY29hL0VkaXRvckNvY29hLm1tOgorICAgICAgICAo V2ViQ29yZTo6RWRpdG9yOjpzZWxlY3Rpb25JbkhUTUxGb3JtYXQpOgorICAgICAgICAqIGVkaXRp bmcvZ3RrL0VkaXRvckd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OndyaXRlU2Vs ZWN0aW9uVG9QYXN0ZWJvYXJkKToKKyAgICAgICAgKiBlZGl0aW5nL2xpYndwZS9FZGl0b3JMaWJX UEUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjp3cml0ZVNlbGVjdGlvblRvUGFzdGVi b2FyZCk6CisgICAgICAgICogZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tOgorICAgICAgICAoV2Vi Q29yZTo6RWRpdG9yOjp3cml0ZUltYWdlVG9QYXN0ZWJvYXJkKToKKyAgICAgICAgKiBsb2FkZXIv YXJjaGl2ZS9jZi9MZWdhY3lXZWJBcmNoaXZlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2Fj eVdlYkFyY2hpdmU6OmNyZWF0ZUZyb21TZWxlY3Rpb24pOgorCiAyMDIyLTAyLTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVzZSBtb3JlIEF0b21TdHJpbmcg YW5kIHVuLWlubGluZSBjb2RlIGZvciBTY3JpcHRFbGVtZW50Q2FjaGVkU2NyaXB0RmV0Y2hlciBh bmQgaXRzIHN1YmNsYXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRleCBjZTJkMTY5 M2ZlOWJhOTM0NjJkNTU3Nzc4YzU0NjMyZGE2ODgxNDA0Li4xNmVhYWVhNTQ2MzhhYzVhZDk2Nzli OTllMjAxOGQyNzBjOTIwYmZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTggQEAKKzIwMjItMDItMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgRGVsZXRlIFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU5OTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcv V2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJl bmNlcy5tbToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMga2V5Z2VuRWxlbWVudEVuYWJsZWRd KToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRh cmllc0VuYWJsZWRdKToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2V0U2VsZWN0aW9uQWNy b3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQ6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2Vz IGlzWFNTQXVkaXRvckVuYWJsZWRdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2Vz UHJpdmF0ZS5oOgorCiAyMDIyLTAxLTMxICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIEZvbnRDYXNjYWRlOjpmb250TWV0cmljcygpIGFu ZCBSZW5kZXJTdHlsZTo6Zm9udE1ldHJpY3MoKSB0byBmb250TWV0cmljc09mUHJpbWFyeUZvbnQo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVu Y2VzSW50ZXJuYWwueWFtbCBiL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVm ZXJlbmNlc0ludGVybmFsLnlhbWwKaW5kZXggZDVhZjE4MTc5NThiZjY2YmE4YjdlZDRjODFjYWY5 MDMwYjFkNjg5OS4uYzQ1MTc2ZDkyNDE2ZTFiYzRhZTE4NDlmNWU1NDI5OWMyYjlhZGYzYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50 ZXJuYWwueWFtbAorKysgYi9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVy ZW5jZXNJbnRlcm5hbC55YW1sCkBAIC03MzQsMTggKzczNCw2IEBAIFNlY3VyZUNvbnRleHRDaGVj a3NFbmFibGVkOgogICAgIFdlYktpdDoKICAgICAgIGRlZmF1bHQ6IHRydWUKIAotU2VsZWN0aW9u QWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQ6Ci0gIHR5cGU6IGJvb2wKLSAgaHVtYW5SZWFk YWJsZU5hbWU6ICJTZWxlY3Rpb24gYWNyb3NzIHNoYWRvdyBET00iCi0gIGh1bWFuUmVhZGFibGVE ZXNjcmlwdGlvbjogIkFsbG93IHVzZXItaW5pdGlhdGVkIHNlbGVjdGlvbiBhY3Jvc3Mgc2hhZG93 IERPTSBib3VuZGFyaWVzIgotICBkZWZhdWx0VmFsdWU6Ci0gICAgV2ViS2l0TGVnYWN5OgotICAg ICAgZGVmYXVsdDogdHJ1ZQotICAgIFdlYktpdDoKLSAgICAgIGRlZmF1bHQ6IHRydWUKLSAgICBX ZWJDb3JlOgotICAgICAgZGVmYXVsdDogdHJ1ZQotICAgICAgCiBTZWxlY3Rpb25GbGlwcGluZ0Vu YWJsZWQ6CiAgIHR5cGU6IGJvb2wKICAgaHVtYW5SZWFkYWJsZU5hbWU6ICJTZWxlY3Rpb24gRmxp cHBpbmciCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5kZXggMTY2NTc4NDc3MzZkNDUzNGQy OGY4MDkyZDM1NTViZWU3MTZlZjA2YS4uMTg1ODkyNTJjYzY3YmNjYzNjYWM0N2RkMGFhMGNmZTU1 MThmZWI4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApAQCAtMzMwNSwxOCArMzMwNSwx MiBAQCB2b2lkIEVkaXRvcjo6Y2hhbmdlU2VsZWN0aW9uQWZ0ZXJDb21tYW5kKGNvbnN0IFZpc2li bGVTZWxlY3Rpb24mIG5ld1NlbGVjdGlvbiwgTwogCiBTdHJpbmcgRWRpdG9yOjpzZWxlY3RlZFRl eHQoKSBjb25zdAogewotICAgIFRleHRJdGVyYXRvckJlaGF2aW9ycyBiZWhhdmlvcnM7Ci0gICAg aWYgKG1fZG9jdW1lbnQuc2V0dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVz RW5hYmxlZCgpKQotICAgICAgICBiZWhhdmlvcnMuYWRkKFRleHRJdGVyYXRvckJlaGF2aW9yOjpU cmF2ZXJzZXNGbGF0VHJlZSk7Ci0gICAgcmV0dXJuIHNlbGVjdGVkVGV4dChiZWhhdmlvcnMpOwor ICAgIHJldHVybiBzZWxlY3RlZFRleHQoVGV4dEl0ZXJhdG9yQmVoYXZpb3I6OlRyYXZlcnNlc0Zs YXRUcmVlKTsKIH0KIAogU3RyaW5nIEVkaXRvcjo6c2VsZWN0ZWRUZXh0Rm9yRGF0YVRyYW5zZmVy KCkgY29uc3QKIHsKLSAgICBUZXh0SXRlcmF0b3JCZWhhdmlvcnMgYmVoYXZpb3JzIHsgVGV4dEl0 ZXJhdG9yQmVoYXZpb3I6OkVtaXRzSW1hZ2VBbHRUZXh0IH07Ci0gICAgaWYgKG1fZG9jdW1lbnQu c2V0dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZCgpKQotICAg ICAgICBiZWhhdmlvcnMuYWRkKFRleHRJdGVyYXRvckJlaGF2aW9yOjpUcmF2ZXJzZXNGbGF0VHJl ZSk7Ci0gICAgcmV0dXJuIHNlbGVjdGVkVGV4dChiZWhhdmlvcnMpOworICAgIHJldHVybiBzZWxl Y3RlZFRleHQoT3B0aW9uU2V0IHsgVGV4dEl0ZXJhdG9yQmVoYXZpb3I6OkVtaXRzSW1hZ2VBbHRU ZXh0IH0gfCBUZXh0SXRlcmF0b3JCZWhhdmlvcjo6VHJhdmVyc2VzRmxhdFRyZWUpOwogfQogCiBT dHJpbmcgRWRpdG9yOjpzZWxlY3RlZFRleHQoVGV4dEl0ZXJhdG9yQmVoYXZpb3JzIGJlaGF2aW9y cykgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVj dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwCmlu ZGV4IGQ0Njk3NzA5NjYyNTcxYTA4YzM2YTU3YjM3YWJiZTgyMDVlZGEwNjcuLjE3MDJiM2U5YWE4 ZjYzNTFiNmFhNTQ3NjgwNDU5NGU2NGEzOWRiZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9WaXNpYmxlU2VsZWN0aW9uLmNwcApAQCAtNTMxLDExICs1MzEsOSBAQCB2b2lkIFZpc2libGVT ZWxlY3Rpb246OmFkanVzdFNlbGVjdGlvblRvQXZvaWRDcm9zc2luZ1NoYWRvd0JvdW5kYXJpZXMo KQogICAgIGlmICgmc3RhcnROb2RlLT50cmVlU2NvcGUoKSA9PSAmZW5kTm9kZS0+dHJlZVNjb3Bl KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChzdGFydE5vZGUtPmRvY3VtZW50KCkuc2V0 dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZCgpKSB7Ci0gICAg ICAgIGlmICghaXNJblVzZXJBZ2VudFNoYWRvd1Jvb3RPckhhc0VkaXRhYmxlU2hhZG93QW5jZXN0 b3Ioc3RhcnROb2RlKQotICAgICAgICAgICAgJiYgIWlzSW5Vc2VyQWdlbnRTaGFkb3dSb290T3JI YXNFZGl0YWJsZVNoYWRvd0FuY2VzdG9yKGVuZE5vZGUpKQotICAgICAgICAgICAgcmV0dXJuOwot ICAgIH0KKyAgICBpZiAoIWlzSW5Vc2VyQWdlbnRTaGFkb3dSb290T3JIYXNFZGl0YWJsZVNoYWRv d0FuY2VzdG9yKHN0YXJ0Tm9kZSkKKyAgICAgICAgJiYgIWlzSW5Vc2VyQWdlbnRTaGFkb3dSb290 T3JIYXNFZGl0YWJsZVNoYWRvd0FuY2VzdG9yKGVuZE5vZGUpKQorICAgICAgICByZXR1cm47CiAK ICAgICAvLyBDb3JyZWN0IHRoZSBmb2N1cyBpZiBuZWNlc3NhcnkuCiAgICAgaWYgKG1fYW5jaG9y SXNGaXJzdCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9FZGl0 b3JDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRWRpdG9yQ29jb2EubW0K aW5kZXggMzhkYmQyNTkzYjg2YmJhOWE5MGNhZWIzMDBmZmFmMGY5YTkyODMzZi4uOTZjZWJmOTE1 YjkzYWY5MTMyYWE3N2QwMjFjMTZkOThkMGQ1OWMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9jb2NvYS9FZGl0b3JDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2NvY29hL0VkaXRvckNvY29hLm1tCkBAIC03NSw4ICs3NSw3IEBAIHN0YXRpYyBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBhcmNoaXZlZERhdGFGb3JBdHRyaWJ1dGVkU3RyaW5nKE5TQXR0cmlidXRl ZFN0cmluZyAqCiAKIFN0cmluZyBFZGl0b3I6OnNlbGVjdGlvbkluSFRNTEZvcm1hdCgpCiB7Ci0g ICAgcmV0dXJuIHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKG1fZG9jdW1lbnQu c2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdMb2NhbEZp bGVVUkxzRm9yUHJpdmFjeSwKLSAgICAgICAgbV9kb2N1bWVudC5zZXR0aW5ncygpLnNlbGVjdGlv bkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkgPyBTZXJpYWxpemVDb21wb3NlZFRyZWU6 OlllcyA6IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6Tm8pOworICAgIHJldHVybiBzZXJpYWxpemVQ cmVzZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZShtX2RvY3VtZW50LnNlbGVjdGlvbigpLnNlbGVjdGlv bigpLCBSZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxGaWxlVVJMc0ZvclByaXZhY3ksIFNl cmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVzKTsKIH0KIAogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VM RU1FTlQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2d0ay9FZGl0b3JHdGsu Y3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9ndGsvRWRpdG9yR3RrLmNwcAppbmRleCAzNmMw NGQ2MTBkODJjYzZjMGE5YzBkNjljZTEzNWQ4M2NiMDZhNjZiLi45NGUzODEzNzViOTc3MTcwODI4 MjhlMGM5NjQ4YjU0OTdkNmYyNGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L2d0ay9FZGl0b3JHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvZ3RrL0VkaXRv ckd0ay5jcHAKQEAgLTExNyw4ICsxMTcsNyBAQCB2b2lkIEVkaXRvcjo6d3JpdGVTZWxlY3Rpb25U b1Bhc3RlYm9hcmQoUGFzdGVib2FyZCYgcGFzdGVib2FyZCkKICAgICBQYXN0ZWJvYXJkV2ViQ29u dGVudCBwYXN0ZWJvYXJkQ29udGVudDsKICAgICBwYXN0ZWJvYXJkQ29udGVudC5jYW5TbWFydENv cHlPckRlbGV0ZSA9IGNhblNtYXJ0Q29weU9yRGVsZXRlKCk7CiAgICAgcGFzdGVib2FyZENvbnRl bnQudGV4dCA9IHNlbGVjdGVkVGV4dEZvckRhdGFUcmFuc2ZlcigpOwotICAgIHBhc3RlYm9hcmRD b250ZW50Lm1hcmt1cCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKG1fZG9j dW1lbnQuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdM b2NhbEZpbGVVUkxzRm9yUHJpdmFjeSwKLSAgICAgICAgbV9kb2N1bWVudC5zZXR0aW5ncygpLnNl bGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkgPyBTZXJpYWxpemVDb21wb3Nl ZFRyZWU6OlllcyA6IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6Tm8pOworICAgIHBhc3RlYm9hcmRD b250ZW50Lm1hcmt1cCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKG1fZG9j dW1lbnQuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29sdmVVUkxzOjpZZXNFeGNsdWRpbmdM b2NhbEZpbGVVUkxzRm9yUHJpdmFjeSwgU2VyaWFsaXplQ29tcG9zZWRUcmVlOjpZZXMpOwogICAg IHBhc3RlYm9hcmRDb250ZW50LmNvbnRlbnRPcmlnaW4gPSBtX2RvY3VtZW50Lm9yaWdpbklkZW50 aWZpZXJGb3JQYXN0ZWJvYXJkKCk7CiAgICAgcGFzdGVib2FyZC53cml0ZShwYXN0ZWJvYXJkQ29u dGVudCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2xpYndwZS9FZGl0 b3JMaWJXUEUuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9saWJ3cGUvRWRpdG9yTGliV1BF LmNwcAppbmRleCA4NTk1ZWQxZGRmMzg5NzExNDIyZTQ1Mzk4OGRiYmMzZGU1ZGU4NzAzLi5iOTc4 ZTJlOGY4ZTg4MmJiYzdkMGY5MWNhZDc2YzM4MjUwOGU5YTNmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL2xpYndwZS9FZGl0b3JMaWJXUEUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvbGlid3BlL0VkaXRvckxpYldQRS5jcHAKQEAgLTY1LDggKzY1LDcgQEAgdm9p ZCBFZGl0b3I6OndyaXRlU2VsZWN0aW9uVG9QYXN0ZWJvYXJkKFBhc3RlYm9hcmQmIHBhc3RlYm9h cmQpCiB7CiAgICAgUGFzdGVib2FyZFdlYkNvbnRlbnQgcGFzdGVib2FyZENvbnRlbnQ7CiAgICAg cGFzdGVib2FyZENvbnRlbnQudGV4dCA9IHNlbGVjdGVkVGV4dEZvckRhdGFUcmFuc2ZlcigpOwot ICAgIHBhc3RlYm9hcmRDb250ZW50Lm1hcmt1cCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxB cHBlYXJhbmNlKG1fZG9jdW1lbnQuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29sdmVVUkxz OjpZZXNFeGNsdWRpbmdMb2NhbEZpbGVVUkxzRm9yUHJpdmFjeSwKLSAgICAgICAgbV9kb2N1bWVu dC5zZXR0aW5ncygpLnNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkgPyBT ZXJpYWxpemVDb21wb3NlZFRyZWU6OlllcyA6IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6Tm8pOwor ICAgIHBhc3RlYm9hcmRDb250ZW50Lm1hcmt1cCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxB cHBlYXJhbmNlKG1fZG9jdW1lbnQuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29sdmVVUkxz OjpZZXNFeGNsdWRpbmdMb2NhbEZpbGVVUkxzRm9yUHJpdmFjeSwgU2VyaWFsaXplQ29tcG9zZWRU cmVlOjpZZXMpOwogICAgIHBhc3RlYm9hcmQud3JpdGUocGFzdGVib2FyZENvbnRlbnQpOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JNYWMubW0gYi9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JNYWMubW0KaW5kZXggMzAzNmNkMzJkNmNk ODMyYzIyMDI4M2E4NDQ1YTg5OWE1YTY2Y2EzYy4uMzIyNDNmYjljNmNkNzdhZWEyNWVjNDZkNTBi ZGJlNDUwYjFkMWRkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRWRp dG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbQpA QCAtMzM3LDEwICszMzcsOCBAQCB2b2lkIEVkaXRvcjo6d3JpdGVJbWFnZVRvUGFzdGVib2FyZChQ YXN0ZWJvYXJkJiBwYXN0ZWJvYXJkLCBFbGVtZW50JiBpbWFnZUVsZW1lbgogICAgIGlmICghcGFz dGVib2FyZC5pc1N0YXRpYygpKQogICAgICAgICBwYXN0ZWJvYXJkSW1hZ2UuZGF0YUluV2ViQXJj aGl2ZUZvcm1hdCA9IGltYWdlSW5XZWJBcmNoaXZlRm9ybWF0KGltYWdlRWxlbWVudCk7CiAKLSAg ICBpZiAoYXV0byBpbWFnZVJhbmdlID0gbWFrZVJhbmdlU2VsZWN0aW5nTm9kZShpbWFnZUVsZW1l bnQpKSB7Ci0gICAgICAgIGF1dG8gc2VyaWFsaXplQ29tcG9zZWRUcmVlID0gbV9kb2N1bWVudC5z ZXR0aW5ncygpLnNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkgPyBTZXJp YWxpemVDb21wb3NlZFRyZWU6OlllcyA6IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6Tm87Ci0gICAg ICAgIHBhc3RlYm9hcmRJbWFnZS5kYXRhSW5IVE1MRm9ybWF0ID0gc2VyaWFsaXplUHJlc2Vydmlu Z1Zpc3VhbEFwcGVhcmFuY2UoVmlzaWJsZVNlbGVjdGlvbiB7ICppbWFnZVJhbmdlIH0sIFJlc29s dmVVUkxzOjpZZXNFeGNsdWRpbmdMb2NhbEZpbGVVUkxzRm9yUHJpdmFjeSwgc2VyaWFsaXplQ29t cG9zZWRUcmVlKTsKLSAgICB9CisgICAgaWYgKGF1dG8gaW1hZ2VSYW5nZSA9IG1ha2VSYW5nZVNl bGVjdGluZ05vZGUoaW1hZ2VFbGVtZW50KSkKKyAgICAgICAgcGFzdGVib2FyZEltYWdlLmRhdGFJ bkhUTUxGb3JtYXQgPSBzZXJpYWxpemVQcmVzZXJ2aW5nVmlzdWFsQXBwZWFyYW5jZShWaXNpYmxl U2VsZWN0aW9uIHsgKmltYWdlUmFuZ2UgfSwgUmVzb2x2ZVVSTHM6Olllc0V4Y2x1ZGluZ0xvY2Fs RmlsZVVSTHNGb3JQcml2YWN5LCBTZXJpYWxpemVDb21wb3NlZFRyZWU6Olllcyk7CiAKICAgICBw YXN0ZWJvYXJkSW1hZ2UudXJsLnVybCA9IHVybDsKICAgICBwYXN0ZWJvYXJkSW1hZ2UudXJsLnRp dGxlID0gdGl0bGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9j Zi9MZWdhY3lXZWJBcmNoaXZlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2Nm L0xlZ2FjeVdlYkFyY2hpdmUuY3BwCmluZGV4IDcxMTUwY2JkZDg5NjllNmFmMDI4Njg0YjZiZjZj YmMwYTUwYjJmYzkuLjdmNGJhZDZmY2MzYTljOTdhNmE1MTdhYjliMjlkMDgwY2E5ZGE3MWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFyY2hp dmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFy Y2hpdmUuY3BwCkBAIC01OTYsOCArNTk2LDcgQEAgUmVmUHRyPExlZ2FjeVdlYkFyY2hpdmU+IExl Z2FjeVdlYkFyY2hpdmU6OmNyZWF0ZUZyb21TZWxlY3Rpb24oRnJhbWUqIGZyYW1lKQogICAgIGJ1 aWxkZXIuYXBwZW5kKGRvY3VtZW50VHlwZVN0cmluZygqZG9jdW1lbnQpKTsKIAogICAgIFZlY3Rv cjxOb2RlKj4gbm9kZUxpc3Q7Ci0gICAgYXV0byBzZXJpYWxpemVDb21wb3NlZFRyZWUgPSBmcmFt ZS0+c2V0dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZCgpID8g U2VyaWFsaXplQ29tcG9zZWRUcmVlOjpZZXMgOiBTZXJpYWxpemVDb21wb3NlZFRyZWU6Ok5vOwot ICAgIGJ1aWxkZXIuYXBwZW5kKHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKGZy YW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKSwgUmVzb2x2ZVVSTHM6Ok5vLCBzZXJpYWxpemVD b21wb3NlZFRyZWUsICZub2RlTGlzdCkpOworICAgIGJ1aWxkZXIuYXBwZW5kKHNlcmlhbGl6ZVBy ZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKSwg UmVzb2x2ZVVSTHM6Ok5vLCBTZXJpYWxpemVDb21wb3NlZFRyZWU6OlllcywgJm5vZGVMaXN0KSk7 CiAKICAgICBhdXRvIGFyY2hpdmUgPSBjcmVhdGUoYnVpbGRlci50b1N0cmluZygpLCAqZnJhbWUs IG5vZGVMaXN0LCBudWxscHRyKTsKICAgICBpZiAoIWFyY2hpdmUpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oIGIv U291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUu aAppbmRleCAyMGZjY2Y3ODAwYWZiODkyODg0MmE5ZWUyNTcxNTlmOTI0YmEyZDhiLi5kMjNjYmJm MDY4MTg0MzQwZmFhMGUwOTVhMzQ1NTQ0MGJmNjhkMDBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgK QEAgLTI0MSw3ICsyNDEsNiBAQAogI2RlZmluZSBXZWJLaXRJbnNwZWN0b3JBZGRpdGlvbnNFbmFi bGVkUHJlZmVyZW5jZUtleSBAIldlYktpdEluc3BlY3RvckFkZGl0aW9uc0VuYWJsZWQiCiAjZGVm aW5lIFdlYktpdEFyaWFSZWZsZWN0aW9uRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRBcmlh UmVmbGVjdGlvbkVuYWJsZWQiCiAjZGVmaW5lIFdlYktpdE1lZGlhQ2FwYWJpbGl0aWVzRW5hYmxl ZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRNZWRpYUNhcGFiaWxpdGllc0VuYWJsZWQiCi0jZGVmaW5l IFdlYktpdFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkUHJlZmVyZW5jZUtl eSBAIldlYktpdFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkIgogI2RlZmlu ZSBXZWJLaXRDU1NMb2dpY2FsRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRDU1NMb2dpY2Fs RW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0TGluZUhlaWdodFVuaXRzRW5hYmxlZFByZWZlcmVuY2VL ZXkgQCJXZWJLaXRMaW5lSGVpZ2h0VW5pdHNFbmFibGVkIgogI2RlZmluZSBXZWJLaXREZWJ1Z0lu QXBwQnJvd3NlclByaXZhY3lFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdERlYnVnSW5BcHBC cm93c2VyUHJpdmFjeUVuYWJsZWQiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2Vi Vmlldy9XZWJQcmVmZXJlbmNlcy5tbQppbmRleCBlYzE5MGYwZGY5MTZiYWI4ZmQ5YWMxZjFjNTM0 ZWUxNjVlMTY3OTUzLi4xNjMzMzBkZTExYmRjOGQ4OTQyMGRkZGJjODU5MDUyZWI4YTc4ZjFhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2Vz Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMu bW0KQEAgLTI4ODAsMTYgKzI4ODAsNiBAQCBzdGF0aWMgUmV0YWluUHRyPE5TU3RyaW5nPiYgY2xh c3NJQkNyZWF0b3JJRCgpCiAgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZvcktleTpXZWJL aXRNZWRpYUNhcGFiaWxpdGllc0VuYWJsZWRQcmVmZXJlbmNlS2V5XTsKIH0KIAotLSAoQk9PTClz ZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZAotewotICAgIHJldHVybiBbc2Vs ZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNF bmFibGVkUHJlZmVyZW5jZUtleV07Ci19Ci0KLS0gKHZvaWQpc2V0U2VsZWN0aW9uQWNyb3NzU2hh ZG93Qm91bmRhcmllc0VuYWJsZWQ6KEJPT0wpZmxhZwotewotICAgIFtzZWxmIF9zZXRCb29sVmFs dWU6ZmxhZyBmb3JLZXk6V2ViS2l0U2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJs ZWRQcmVmZXJlbmNlS2V5XTsKLX0KLQogLSAoQk9PTCljc3NMb2dpY2FsRW5hYmxlZAogewogICAg IHJldHVybiBbc2VsZiBfYm9vbFZhbHVlRm9yS2V5OldlYktpdENTU0xvZ2ljYWxFbmFibGVkUHJl ZmVyZW5jZUtleV07CkBAIC0zNDMwLDcgKzM0MjAsNyBAQCBzdGF0aWMgUmV0YWluUHRyPE5TU3Ry aW5nPiYgY2xhc3NJQkNyZWF0b3JJRCgpCiAKIC0gKEJPT0wpa2V5Z2VuRWxlbWVudEVuYWJsZWQK IHsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIE5POwogfQogCiAtICh2b2lkKXNldEtl eWdlbkVsZW1lbnRFbmFibGVkOihCT09MKWZsYWcKQEAgLTM0NzcsOSArMzQ2NywxOCBAQCBzdGF0 aWMgUmV0YWluUHRyPE5TU3RyaW5nPiYgY2xhc3NJQkNyZWF0b3JJRCgpCiAgICAgcmV0dXJuIE5P OwogfQogCistIChCT09MKXNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkCit7 CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAodm9pZClzZXRTZWxlY3Rpb25BY3Jvc3NTaGFkb3dC b3VuZGFyaWVzRW5hYmxlZDooQk9PTClmbGFnCit7Cit9CisKIC0gKEJPT0wpaXNYU1NBdWRpdG9y RW5hYmxlZAogewotICAgIHJldHVybiBGQUxTRTsKKyAgICByZXR1cm4gTk87CiB9CiAKIC0gKHZv aWQpc2V0WFNTQXVkaXRvckVuYWJsZWQ6KEJPT0wpZmxhZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaCBiL1NvdXJjZS9X ZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgKaW5kZXggNzJi MGQ0MTIyMDA1NjYyOTAyNjk3NWMwMzA1NTQwMzBiYWI3ZGRmZS4uMDNkODI4OWM2N2IzZTc3Y2Ix MzEyODBlMDNkNWU5ZDJkNTViYWQ2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCkBAIC0yMjUsNyArMjI1LDYg QEAgZXh0ZXJuIE5TU3RyaW5nICpXZWJQcmVmZXJlbmNlc0NhY2hlTW9kZWxDaGFuZ2VkSW50ZXJu YWxOb3RpZmljYXRpb24gV0VCS0lUX0RFUFIKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGNh Y2hlQVBJRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGRvd25sb2FkQXR0cmli dXRlRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGRpcmVjdG9yeVVwbG9hZEVu YWJsZWQ7Ci1AcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBzZWxlY3Rpb25BY3Jvc3NTaGFkb3dC b3VuZGFyaWVzRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBnZXR0ZXI9Y3NzTG9naWNh bEVuYWJsZWQpIEJPT0wgQ1NTTG9naWNhbEVuYWJsZWQ7CiBAcHJvcGVydHkgKG5vbmF0b21pYykg Qk9PTCBsaW5lSGVpZ2h0VW5pdHNFbmFibGVkOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wg bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ7CkBAIC0zNzQsNiArMzcz LDcgQEAgZXh0ZXJuIE5TU3RyaW5nICpXZWJQcmVmZXJlbmNlc0NhY2hlTW9kZWxDaGFuZ2VkSW50 ZXJuYWxOb3RpZmljYXRpb24gV0VCS0lUX0RFUFIKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBnZXR0 ZXI9aXNIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkKSBCT09MIGhpeGllNzZXZWJTb2Nr ZXRQcm90b2NvbEVuYWJsZWQ7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBhY2NlbGVyYXRl ZDJkQ2FudmFzRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGV4cGVyaW1lbnRh bE5vdGlmaWNhdGlvbnNFbmFibGVkOworQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgc2VsZWN0 aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQ7CiBAcHJvcGVydHkgKG5vbmF0b21pYywg Z2V0dGVyPWlzWFNTQXVkaXRvckVuYWJsZWQpIEJPT0wgWFNTQXVkaXRvckVuYWJsZWQ7CiAKIC0g KHZvaWQpc2V0RGlza0ltYWdlQ2FjaGVFbmFibGVkOihCT09MKWVuYWJsZWQ7Cg== 450865 2022-02-03 21:48:12 -0800 2022-02-03 22:38:28 -0800 Patch for landing bug-235993-20220203214811.patch text/plain 15312 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE1ODI3MTEwMTY0ZGEwMzI0YTU3ZWVh YzI3NDUxNDg5YjhiNzFmYWUuLjk2ZWNiNjY0YzQyYjBhZjVhYTc5OTdkZDYzYzc4NWU0N2RmN2Yz YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjItMDItMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdh QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRGVsZXRlIFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5k YXJpZXNFbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzU5OTMKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAg ICAqIFNjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAy MDIyLTAyLTAxICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdW1dQRV0gRml4ZXMgZm9yIG5vbi11bmlmaWVkIGJ1aWxkcyBhZnRlciByMjg4ODA3 IGFuZCByMjg4ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM2YWY4YmM1MGExMDhjMDhmYzhmNTAxNzJiZDVm OGJmYjY3MTVkOS4uNWMzOWEyMjg1ZDRmZGYwMzYxMDExMGQwOGEwMDc2ZGFiZTAxM2I1NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAyLTAxICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgorCisgICAgICAgIERlbGV0ZSBTZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3Vu ZGFyaWVzRW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjM1OTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAg ICAgRGVsZXRlIHRoaXMgcnVudGltZSBmbGFnIHdoaWNoIGhhcyBhbHdheXMgYmVlbiBlbmFibGVk IGZvciBhIHdoaWxlLgorCisgICAgICAgICogZWRpdGluZy9FZGl0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RWRpdG9yOjpzZWxlY3RlZFRleHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 RWRpdG9yOjpzZWxlY3RlZFRleHRGb3JEYXRhVHJhbnNmZXIgY29uc3QpOgorICAgICAgICAqIGVk aXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaXNpYmxlU2Vs ZWN0aW9uOjphZGp1c3RTZWxlY3Rpb25Ub0F2b2lkQ3Jvc3NpbmdTaGFkb3dCb3VuZGFyaWVzKToK KyAgICAgICAgKiBlZGl0aW5nL2NvY29hL0VkaXRvckNvY29hLm1tOgorICAgICAgICAoV2ViQ29y ZTo6RWRpdG9yOjpzZWxlY3Rpb25JbkhUTUxGb3JtYXQpOgorICAgICAgICAqIGVkaXRpbmcvZ3Rr L0VkaXRvckd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OndyaXRlU2VsZWN0aW9u VG9QYXN0ZWJvYXJkKToKKyAgICAgICAgKiBlZGl0aW5nL2xpYndwZS9FZGl0b3JMaWJXUEUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjp3cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZCk6 CisgICAgICAgICogZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 RWRpdG9yOjp3cml0ZUltYWdlVG9QYXN0ZWJvYXJkKToKKyAgICAgICAgKiBsb2FkZXIvYXJjaGl2 ZS9jZi9MZWdhY3lXZWJBcmNoaXZlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVdlYkFy Y2hpdmU6OmNyZWF0ZUZyb21TZWxlY3Rpb24pOgorCiAyMDIyLTAyLTAxICBSeW9zdWtlIE5pd2Eg IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVzZSBtb3JlIEF0b21TdHJpbmcgYW5kIHVu LWlubGluZSBjb2RlIGZvciBTY3JpcHRFbGVtZW50Q2FjaGVkU2NyaXB0RmV0Y2hlciBhbmQgaXRz IHN1YmNsYXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRleCBjZTJkMTY5M2ZlOWJh OTM0NjJkNTU3Nzc4YzU0NjMyZGE2ODgxNDA0Li42MzExNWJkMmQyMTgxOGRlNjYyNzdiMmVhM2Ix NzZiODVhYTY3NDBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMjItMDItMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgRGVsZXRlIFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU5OTMKKworICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVy ZW5jZUtleXNQcml2YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbToK KyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMga2V5Z2VuRWxlbWVudEVuYWJsZWRdKToKKyAgICAg ICAgKC1bV2ViUHJlZmVyZW5jZXMgc2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJs ZWRdKToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2V0U2VsZWN0aW9uQWNyb3NzU2hhZG93 Qm91bmRhcmllc0VuYWJsZWQ6XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIGlzWFNTQXVk aXRvckVuYWJsZWRdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5o OgorCiAyMDIyLTAxLTMxICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVuYW1lIEZvbnRDYXNjYWRlOjpmb250TWV0cmljcygpIGFuZCBSZW5kZXJT dHlsZTo6Zm9udE1ldHJpY3MoKSB0byBmb250TWV0cmljc09mUHJpbWFyeUZvbnQoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJu YWwueWFtbCBiL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0lu dGVybmFsLnlhbWwKaW5kZXggZDVhZjE4MTc5NThiZjY2YmE4YjdlZDRjODFjYWY5MDMwYjFkNjg5 OS4uYzQ1MTc2ZDkyNDE2ZTFiYzRhZTE4NDlmNWU1NDI5OWMyYjlhZGYzYyAxMDA2NDQKLS0tIGEv U291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFt bAorKysgYi9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRl cm5hbC55YW1sCkBAIC03MzQsMTggKzczNCw2IEBAIFNlY3VyZUNvbnRleHRDaGVja3NFbmFibGVk OgogICAgIFdlYktpdDoKICAgICAgIGRlZmF1bHQ6IHRydWUKIAotU2VsZWN0aW9uQWNyb3NzU2hh ZG93Qm91bmRhcmllc0VuYWJsZWQ6Ci0gIHR5cGU6IGJvb2wKLSAgaHVtYW5SZWFkYWJsZU5hbWU6 ICJTZWxlY3Rpb24gYWNyb3NzIHNoYWRvdyBET00iCi0gIGh1bWFuUmVhZGFibGVEZXNjcmlwdGlv bjogIkFsbG93IHVzZXItaW5pdGlhdGVkIHNlbGVjdGlvbiBhY3Jvc3Mgc2hhZG93IERPTSBib3Vu ZGFyaWVzIgotICBkZWZhdWx0VmFsdWU6Ci0gICAgV2ViS2l0TGVnYWN5OgotICAgICAgZGVmYXVs dDogdHJ1ZQotICAgIFdlYktpdDoKLSAgICAgIGRlZmF1bHQ6IHRydWUKLSAgICBXZWJDb3JlOgot ICAgICAgZGVmYXVsdDogdHJ1ZQotICAgICAgCiBTZWxlY3Rpb25GbGlwcGluZ0VuYWJsZWQ6CiAg IHR5cGU6IGJvb2wKICAgaHVtYW5SZWFkYWJsZU5hbWU6ICJTZWxlY3Rpb24gRmxpcHBpbmciCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5kZXggMTY2NTc4NDc3MzZkNDUzNGQyOGY4MDkyZDM1 NTViZWU3MTZlZjA2YS4uYjNlNDViMjAwMDg2MGUyYjAyZmZjMWYyMWI1NjUwYjhmZDk2ZjE3MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcApAQCAtMzMwNSwxOCArMzMwNSwxMiBAQCB2b2lk IEVkaXRvcjo6Y2hhbmdlU2VsZWN0aW9uQWZ0ZXJDb21tYW5kKGNvbnN0IFZpc2libGVTZWxlY3Rp b24mIG5ld1NlbGVjdGlvbiwgTwogCiBTdHJpbmcgRWRpdG9yOjpzZWxlY3RlZFRleHQoKSBjb25z dAogewotICAgIFRleHRJdGVyYXRvckJlaGF2aW9ycyBiZWhhdmlvcnM7Ci0gICAgaWYgKG1fZG9j dW1lbnQuc2V0dGluZ3MoKS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZCgp KQotICAgICAgICBiZWhhdmlvcnMuYWRkKFRleHRJdGVyYXRvckJlaGF2aW9yOjpUcmF2ZXJzZXNG bGF0VHJlZSk7Ci0gICAgcmV0dXJuIHNlbGVjdGVkVGV4dChiZWhhdmlvcnMpOworICAgIHJldHVy biBzZWxlY3RlZFRleHQoVGV4dEl0ZXJhdG9yQmVoYXZpb3I6OlRyYXZlcnNlc0ZsYXRUcmVlKTsK IH0KIAogU3RyaW5nIEVkaXRvcjo6c2VsZWN0ZWRUZXh0Rm9yRGF0YVRyYW5zZmVyKCkgY29uc3QK IHsKLSAgICBUZXh0SXRlcmF0b3JCZWhhdmlvcnMgYmVoYXZpb3JzIHsgVGV4dEl0ZXJhdG9yQmVo YXZpb3I6OkVtaXRzSW1hZ2VBbHRUZXh0IH07Ci0gICAgaWYgKG1fZG9jdW1lbnQuc2V0dGluZ3Mo KS5zZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZCgpKQotICAgICAgICBiZWhh dmlvcnMuYWRkKFRleHRJdGVyYXRvckJlaGF2aW9yOjpUcmF2ZXJzZXNGbGF0VHJlZSk7Ci0gICAg cmV0dXJuIHNlbGVjdGVkVGV4dChiZWhhdmlvcnMpOworICAgIHJldHVybiBzZWxlY3RlZFRleHQo T3B0aW9uU2V0IHsgVGV4dEl0ZXJhdG9yQmVoYXZpb3I6OkVtaXRzSW1hZ2VBbHRUZXh0LCBUZXh0 SXRlcmF0b3JCZWhhdmlvcjo6VHJhdmVyc2VzRmxhdFRyZWUgfSk7CiB9CiAKIFN0cmluZyBFZGl0 b3I6OnNlbGVjdGVkVGV4dChUZXh0SXRlcmF0b3JCZWhhdmlvcnMgYmVoYXZpb3JzKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKaW5kZXggZDQ2OTc3 MDk2NjI1NzFhMDhjMzZhNTdiMzdhYmJlODIwNWVkYTA2Ny4uMTcwMmIzZTlhYThmNjM1MWI2YWE1 NDc2ODA0NTk0ZTY0YTM5ZGJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9W aXNpYmxlU2VsZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVT ZWxlY3Rpb24uY3BwCkBAIC01MzEsMTEgKzUzMSw5IEBAIHZvaWQgVmlzaWJsZVNlbGVjdGlvbjo6 YWRqdXN0U2VsZWN0aW9uVG9Bdm9pZENyb3NzaW5nU2hhZG93Qm91bmRhcmllcygpCiAgICAgaWYg KCZzdGFydE5vZGUtPnRyZWVTY29wZSgpID09ICZlbmROb2RlLT50cmVlU2NvcGUoKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgaWYgKHN0YXJ0Tm9kZS0+ZG9jdW1lbnQoKS5zZXR0aW5ncygpLnNl bGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkpIHsKLSAgICAgICAgaWYgKCFp c0luVXNlckFnZW50U2hhZG93Um9vdE9ySGFzRWRpdGFibGVTaGFkb3dBbmNlc3RvcihzdGFydE5v ZGUpCi0gICAgICAgICAgICAmJiAhaXNJblVzZXJBZ2VudFNoYWRvd1Jvb3RPckhhc0VkaXRhYmxl U2hhZG93QW5jZXN0b3IoZW5kTm9kZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgfQorICAg IGlmICghaXNJblVzZXJBZ2VudFNoYWRvd1Jvb3RPckhhc0VkaXRhYmxlU2hhZG93QW5jZXN0b3Io c3RhcnROb2RlKQorICAgICAgICAmJiAhaXNJblVzZXJBZ2VudFNoYWRvd1Jvb3RPckhhc0VkaXRh YmxlU2hhZG93QW5jZXN0b3IoZW5kTm9kZSkpCisgICAgICAgIHJldHVybjsKIAogICAgIC8vIENv cnJlY3QgdGhlIGZvY3VzIGlmIG5lY2Vzc2FyeS4KICAgICBpZiAobV9hbmNob3JJc0ZpcnN0KSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0VkaXRvckNvY29hLm1t IGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9FZGl0b3JDb2NvYS5tbQppbmRleCAzOGRi ZDI1OTNiODZiYmE5YTkwY2FlYjMwMGZmYWYwZjlhOTI4MzNmLi45NmNlYmY5MTViOTNhZjkxMzJh YTc3ZDAyMWMxNmQ5OGQwZDU5YzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L2NvY29hL0VkaXRvckNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2Ev RWRpdG9yQ29jb2EubW0KQEAgLTc1LDggKzc1LDcgQEAgc3RhdGljIFJlZlB0cjxTaGFyZWRCdWZm ZXI+IGFyY2hpdmVkRGF0YUZvckF0dHJpYnV0ZWRTdHJpbmcoTlNBdHRyaWJ1dGVkU3RyaW5nICoK IAogU3RyaW5nIEVkaXRvcjo6c2VsZWN0aW9uSW5IVE1MRm9ybWF0KCkKIHsKLSAgICByZXR1cm4g c2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UobV9kb2N1bWVudC5zZWxlY3Rpb24o KS5zZWxlY3Rpb24oKSwgUmVzb2x2ZVVSTHM6Olllc0V4Y2x1ZGluZ0xvY2FsRmlsZVVSTHNGb3JQ cml2YWN5LAotICAgICAgICBtX2RvY3VtZW50LnNldHRpbmdzKCkuc2VsZWN0aW9uQWNyb3NzU2hh ZG93Qm91bmRhcmllc0VuYWJsZWQoKSA/IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVzIDogU2Vy aWFsaXplQ29tcG9zZWRUcmVlOjpObyk7CisgICAgcmV0dXJuIHNlcmlhbGl6ZVByZXNlcnZpbmdW aXN1YWxBcHBlYXJhbmNlKG1fZG9jdW1lbnQuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCksIFJlc29s dmVVUkxzOjpZZXNFeGNsdWRpbmdMb2NhbEZpbGVVUkxzRm9yUHJpdmFjeSwgU2VyaWFsaXplQ29t cG9zZWRUcmVlOjpZZXMpOwogfQogCiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvZ3RrL0VkaXRvckd0ay5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL2d0ay9FZGl0b3JHdGsuY3BwCmluZGV4IDM2YzA0ZDYxMGQ4MmNj NmMwYTljMGQ2OWNlMTM1ZDgzY2IwNmE2NmIuLjk0ZTM4MTM3NWI5NzcxNzA4MjgyOGUwYzk2NDhi NTQ5N2Q2ZjI0ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvZ3RrL0VkaXRv ckd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9ndGsvRWRpdG9yR3RrLmNwcApA QCAtMTE3LDggKzExNyw3IEBAIHZvaWQgRWRpdG9yOjp3cml0ZVNlbGVjdGlvblRvUGFzdGVib2Fy ZChQYXN0ZWJvYXJkJiBwYXN0ZWJvYXJkKQogICAgIFBhc3RlYm9hcmRXZWJDb250ZW50IHBhc3Rl Ym9hcmRDb250ZW50OwogICAgIHBhc3RlYm9hcmRDb250ZW50LmNhblNtYXJ0Q29weU9yRGVsZXRl ID0gY2FuU21hcnRDb3B5T3JEZWxldGUoKTsKICAgICBwYXN0ZWJvYXJkQ29udGVudC50ZXh0ID0g c2VsZWN0ZWRUZXh0Rm9yRGF0YVRyYW5zZmVyKCk7Ci0gICAgcGFzdGVib2FyZENvbnRlbnQubWFy a3VwID0gc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UobV9kb2N1bWVudC5zZWxl Y3Rpb24oKS5zZWxlY3Rpb24oKSwgUmVzb2x2ZVVSTHM6Olllc0V4Y2x1ZGluZ0xvY2FsRmlsZVVS THNGb3JQcml2YWN5LAotICAgICAgICBtX2RvY3VtZW50LnNldHRpbmdzKCkuc2VsZWN0aW9uQWNy b3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQoKSA/IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVz IDogU2VyaWFsaXplQ29tcG9zZWRUcmVlOjpObyk7CisgICAgcGFzdGVib2FyZENvbnRlbnQubWFy a3VwID0gc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UobV9kb2N1bWVudC5zZWxl Y3Rpb24oKS5zZWxlY3Rpb24oKSwgUmVzb2x2ZVVSTHM6Olllc0V4Y2x1ZGluZ0xvY2FsRmlsZVVS THNGb3JQcml2YWN5LCBTZXJpYWxpemVDb21wb3NlZFRyZWU6Olllcyk7CiAgICAgcGFzdGVib2Fy ZENvbnRlbnQuY29udGVudE9yaWdpbiA9IG1fZG9jdW1lbnQub3JpZ2luSWRlbnRpZmllckZvclBh c3RlYm9hcmQoKTsKICAgICBwYXN0ZWJvYXJkLndyaXRlKHBhc3RlYm9hcmRDb250ZW50KTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbGlid3BlL0VkaXRvckxpYldQRS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2xpYndwZS9FZGl0b3JMaWJXUEUuY3BwCmluZGV4 IDg1OTVlZDFkZGYzODk3MTE0MjJlNDUzOTg4ZGJiYzNkZTVkZTg3MDMuLmI5NzhlMmU4ZjhlODgy YmJjN2QwZjkxY2FkNzZjMzgyNTA4ZTlhM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvbGlid3BlL0VkaXRvckxpYldQRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9saWJ3cGUvRWRpdG9yTGliV1BFLmNwcApAQCAtNjUsOCArNjUsNyBAQCB2b2lkIEVkaXRvcjo6 d3JpdGVTZWxlY3Rpb25Ub1Bhc3RlYm9hcmQoUGFzdGVib2FyZCYgcGFzdGVib2FyZCkKIHsKICAg ICBQYXN0ZWJvYXJkV2ViQ29udGVudCBwYXN0ZWJvYXJkQ29udGVudDsKICAgICBwYXN0ZWJvYXJk Q29udGVudC50ZXh0ID0gc2VsZWN0ZWRUZXh0Rm9yRGF0YVRyYW5zZmVyKCk7Ci0gICAgcGFzdGVi b2FyZENvbnRlbnQubWFya3VwID0gc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2Uo bV9kb2N1bWVudC5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKSwgUmVzb2x2ZVVSTHM6Olllc0V4Y2x1 ZGluZ0xvY2FsRmlsZVVSTHNGb3JQcml2YWN5LAotICAgICAgICBtX2RvY3VtZW50LnNldHRpbmdz KCkuc2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQoKSA/IFNlcmlhbGl6ZUNv bXBvc2VkVHJlZTo6WWVzIDogU2VyaWFsaXplQ29tcG9zZWRUcmVlOjpObyk7CisgICAgcGFzdGVi b2FyZENvbnRlbnQubWFya3VwID0gc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2Uo bV9kb2N1bWVudC5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKSwgUmVzb2x2ZVVSTHM6Olllc0V4Y2x1 ZGluZ0xvY2FsRmlsZVVSTHNGb3JQcml2YWN5LCBTZXJpYWxpemVDb21wb3NlZFRyZWU6Olllcyk7 CiAgICAgcGFzdGVib2FyZC53cml0ZShwYXN0ZWJvYXJkQ29udGVudCk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbSBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbQppbmRleCAzMDM2Y2QzMmQ2Y2Q4MzJjMjIwMjgz YTg0NDVhODk5YTVhNjZjYTNjLi4zMjI0M2ZiOWM2Y2Q3N2FlYTI1ZWM0NmQ1MGJkYmU0NTBiMWQx ZGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JNYWMubW0K KysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCkBAIC0zMzcsMTAg KzMzNyw4IEBAIHZvaWQgRWRpdG9yOjp3cml0ZUltYWdlVG9QYXN0ZWJvYXJkKFBhc3RlYm9hcmQm IHBhc3RlYm9hcmQsIEVsZW1lbnQmIGltYWdlRWxlbWVuCiAgICAgaWYgKCFwYXN0ZWJvYXJkLmlz U3RhdGljKCkpCiAgICAgICAgIHBhc3RlYm9hcmRJbWFnZS5kYXRhSW5XZWJBcmNoaXZlRm9ybWF0 ID0gaW1hZ2VJbldlYkFyY2hpdmVGb3JtYXQoaW1hZ2VFbGVtZW50KTsKIAotICAgIGlmIChhdXRv IGltYWdlUmFuZ2UgPSBtYWtlUmFuZ2VTZWxlY3RpbmdOb2RlKGltYWdlRWxlbWVudCkpIHsKLSAg ICAgICAgYXV0byBzZXJpYWxpemVDb21wb3NlZFRyZWUgPSBtX2RvY3VtZW50LnNldHRpbmdzKCku c2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQoKSA/IFNlcmlhbGl6ZUNvbXBv c2VkVHJlZTo6WWVzIDogU2VyaWFsaXplQ29tcG9zZWRUcmVlOjpObzsKLSAgICAgICAgcGFzdGVi b2FyZEltYWdlLmRhdGFJbkhUTUxGb3JtYXQgPSBzZXJpYWxpemVQcmVzZXJ2aW5nVmlzdWFsQXBw ZWFyYW5jZShWaXNpYmxlU2VsZWN0aW9uIHsgKmltYWdlUmFuZ2UgfSwgUmVzb2x2ZVVSTHM6Olll c0V4Y2x1ZGluZ0xvY2FsRmlsZVVSTHNGb3JQcml2YWN5LCBzZXJpYWxpemVDb21wb3NlZFRyZWUp OwotICAgIH0KKyAgICBpZiAoYXV0byBpbWFnZVJhbmdlID0gbWFrZVJhbmdlU2VsZWN0aW5nTm9k ZShpbWFnZUVsZW1lbnQpKQorICAgICAgICBwYXN0ZWJvYXJkSW1hZ2UuZGF0YUluSFRNTEZvcm1h dCA9IHNlcmlhbGl6ZVByZXNlcnZpbmdWaXN1YWxBcHBlYXJhbmNlKFZpc2libGVTZWxlY3Rpb24g eyAqaW1hZ2VSYW5nZSB9LCBSZXNvbHZlVVJMczo6WWVzRXhjbHVkaW5nTG9jYWxGaWxlVVJMc0Zv clByaXZhY3ksIFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVzKTsKIAogICAgIHBhc3RlYm9hcmRJ bWFnZS51cmwudXJsID0gdXJsOwogICAgIHBhc3RlYm9hcmRJbWFnZS51cmwudGl0bGUgPSB0aXRs ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdl YkFyY2hpdmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2Vi QXJjaGl2ZS5jcHAKaW5kZXggNzExNTBjYmRkODk2OWU2YWYwMjg2ODRiNmJmNmNiYzBhNTBiMmZj OS4uN2Y0YmFkNmZjYzNhOWM5N2E2YTUxN2FiOWIyOWQwODBjYTlkYTcxYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAK QEAgLTU5Niw4ICs1OTYsNyBAQCBSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gTGVnYWN5V2ViQXJj aGl2ZTo6Y3JlYXRlRnJvbVNlbGVjdGlvbihGcmFtZSogZnJhbWUpCiAgICAgYnVpbGRlci5hcHBl bmQoZG9jdW1lbnRUeXBlU3RyaW5nKCpkb2N1bWVudCkpOwogCiAgICAgVmVjdG9yPE5vZGUqPiBu b2RlTGlzdDsKLSAgICBhdXRvIHNlcmlhbGl6ZUNvbXBvc2VkVHJlZSA9IGZyYW1lLT5zZXR0aW5n cygpLnNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkKCkgPyBTZXJpYWxpemVD b21wb3NlZFRyZWU6OlllcyA6IFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6Tm87Ci0gICAgYnVpbGRl ci5hcHBlbmQoc2VyaWFsaXplUHJlc2VydmluZ1Zpc3VhbEFwcGVhcmFuY2UoZnJhbWUtPnNlbGVj dGlvbigpLnNlbGVjdGlvbigpLCBSZXNvbHZlVVJMczo6Tm8sIHNlcmlhbGl6ZUNvbXBvc2VkVHJl ZSwgJm5vZGVMaXN0KSk7CisgICAgYnVpbGRlci5hcHBlbmQoc2VyaWFsaXplUHJlc2VydmluZ1Zp c3VhbEFwcGVhcmFuY2UoZnJhbWUtPnNlbGVjdGlvbigpLnNlbGVjdGlvbigpLCBSZXNvbHZlVVJM czo6Tm8sIFNlcmlhbGl6ZUNvbXBvc2VkVHJlZTo6WWVzLCAmbm9kZUxpc3QpKTsKIAogICAgIGF1 dG8gYXJjaGl2ZSA9IGNyZWF0ZShidWlsZGVyLnRvU3RyaW5nKCksICpmcmFtZSwgbm9kZUxpc3Qs IG51bGxwdHIpOwogICAgIGlmICghYXJjaGl2ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmggYi9Tb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCmluZGV4IDIw ZmNjZjc4MDBhZmI4OTI4ODQyYTllZTI1NzE1OWY5MjRiYTJkOGIuLmQyM2NiYmYwNjgxODQzNDBm YWEwZTA5NWEzNDU1NDQwYmY2OGQwMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaApAQCAtMjQxLDcg KzI0MSw2IEBACiAjZGVmaW5lIFdlYktpdEluc3BlY3RvckFkZGl0aW9uc0VuYWJsZWRQcmVmZXJl bmNlS2V5IEAiV2ViS2l0SW5zcGVjdG9yQWRkaXRpb25zRW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0 QXJpYVJlZmxlY3Rpb25FbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdEFyaWFSZWZsZWN0aW9u RW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0TWVkaWFDYXBhYmlsaXRpZXNFbmFibGVkUHJlZmVyZW5j ZUtleSBAIldlYktpdE1lZGlhQ2FwYWJpbGl0aWVzRW5hYmxlZCIKLSNkZWZpbmUgV2ViS2l0U2Vs ZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0 U2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQiCiAjZGVmaW5lIFdlYktpdENT U0xvZ2ljYWxFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdENTU0xvZ2ljYWxFbmFibGVkIgog I2RlZmluZSBXZWJLaXRMaW5lSGVpZ2h0VW5pdHNFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktp dExpbmVIZWlnaHRVbml0c0VuYWJsZWQiCiAjZGVmaW5lIFdlYktpdERlYnVnSW5BcHBCcm93c2Vy UHJpdmFjeUVuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0RGVidWdJbkFwcEJyb3dzZXJQcml2 YWN5RW5hYmxlZCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZXMubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VzLm1tCmluZGV4IGVjMTkwZjBkZjkxNmJhYjhmZDlhYzFmMWM1MzRlZTE2NWUxNjc5 NTMuLjE2MzMzMGRlMTFiZGM4ZDg5NDIwZGRkYmM4NTkwNTJlYjhhNzhmMWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KKysrIGIv U291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQpAQCAtMjg4 MCwxNiArMjg4MCw2IEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNTdHJpbmc+JiBjbGFzc0lCQ3JlYXRv cklEKCkKICAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZsYWcgZm9yS2V5OldlYktpdE1lZGlhQ2Fw YWJpbGl0aWVzRW5hYmxlZFByZWZlcmVuY2VLZXldOwogfQogCi0tIChCT09MKXNlbGVjdGlvbkFj cm9zc1NoYWRvd0JvdW5kYXJpZXNFbmFibGVkCi17Ci0gICAgcmV0dXJuIFtzZWxmIF9ib29sVmFs dWVGb3JLZXk6V2ViS2l0U2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWRQcmVm ZXJlbmNlS2V5XTsKLX0KLQotLSAodm9pZClzZXRTZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFy aWVzRW5hYmxlZDooQk9PTClmbGFnCi17Ci0gICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpmbGFnIGZv cktleTpXZWJLaXRTZWxlY3Rpb25BY3Jvc3NTaGFkb3dCb3VuZGFyaWVzRW5hYmxlZFByZWZlcmVu Y2VLZXldOwotfQotCiAtIChCT09MKWNzc0xvZ2ljYWxFbmFibGVkCiB7CiAgICAgcmV0dXJuIFtz ZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0Q1NTTG9naWNhbEVuYWJsZWRQcmVmZXJlbmNlS2V5 XTsKQEAgLTM0MzAsNyArMzQyMCw3IEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNTdHJpbmc+JiBjbGFz c0lCQ3JlYXRvcklEKCkKIAogLSAoQk9PTClrZXlnZW5FbGVtZW50RW5hYmxlZAogewotICAgIHJl dHVybiBmYWxzZTsKKyAgICByZXR1cm4gTk87CiB9CiAKIC0gKHZvaWQpc2V0S2V5Z2VuRWxlbWVu dEVuYWJsZWQ6KEJPT0wpZmxhZwpAQCAtMzQ3Nyw5ICszNDY3LDE4IEBAIHN0YXRpYyBSZXRhaW5Q dHI8TlNTdHJpbmc+JiBjbGFzc0lCQ3JlYXRvcklEKCkKICAgICByZXR1cm4gTk87CiB9CiAKKy0g KEJPT0wpc2VsZWN0aW9uQWNyb3NzU2hhZG93Qm91bmRhcmllc0VuYWJsZWQKK3sKKyAgICByZXR1 cm4gWUVTOworfQorCistICh2b2lkKXNldFNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNF bmFibGVkOihCT09MKWZsYWcKK3sKK30KKwogLSAoQk9PTClpc1hTU0F1ZGl0b3JFbmFibGVkCiB7 Ci0gICAgcmV0dXJuIEZBTFNFOworICAgIHJldHVybiBOTzsKIH0KIAogLSAodm9pZClzZXRYU1NB dWRpdG9yRW5hYmxlZDooQk9PTClmbGFnCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCA3MmIwZDQxMjIwMDU2 NjI5MDI2OTc1YzAzMDU1NDAzMGJhYjdkZGZlLi4wM2Q4Mjg5YzY3YjNlNzdjYjEzMTI4MGUwM2Q1 ZTlkMmQ1NWJhZDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3 L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dl YlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgKQEAgLTIyNSw3ICsyMjUsNiBAQCBleHRlcm4g TlNTdHJpbmcgKldlYlByZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRlcm5hbE5vdGlmaWNh dGlvbiBXRUJLSVRfREVQUgogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgY2FjaGVBUElFbmFi bGVkOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgZG93bmxvYWRBdHRyaWJ1dGVFbmFibGVk OwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgZGlyZWN0b3J5VXBsb2FkRW5hYmxlZDsKLUBw cm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIHNlbGVjdGlvbkFjcm9zc1NoYWRvd0JvdW5kYXJpZXNF bmFibGVkOwogQHByb3BlcnR5IChub25hdG9taWMsIGdldHRlcj1jc3NMb2dpY2FsRW5hYmxlZCkg Qk9PTCBDU1NMb2dpY2FsRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGxpbmVI ZWlnaHRVbml0c0VuYWJsZWQ7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBsYXlvdXRGb3Jt YXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZDsKQEAgLTM3NCw2ICszNzMsNyBAQCBleHRl cm4gTlNTdHJpbmcgKldlYlByZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRlcm5hbE5vdGlm aWNhdGlvbiBXRUJLSVRfREVQUgogQHByb3BlcnR5IChub25hdG9taWMsIGdldHRlcj1pc0hpeGll NzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQpIEJPT0wgaGl4aWU3NldlYlNvY2tldFByb3RvY29s RW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGFjY2VsZXJhdGVkMmRDYW52YXNF bmFibGVkOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgZXhwZXJpbWVudGFsTm90aWZpY2F0 aW9uc0VuYWJsZWQ7CitAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBzZWxlY3Rpb25BY3Jvc3NT aGFkb3dCb3VuZGFyaWVzRW5hYmxlZDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBnZXR0ZXI9aXNY U1NBdWRpdG9yRW5hYmxlZCkgQk9PTCBYU1NBdWRpdG9yRW5hYmxlZDsKIAogLSAodm9pZClzZXRE aXNrSW1hZ2VDYWNoZUVuYWJsZWQ6KEJPT0wpZW5hYmxlZDsK