239677 2022-04-22 16:48:55 -0700 Web Inspector: request interception should not be guarded based on service workers 2022-04-25 16:16:16 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi ews-watchlist hi inspector-bugzilla-changes joepeck pangle webkit-bug-importer oldest_to_newest 1863817 0 hi 2022-04-22 16:48:55 -0700 . 1863820 1 458188 hi 2022-04-22 16:57:26 -0700 Created attachment 458188 Patch 1863858 2 458201 hi 2022-04-22 21:48:11 -0700 Created attachment 458201 Patch 1863901 3 458201 pangle 2022-04-23 10:25:46 -0700 Comment on attachment 458201 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=458201&action=review r=me > Source/WebCore/inspector/InspectorInstrumentation.cpp:848 > +bool InspectorInstrumentation::shouldInterceptRequestImpl(InstrumentingAgents& instrumentingAgents, ResourceLoader& loader) As far as I can tell, everything we do with the ResourceLoader can be done with a const ref – is there a reason we aren't passing `const ResourceLoader&` throughout instead? > Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp:1121 > + return shouldIntercept(loader.request().url(), Protocol::Network::NetworkStage::Request); Nit: I think we can just `loader.url()` 1864148 4 458285 hi 2022-04-25 11:08:43 -0700 Created attachment 458285 Patch 1864272 5 ews-feeder 2022-04-25 16:15:30 -0700 Committed r293368 (249968@main): <https://commits.webkit.org/249968@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458285. 1864273 6 webkit-bug-importer 2022-04-25 16:16:16 -0700 <rdar://problem/92300532> 458188 2022-04-22 16:57:26 -0700 2022-04-22 21:54:00 -0700 Patch bug-239677-20220422175726.patch text/plain 14812 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYTgwZDQ2MjUzMzVkNGMzNmMzYzAyYzQ4MDQ5MDFlNTliMmMxMDNkLi41 M2MzMjY2Y2YzOTBjZTRlYWU0YTFmYWU2ZDhjYjJjNjAwZDk3Zjc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjkgQEAKKzIwMjItMDQtMjIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcXVlc3QgaW50ZXJjZXB0aW9uIHNob3VsZCBu b3QgYmUgZ3VhcmRlZCBiYXNlZCBvbiBzZXJ2aWNlIHdvcmtlcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTY3NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3Ry dW1lbnRhdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6aW50ZXJjZXB0UmVxdWVzdCk6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OnNob3VsZEludGVyY2VwdFJlcXVlc3RJbXBsKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0Lmg6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlcXVl c3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0Ojpp bnRlcmNlcHRSZXF1ZXN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uV2ViS2l0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRh dGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKToKKyAgICAgICAgUGFz cyBhbG9uZyBgUmVzb3VyY2VMb2FkZXJgIGluc3RlYWQgb2YgYFJlc291cmNlUmVxdWVzdGAgc28g dGhhdCBgSW5zcGVjdG9yTmV0d29ya0FnZW50OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0YAorICAg ICAgICBjYW4gbG9vayBhdCB0aGUgY29uZmlndXJhdGlvbiBvZiB0aGUgbG9hZCAoZS5nLiBgc2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXJgKSwgbm90CisgICAgICAgIGp1c3QgdGhl IHJlcXVlc3QgY29uZmlndXJhdGlvbi4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yTmV0d29ya0FnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0 b3JOZXR3b3JrQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTmV0d29ya0Fn ZW50OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KToKKyAgICAgICAgTW92ZSB0aGUgYCNpZiBFTkFC TEUoU0VSVklDRV9XT1JLRVIpYCBoZXJlLgorCiAyMDIyLTA0LTIxICBUeWxlciBXaWxjb2NrICA8 dHlsZXJfd0BhcHBsZS5jb20+CiAKICAgICAgICAgT25seSBBWElzb2xhdGVkVHJlZTo6dXBkYXRl e0NoaWxkcmVuLE5vZGV9IG9uY2Ugd2hlbiBwcm9jZXNzaW5nIG5vdGlmaWNhdGlvbnMgaW4gQVhP YmplY3RDYWNoZTo6dXBkYXRlSXNvbGF0ZWRUcmVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBiNzAwMGEyNmE4YmM1 YTI3OGE3MGFkMmQ4NTBmMjU4ZGE2ZjZlYzMuLmQ2MGM4MDUwMjA1MTI4Yzg3ODM3YzVmZTQ1Yjhl MmE3ODBiMjkzYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDQtMjIgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJl cXVlc3QgaW50ZXJjZXB0aW9uIHNob3VsZCBub3QgYmUgZ3VhcmRlZCBiYXNlZCBvbiBzZXJ2aWNl IHdvcmtlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzOTY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCk6CisgICAgICAgIE1vdmUgdGhl IGAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKWAgdG8gYFdlYkNvcmU6Okluc3BlY3Rvck5ldHdv cmtBZ2VudDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdGAuCisKIDIwMjItMDQtMjEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBCdWlsZCBpcyBicm9rZW4gb24gc2hp cHBpbmcgbWFjT1MgZHVlIHRvIFRCQSBhbm5vdGF0aW9ucyByZXBsYWNlbWVudCBpbiBBUEkgaGVh ZGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3Ry dW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmNwcAppbmRleCA0ZDA0OWRjYjliNmU0NjU0MzAyOTAzMGI5ZjRkNTFkYjMyNDk0 NjRkLi5iZTliN2E3NGQ5NGY5M2Y5OTY0ZjI1ZGUzYTM4N2FiZGRkZjdkMmNhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNw cApAQCAtODQ1LDEwICs4NDUsMTAgQEAgYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondp bGxJbnRlcmNlcHRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnQKICAgICByZXR1 cm4gZmFsc2U7CiB9CiAKLWJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpzaG91bGRJbnRl cmNlcHRSZXF1ZXN0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRz LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCitib29sIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYg aW5zdHJ1bWVudGluZ0FnZW50cywgUmVzb3VyY2VMb2FkZXImIGxvYWRlcikKIHsKICAgICBpZiAo YXV0byogbmV0d29ya0FnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5lbmFibGVkTmV0d29ya0Fn ZW50KCkpCi0gICAgICAgIHJldHVybiBuZXR3b3JrQWdlbnQtPnNob3VsZEludGVyY2VwdFJlcXVl c3QocmVxdWVzdCk7CisgICAgICAgIHJldHVybiBuZXR3b3JrQWdlbnQtPnNob3VsZEludGVyY2Vw dFJlcXVlc3QobG9hZGVyKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAppbmRleCA1MWJh ZGY0OWE2Y2UwODk3NWQ2NTVlZmEwMWNjYTljZDg3N2U4ZjZiLi5kN2JmOGMxZDU1YWViMDUzZTAz MWE3YjA2ZDZhNzZiY2QyMTZkYWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCkBAIC0yMzgsNyArMjM4LDcgQEAgcHVibGlj OgogICAgIHN0YXRpYyB2b2lkIHdpbGxEZXN0cm95Q2FjaGVkUmVzb3VyY2UoQ2FjaGVkUmVzb3Vy Y2UmKTsKIAogICAgIHN0YXRpYyBib29sIHdpbGxJbnRlcmNlcHQoY29uc3QgRnJhbWUqLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmKTsKLSAgICBzdGF0aWMgYm9vbCBzaG91bGRJbnRlcmNlcHRSZXF1 ZXN0KGNvbnN0IEZyYW1lJiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgc3RhdGljIGJv b2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxvYWRlciYpOwogICAgIHN0YXRpYyBi b29sIHNob3VsZEludGVyY2VwdFJlc3BvbnNlKGNvbnN0IEZyYW1lJiwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYpOwogICAgIHN0YXRpYyB2b2lkIGludGVyY2VwdFJlcXVlc3QoUmVzb3VyY2VMb2Fk ZXImLCBGdW5jdGlvbjx2b2lkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYpPiYmKTsKICAgICBzdGF0 aWMgdm9pZCBpbnRlcmNlcHRSZXNwb25zZShjb25zdCBGcmFtZSYsIGNvbnN0IFJlc291cmNlUmVz cG9uc2UmLCBSZXNvdXJjZUxvYWRlcklkZW50aWZpZXIsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFJlZlB0cjxGcmFnbWVudGVkU2hhcmVkQnVmZmVyPik+ JiYpOwpAQCAtNDQ2LDcgKzQ0Niw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgd2lsbERl c3Ryb3lDYWNoZWRSZXNvdXJjZUltcGwoQ2FjaGVkUmVzb3VyY2UmKTsKIAogICAgIHN0YXRpYyBi b29sIHdpbGxJbnRlcmNlcHRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBjb25zdCBSZXNvdXJj ZVJlcXVlc3QmKTsKLSAgICBzdGF0aWMgYm9vbCBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW1wbChJ bnN0cnVtZW50aW5nQWdlbnRzJiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgc3RhdGlj IGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFJl c291cmNlTG9hZGVyJik7CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVzcG9uc2VJ bXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAg c3RhdGljIHZvaWQgaW50ZXJjZXB0UmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFJl c291cmNlTG9hZGVyJiwgRnVuY3Rpb248dm9pZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKT4mJik7 CiAgICAgc3RhdGljIHZvaWQgaW50ZXJjZXB0UmVzcG9uc2VJbXBsKEluc3RydW1lbnRpbmdBZ2Vu dHMmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgUmVzb3VyY2VMb2FkZXJJZGVudGlmaWVyLCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBSZWZQdHI8RnJh Z21lbnRlZFNoYXJlZEJ1ZmZlcj4pPiYmKTsKQEAgLTEyODgsMTEgKzEyODgsMTEgQEAgaW5saW5l IGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsSW50ZXJjZXB0KGNvbnN0IEZyYW1l KiBmcmFtZSwgY29uc3QgUmUKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWlubGluZSBib29sIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChjb25zdCBGcmFt ZSYgZnJhbWUsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKK2lubGluZSBib29sIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxv YWRlciYgbG9hZGVyKQogewogICAgIEFTU0VSVChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25QdWJs aWM6Omhhc0Zyb250ZW5kcygpKTsKLSAgICBpZiAoYXV0byogYWdlbnRzID0gaW5zdHJ1bWVudGlu Z0FnZW50cyhmcmFtZSkpCi0gICAgICAgIHJldHVybiBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW1w bCgqYWdlbnRzLCByZXF1ZXN0KTsKKyAgICBpZiAoYXV0byogYWdlbnRzID0gaW5zdHJ1bWVudGlu Z0FnZW50cyhsb2FkZXIuZnJhbWUoKSkpCisgICAgICAgIHJldHVybiBzaG91bGRJbnRlcmNlcHRS ZXF1ZXN0SW1wbCgqYWdlbnRzLCBsb2FkZXIpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApAQCAt MTMwNiw3ICsxMzA2LDcgQEAgaW5saW5lIGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpz aG91bGRJbnRlcmNlcHRSZXNwb25zZShjb25zdCBGcmFtZSYgZnJhbWUKIAogaW5saW5lIHZvaWQg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjppbnRlcmNlcHRSZXF1ZXN0KFJlc291cmNlTG9hZGVy JiBsb2FkZXIsIEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik+JiYgaGFuZGxl cikKIHsKLSAgICBBU1NFUlQoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpzaG91bGRJbnRlcmNl cHRSZXF1ZXN0KCpsb2FkZXIuZnJhbWUoKSwgbG9hZGVyLnJlcXVlc3QoKSkpOworICAgIEFTU0VS VChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnNob3VsZEludGVyY2VwdFJlcXVlc3QobG9hZGVy KSk7CiAgICAgaWYgKGF1dG8qIGFnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHMobG9hZGVyLmZy YW1lKCkpKQogICAgICAgICBpbnRlcmNlcHRSZXF1ZXN0SW1wbCgqYWdlbnRzLCBsb2FkZXIsIFdU Rk1vdmUoaGFuZGxlcikpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0LmNwcAppbmRleCBmMDY0MDNhNjIz NGI0MmI2YWQyYTgwYjAxOTRhNTk2ZDg5ZjZlNmJiLi5mNmNiMTg2NDcyM2FkYmNlY2JlZGY1NjBm NTkyN2JmNzRhODE2ZDM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0LmNwcApAQCAtMzAsOSArMzAsOSBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u V2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW50ZXJuYWwoY29uc3QgRnJhbWUmIGZyYW1l LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCitib29sIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKFJlc291cmNlTG9h ZGVyJiBsb2FkZXIpCiB7Ci0gICAgcmV0dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c2hv dWxkSW50ZXJjZXB0UmVxdWVzdChmcmFtZSwgcmVxdWVzdCk7CisgICAgcmV0dXJuIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChsb2FkZXIpOwogfQogCiBi b29sIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVzcG9u c2VJbnRlcm5hbChjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJl c3BvbnNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbldlYktpdC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbldlYktpdC5oCmluZGV4IDA3YjQyMWI1OWMxNTU1ZTFhMjkxZTE4ZWJi MjYyMjEyMmYxNjU4YjIuLmQ2MDEzNGIwNWEwMjAzMTJmNzcwNjU0ZTBjN2I1ZTc0Y2EwY2MyODAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25XZWJLaXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uV2ViS2l0LmgKQEAgLTQwLDI1ICs0MCwyMiBAQCBjbGFzcyBGcmFnbWVudGVk U2hhcmVkQnVmZmVyOwogCiBjbGFzcyBXRUJDT1JFX0VYUE9SVCBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25XZWJLaXQgewogcHVibGljOgotICAgIHN0YXRpYyBib29sIHNob3VsZEludGVyY2VwdFJl cXVlc3QoY29uc3QgRnJhbWUqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKKyAgICBzdGF0aWMg Ym9vbCBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KFJlc291cmNlTG9hZGVyJik7CiAgICAgc3RhdGlj IGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgRnJhbWUqLCBjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJik7CiAgICAgc3RhdGljIHZvaWQgaW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxv YWRlciYsIEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik+JiYpOwogICAgIHN0 YXRpYyB2b2lkIGludGVyY2VwdFJlc3BvbnNlKGNvbnN0IEZyYW1lKiwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYsIFJlc291cmNlTG9hZGVySWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgUmVmUHRyPEZyYWdtZW50ZWRTaGFyZWRCdWZmZXI+ KT4mJik7CiAKIHByaXZhdGU6Ci0gICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVz dEludGVybmFsKGNvbnN0IEZyYW1lJiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgc3Rh dGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKFJlc291cmNlTG9hZGVyJik7 CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVzcG9uc2VJbnRlcm5hbChjb25zdCBG cmFtZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICBzdGF0aWMgdm9pZCBpbnRlcmNl cHRSZXF1ZXN0SW50ZXJuYWwoUmVzb3VyY2VMb2FkZXImLCBGdW5jdGlvbjx2b2lkKGNvbnN0IFJl c291cmNlUmVxdWVzdCYpPiYmKTsKICAgICBzdGF0aWMgdm9pZCBpbnRlcmNlcHRSZXNwb25zZUlu dGVybmFsKGNvbnN0IEZyYW1lJiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFJlc291cmNlTG9h ZGVySWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJiwgUmVmUHRyPEZyYWdtZW50ZWRTaGFyZWRCdWZmZXI+KT4mJik7CiB9OwogCi1pbmxpbmUg Ym9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlcXVl c3QoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCitp bmxpbmUgYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2Vw dFJlcXVlc3QoUmVzb3VyY2VMb2FkZXImIGxvYWRlcikKIHsKICAgICBGQVNUX1JFVFVSTl9JRl9O T19GUk9OVEVORFMoZmFsc2UpOwotICAgIGlmICghZnJhbWUpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIHJldHVybiBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW50ZXJuYWwoKmZyYW1lLCBy ZXF1ZXN0KTsKKyAgICByZXR1cm4gc2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKGxvYWRl cik7CiB9CiAKIGlubGluZSBib29sIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6c2hv dWxkSW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBSZXNvdXJjZVJl c3BvbnNlJiByZXNwb25zZSkKQEAgLTcyLDcgKzY5LDcgQEAgaW5saW5lIGJvb2wgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uV2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXNwb25zZShjb25zdCBGcmFt ZSoKIAogaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0OjppbnRlcmNl cHRSZXF1ZXN0KFJlc291cmNlTG9hZGVyJiBsb2FkZXIsIEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVz b3VyY2VSZXF1ZXN0Jik+JiYgaGFuZGxlcikKIHsKLSAgICBBU1NFUlQoSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uV2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KGxvYWRlci5mcmFtZSgpLCBs b2FkZXIucmVxdWVzdCgpKSk7CisgICAgQVNTRVJUKEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldl YktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChsb2FkZXIpKTsKICAgICBpbnRlcmNlcHRSZXF1 ZXN0SW50ZXJuYWwobG9hZGVyLCBXVEZNb3ZlKGhhbmRsZXIpKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQu Y3BwCmluZGV4IDBiNGNiNDU5OWEzMDllMGI4YzM0MGE2N2VlZDg3MWIyOWUxYTM3MWUuLjVjZTlj MjBlZWI4ZWQxYWM0YWE0NmRkYzg1YWU2YzViNGY5NDMyMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29ya0FnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvck5ldHdvcmtBZ2VudC5jcHAK QEAgLTExMDgsMTIgKzExMDgsMTcgQEAgYm9vbCBJbnNwZWN0b3JOZXR3b3JrQWdlbnQ6OndpbGxJ bnRlcmNlcHQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogICAgICAgICB8fCBzaG91 bGRJbnRlcmNlcHQocmVxdWVzdC51cmwoKSwgUHJvdG9jb2w6Ok5ldHdvcms6Ok5ldHdvcmtTdGFn ZTo6UmVzcG9uc2UpOwogfQogCi1ib29sIEluc3BlY3Rvck5ldHdvcmtBZ2VudDo6c2hvdWxkSW50 ZXJjZXB0UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCitib29sIEluc3Bl Y3Rvck5ldHdvcmtBZ2VudDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxvYWRlciYg bG9hZGVyKQogewogICAgIGlmICghbV9pbnRlcmNlcHRpb25FbmFibGVkKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gc2hvdWxkSW50ZXJjZXB0KHJlcXVlc3QudXJsKCksIFBy b3RvY29sOjpOZXR3b3JrOjpOZXR3b3JrU3RhZ2U6OlJlcXVlc3QpOworI2lmIEVOQUJMRShTRVJW SUNFX1dPUktFUikKKyAgICBpZiAobG9hZGVyLm9wdGlvbnMoKS5zZXJ2aWNlV29ya2VyUmVnaXN0 cmF0aW9uSWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCisKKyAgICBy ZXR1cm4gc2hvdWxkSW50ZXJjZXB0KGxvYWRlci5yZXF1ZXN0KCkudXJsKCksIFByb3RvY29sOjpO ZXR3b3JrOjpOZXR3b3JrU3RhZ2U6OlJlcXVlc3QpOwogfQogCiBib29sIEluc3BlY3Rvck5ldHdv cmtBZ2VudDo6c2hvdWxkSW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYg cmVzcG9uc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0lu c3BlY3Rvck5ldHdvcmtBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9J bnNwZWN0b3JOZXR3b3JrQWdlbnQuaAppbmRleCA3MmY0MjNmZjYxMjc3ZWVmNGJkMzU2MzI4YzQ2 ZDNiZDkxMzFmZjY1Li5jMzFmZWI1MWRhN2FkNWQxNTMyMGI4Zjg2YTgxNzkxNjg1NzJjYzNhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvck5ldHdv cmtBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9y TmV0d29ya0FnZW50LmgKQEAgLTEyMSw3ICsxMjEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRJ bml0aWFsU2NyaXB0Q29udGVudChSZXNvdXJjZUxvYWRlcklkZW50aWZpZXIsIGNvbnN0IFN0cmlu ZyYgc291cmNlU3RyaW5nKTsKICAgICB2b2lkIGRpZFNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9u KERvY3VtZW50Jik7CiAgICAgYm9vbCB3aWxsSW50ZXJjZXB0KGNvbnN0IFJlc291cmNlUmVxdWVz dCYpOwotICAgIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVl c3QmKTsKKyAgICBib29sIHNob3VsZEludGVyY2VwdFJlcXVlc3QoUmVzb3VyY2VMb2FkZXImKTsK ICAgICBib29sIHNob3VsZEludGVyY2VwdFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2Um KTsKICAgICB2b2lkIGludGVyY2VwdFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBS ZXNvdXJjZUxvYWRlcklkZW50aWZpZXIsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgUmVz b3VyY2VSZXNwb25zZSYsIFJlZlB0cjxGcmFnbWVudGVkU2hhcmVkQnVmZmVyPik+JiYpOwogICAg IHZvaWQgaW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxvYWRlciYsIEZ1bmN0aW9uPHZvaWQoY29u c3QgUmVzb3VyY2VSZXF1ZXN0Jik+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDQ2ZjJkOTk2MTBmOWU0 NTlmYTdkZmQwZGUyZjkyZjRjMjkzODg4NzcuLjYwMjY0Mjc0OTAwNzM0NzhkMTFiNDNkMjlkMzVi MzM5MmYxMTQzNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYkxvYWRlclN0cmF0ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0 d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAgLTIzNiwyMCArMjM2LDE5IEBAIHZvaWQgV2Vi TG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2Fk ZXIsIENhY2hlZFJlc291CiAgICAgICAgIHJldHVybjsKICNlbmRpZgogCi0gICAgaWYgKCF0cnlM b2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVyKHJlc291cmNlTG9hZGVyLCB0cmFja2luZ1BhcmFt ZXRlcnMpKSB7Ci0gICAgICAgIFdFQkxPQURFUlNUUkFURUdZX1JFTEVBU0VfTE9HKCJzY2hlZHVs ZUxvYWQ6IFVSTCB3aWxsIGJlIHNjaGVkdWxlZCB3aXRoIHRoZSBOZXR3b3JrUHJvY2VzcyIpOwor ICAgIGlmICh0cnlMb2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVyKHJlc291cmNlTG9hZGVyLCB0 cmFja2luZ1BhcmFtZXRlcnMpKQorICAgICAgICByZXR1cm47CiAKLSNpZiBFTkFCTEUoU0VSVklD RV9XT1JLRVIpCi0gICAgICAgIGlmICghcmVzb3VyY2VMb2FkZXIub3B0aW9ucygpLnNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyICYmIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldl YktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChyZXNvdXJjZUxvYWRlci5mcmFtZSgpLCByZXNv dXJjZUxvYWRlci5yZXF1ZXN0KCkpKSB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25XZWJLaXQ6OmludGVyY2VwdFJlcXVlc3QocmVzb3VyY2VMb2FkZXIsIFt0aGlzLCBwcm90 ZWN0ZWRSZXNvdXJjZUxvYWRlciA9IFJlZiB7IHJlc291cmNlTG9hZGVyIH0sIHRyYWNraW5nUGFy YW1ldGVycywgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgcmVzb3Vy Y2VdKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkgewotICAgICAgICAgICAgICAgIHNj aGVkdWxlTG9hZEZyb21OZXR3b3JrUHJvY2Vzcyhwcm90ZWN0ZWRSZXNvdXJjZUxvYWRlciwgcmVx dWVzdCwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRU UFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJjZSkpOwotICAgICAgICAgICAg fSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSNlbmRpZgotICAgICAgICBzY2hl ZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIsIHJlc291cmNlTG9hZGVy LnJlcXVlc3QoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQ U1RvSFRUUFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJjZSkpOworICAgIGlm IChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlcXVlc3Qo cmVzb3VyY2VMb2FkZXIpKSB7CisgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktp dDo6aW50ZXJjZXB0UmVxdWVzdChyZXNvdXJjZUxvYWRlciwgW3RoaXMsIHByb3RlY3RlZFJlc291 cmNlTG9hZGVyID0gUmVmIHsgcmVzb3VyY2VMb2FkZXIgfSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBz aG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCByZXNvdXJjZV0oY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KSB7CisgICAgICAgICAgICBXRUJMT0FERVJTVFJBVEVH WV9SRUxFQVNFX0xPRygic2NoZWR1bGVMb2FkOiBpbnRlcmNlcHRlZCBVUkwgd2lsbCBiZSBzY2hl ZHVsZWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MiKTsKKyAgICAgICAgICAgIHNjaGVkdWxlTG9h ZEZyb21OZXR3b3JrUHJvY2Vzcyhwcm90ZWN0ZWRSZXNvdXJjZUxvYWRlciwgcmVxdWVzdCwgdHJh Y2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0 LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJjZSkpOworICAgICAgICB9KTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KKworICAgIFdFQkxPQURFUlNUUkFURUdZX1JFTEVBU0VfTE9HKCJzY2hl ZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIHNjaGVkdWxlZCB3aXRoIHRoZSBOZXR3b3JrUHJvY2VzcyIp OworICAgIHNjaGVkdWxlTG9hZEZyb21OZXR3b3JrUHJvY2VzcyhyZXNvdXJjZUxvYWRlciwgcmVz b3VyY2VMb2FkZXIucmVxdWVzdCgpLCB0cmFja2luZ1BhcmFtZXRlcnMsIHNob3VsZENsZWFyUmVm ZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QsIG1heGltdW1CdWZmZXJpbmdUaW1lKHJlc291cmNl KSk7CiB9CiAKIGJvb2wgV2ViTG9hZGVyU3RyYXRlZ3k6OnRyeUxvYWRpbmdVc2luZ1VSTFNjaGVt ZUhhbmRsZXIoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlTG9hZGVyLCBjb25zdCBXZWJSZXNvdXJj ZUxvYWRlcjo6VHJhY2tpbmdQYXJhbWV0ZXJzJiB0cmFja2luZ1BhcmFtZXRlcnMpCg== 458201 2022-04-22 21:48:11 -0700 2022-04-25 11:08:43 -0700 Patch bug-239677-20220422224810.patch text/plain 14870 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYTgwZDQ2MjUzMzVkNGMzNmMzYzAyYzQ4MDQ5MDFlNTliMmMxMDNkLi41 M2MzMjY2Y2YzOTBjZTRlYWU0YTFmYWU2ZDhjYjJjNjAwZDk3Zjc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjkgQEAKKzIwMjItMDQtMjIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcXVlc3QgaW50ZXJjZXB0aW9uIHNob3VsZCBu b3QgYmUgZ3VhcmRlZCBiYXNlZCBvbiBzZXJ2aWNlIHdvcmtlcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTY3NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3Ry dW1lbnRhdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6aW50ZXJjZXB0UmVxdWVzdCk6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OnNob3VsZEludGVyY2VwdFJlcXVlc3RJbXBsKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0Lmg6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlcXVl c3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0Ojpp bnRlcmNlcHRSZXF1ZXN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uV2ViS2l0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRh dGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKToKKyAgICAgICAgUGFz cyBhbG9uZyBgUmVzb3VyY2VMb2FkZXJgIGluc3RlYWQgb2YgYFJlc291cmNlUmVxdWVzdGAgc28g dGhhdCBgSW5zcGVjdG9yTmV0d29ya0FnZW50OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0YAorICAg ICAgICBjYW4gbG9vayBhdCB0aGUgY29uZmlndXJhdGlvbiBvZiB0aGUgbG9hZCAoZS5nLiBgc2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXJgKSwgbm90CisgICAgICAgIGp1c3QgdGhl IHJlcXVlc3QgY29uZmlndXJhdGlvbi4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yTmV0d29ya0FnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0 b3JOZXR3b3JrQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTmV0d29ya0Fn ZW50OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KToKKyAgICAgICAgTW92ZSB0aGUgYCNpZiBFTkFC TEUoU0VSVklDRV9XT1JLRVIpYCBoZXJlLgorCiAyMDIyLTA0LTIxICBUeWxlciBXaWxjb2NrICA8 dHlsZXJfd0BhcHBsZS5jb20+CiAKICAgICAgICAgT25seSBBWElzb2xhdGVkVHJlZTo6dXBkYXRl e0NoaWxkcmVuLE5vZGV9IG9uY2Ugd2hlbiBwcm9jZXNzaW5nIG5vdGlmaWNhdGlvbnMgaW4gQVhP YmplY3RDYWNoZTo6dXBkYXRlSXNvbGF0ZWRUcmVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBiNzAwMGEyNmE4YmM1 YTI3OGE3MGFkMmQ4NTBmMjU4ZGE2ZjZlYzMuLmQ2MGM4MDUwMjA1MTI4Yzg3ODM3YzVmZTQ1Yjhl MmE3ODBiMjkzYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDQtMjIgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJl cXVlc3QgaW50ZXJjZXB0aW9uIHNob3VsZCBub3QgYmUgZ3VhcmRlZCBiYXNlZCBvbiBzZXJ2aWNl IHdvcmtlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzOTY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCk6CisgICAgICAgIE1vdmUgdGhl IGAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKWAgdG8gYFdlYkNvcmU6Okluc3BlY3Rvck5ldHdv cmtBZ2VudDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdGAuCisKIDIwMjItMDQtMjEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBCdWlsZCBpcyBicm9rZW4gb24gc2hp cHBpbmcgbWFjT1MgZHVlIHRvIFRCQSBhbm5vdGF0aW9ucyByZXBsYWNlbWVudCBpbiBBUEkgaGVh ZGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3Ry dW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmNwcAppbmRleCA0ZDA0OWRjYjliNmU0NjU0MzAyOTAzMGI5ZjRkNTFkYjMyNDk0 NjRkLi5iZTliN2E3NGQ5NGY5M2Y5OTY0ZjI1ZGUzYTM4N2FiZGRkZjdkMmNhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNw cApAQCAtODQ1LDEwICs4NDUsMTAgQEAgYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondp bGxJbnRlcmNlcHRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnQKICAgICByZXR1 cm4gZmFsc2U7CiB9CiAKLWJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpzaG91bGRJbnRl cmNlcHRSZXF1ZXN0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRz LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCitib29sIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYg aW5zdHJ1bWVudGluZ0FnZW50cywgUmVzb3VyY2VMb2FkZXImIGxvYWRlcikKIHsKICAgICBpZiAo YXV0byogbmV0d29ya0FnZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy5lbmFibGVkTmV0d29ya0Fn ZW50KCkpCi0gICAgICAgIHJldHVybiBuZXR3b3JrQWdlbnQtPnNob3VsZEludGVyY2VwdFJlcXVl c3QocmVxdWVzdCk7CisgICAgICAgIHJldHVybiBuZXR3b3JrQWdlbnQtPnNob3VsZEludGVyY2Vw dFJlcXVlc3QobG9hZGVyKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAppbmRleCA1MWJh ZGY0OWE2Y2UwODk3NWQ2NTVlZmEwMWNjYTljZDg3N2U4ZjZiLi5kN2JmOGMxZDU1YWViMDUzZTAz MWE3YjA2ZDZhNzZiY2QyMTZkYWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCkBAIC0yMzgsNyArMjM4LDcgQEAgcHVibGlj OgogICAgIHN0YXRpYyB2b2lkIHdpbGxEZXN0cm95Q2FjaGVkUmVzb3VyY2UoQ2FjaGVkUmVzb3Vy Y2UmKTsKIAogICAgIHN0YXRpYyBib29sIHdpbGxJbnRlcmNlcHQoY29uc3QgRnJhbWUqLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmKTsKLSAgICBzdGF0aWMgYm9vbCBzaG91bGRJbnRlcmNlcHRSZXF1 ZXN0KGNvbnN0IEZyYW1lJiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgc3RhdGljIGJv b2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxvYWRlciYpOwogICAgIHN0YXRpYyBi b29sIHNob3VsZEludGVyY2VwdFJlc3BvbnNlKGNvbnN0IEZyYW1lJiwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYpOwogICAgIHN0YXRpYyB2b2lkIGludGVyY2VwdFJlcXVlc3QoUmVzb3VyY2VMb2Fk ZXImLCBGdW5jdGlvbjx2b2lkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYpPiYmKTsKICAgICBzdGF0 aWMgdm9pZCBpbnRlcmNlcHRSZXNwb25zZShjb25zdCBGcmFtZSYsIGNvbnN0IFJlc291cmNlUmVz cG9uc2UmLCBSZXNvdXJjZUxvYWRlcklkZW50aWZpZXIsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFJlZlB0cjxGcmFnbWVudGVkU2hhcmVkQnVmZmVyPik+ JiYpOwpAQCAtNDQ2LDcgKzQ0Niw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgd2lsbERl c3Ryb3lDYWNoZWRSZXNvdXJjZUltcGwoQ2FjaGVkUmVzb3VyY2UmKTsKIAogICAgIHN0YXRpYyBi b29sIHdpbGxJbnRlcmNlcHRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBjb25zdCBSZXNvdXJj ZVJlcXVlc3QmKTsKLSAgICBzdGF0aWMgYm9vbCBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW1wbChJ bnN0cnVtZW50aW5nQWdlbnRzJiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgc3RhdGlj IGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFJl c291cmNlTG9hZGVyJik7CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVzcG9uc2VJ bXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAg c3RhdGljIHZvaWQgaW50ZXJjZXB0UmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFJl c291cmNlTG9hZGVyJiwgRnVuY3Rpb248dm9pZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKT4mJik7 CiAgICAgc3RhdGljIHZvaWQgaW50ZXJjZXB0UmVzcG9uc2VJbXBsKEluc3RydW1lbnRpbmdBZ2Vu dHMmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgUmVzb3VyY2VMb2FkZXJJZGVudGlmaWVyLCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBSZWZQdHI8RnJh Z21lbnRlZFNoYXJlZEJ1ZmZlcj4pPiYmKTsKQEAgLTEyODgsMTEgKzEyODgsMTEgQEAgaW5saW5l IGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsSW50ZXJjZXB0KGNvbnN0IEZyYW1l KiBmcmFtZSwgY29uc3QgUmUKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWlubGluZSBib29sIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChjb25zdCBGcmFt ZSYgZnJhbWUsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKK2lubGluZSBib29sIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxv YWRlciYgbG9hZGVyKQogewogICAgIEFTU0VSVChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25QdWJs aWM6Omhhc0Zyb250ZW5kcygpKTsKLSAgICBpZiAoYXV0byogYWdlbnRzID0gaW5zdHJ1bWVudGlu Z0FnZW50cyhmcmFtZSkpCi0gICAgICAgIHJldHVybiBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW1w bCgqYWdlbnRzLCByZXF1ZXN0KTsKKyAgICBpZiAoYXV0byogYWdlbnRzID0gaW5zdHJ1bWVudGlu Z0FnZW50cyhsb2FkZXIuZnJhbWUoKSkpCisgICAgICAgIHJldHVybiBzaG91bGRJbnRlcmNlcHRS ZXF1ZXN0SW1wbCgqYWdlbnRzLCBsb2FkZXIpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApAQCAt MTMwNiw3ICsxMzA2LDcgQEAgaW5saW5lIGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpz aG91bGRJbnRlcmNlcHRSZXNwb25zZShjb25zdCBGcmFtZSYgZnJhbWUKIAogaW5saW5lIHZvaWQg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjppbnRlcmNlcHRSZXF1ZXN0KFJlc291cmNlTG9hZGVy JiBsb2FkZXIsIEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik+JiYgaGFuZGxl cikKIHsKLSAgICBBU1NFUlQoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpzaG91bGRJbnRlcmNl cHRSZXF1ZXN0KCpsb2FkZXIuZnJhbWUoKSwgbG9hZGVyLnJlcXVlc3QoKSkpOworICAgIEFTU0VS VChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnNob3VsZEludGVyY2VwdFJlcXVlc3QobG9hZGVy KSk7CiAgICAgaWYgKGF1dG8qIGFnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHMobG9hZGVyLmZy YW1lKCkpKQogICAgICAgICBpbnRlcmNlcHRSZXF1ZXN0SW1wbCgqYWdlbnRzLCBsb2FkZXIsIFdU Rk1vdmUoaGFuZGxlcikpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0LmNwcAppbmRleCBmMDY0MDNhNjIz NGI0MmI2YWQyYTgwYjAxOTRhNTk2ZDg5ZjZlNmJiLi5mNmNiMTg2NDcyM2FkYmNlY2JlZGY1NjBm NTkyN2JmNzRhODE2ZDM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0LmNwcApAQCAtMzAsOSArMzAsOSBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u V2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW50ZXJuYWwoY29uc3QgRnJhbWUmIGZyYW1l LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCitib29sIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKFJlc291cmNlTG9h ZGVyJiBsb2FkZXIpCiB7Ci0gICAgcmV0dXJuIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c2hv dWxkSW50ZXJjZXB0UmVxdWVzdChmcmFtZSwgcmVxdWVzdCk7CisgICAgcmV0dXJuIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChsb2FkZXIpOwogfQogCiBi b29sIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVzcG9u c2VJbnRlcm5hbChjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJl c3BvbnNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbldlYktpdC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbldlYktpdC5oCmluZGV4IDA3YjQyMWI1OWMxNTU1ZTFhMjkxZTE4ZWJi MjYyMjEyMmYxNjU4YjIuLmQ2MDEzNGIwNWEwMjAzMTJmNzcwNjU0ZTBjN2I1ZTc0Y2EwY2MyODAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25XZWJLaXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uV2ViS2l0LmgKQEAgLTQwLDI1ICs0MCwyMiBAQCBjbGFzcyBGcmFnbWVudGVk U2hhcmVkQnVmZmVyOwogCiBjbGFzcyBXRUJDT1JFX0VYUE9SVCBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25XZWJLaXQgewogcHVibGljOgotICAgIHN0YXRpYyBib29sIHNob3VsZEludGVyY2VwdFJl cXVlc3QoY29uc3QgRnJhbWUqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKKyAgICBzdGF0aWMg Ym9vbCBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KFJlc291cmNlTG9hZGVyJik7CiAgICAgc3RhdGlj IGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgRnJhbWUqLCBjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJik7CiAgICAgc3RhdGljIHZvaWQgaW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxv YWRlciYsIEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik+JiYpOwogICAgIHN0 YXRpYyB2b2lkIGludGVyY2VwdFJlc3BvbnNlKGNvbnN0IEZyYW1lKiwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYsIFJlc291cmNlTG9hZGVySWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgUmVmUHRyPEZyYWdtZW50ZWRTaGFyZWRCdWZmZXI+ KT4mJik7CiAKIHByaXZhdGU6Ci0gICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVz dEludGVybmFsKGNvbnN0IEZyYW1lJiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgc3Rh dGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKFJlc291cmNlTG9hZGVyJik7 CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVzcG9uc2VJbnRlcm5hbChjb25zdCBG cmFtZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICBzdGF0aWMgdm9pZCBpbnRlcmNl cHRSZXF1ZXN0SW50ZXJuYWwoUmVzb3VyY2VMb2FkZXImLCBGdW5jdGlvbjx2b2lkKGNvbnN0IFJl c291cmNlUmVxdWVzdCYpPiYmKTsKICAgICBzdGF0aWMgdm9pZCBpbnRlcmNlcHRSZXNwb25zZUlu dGVybmFsKGNvbnN0IEZyYW1lJiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFJlc291cmNlTG9h ZGVySWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJiwgUmVmUHRyPEZyYWdtZW50ZWRTaGFyZWRCdWZmZXI+KT4mJik7CiB9OwogCi1pbmxpbmUg Ym9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlcXVl c3QoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCitp bmxpbmUgYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2Vw dFJlcXVlc3QoUmVzb3VyY2VMb2FkZXImIGxvYWRlcikKIHsKICAgICBGQVNUX1JFVFVSTl9JRl9O T19GUk9OVEVORFMoZmFsc2UpOwotICAgIGlmICghZnJhbWUpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIHJldHVybiBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW50ZXJuYWwoKmZyYW1lLCBy ZXF1ZXN0KTsKKyAgICByZXR1cm4gc2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKGxvYWRl cik7CiB9CiAKIGlubGluZSBib29sIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6c2hv dWxkSW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBSZXNvdXJjZVJl c3BvbnNlJiByZXNwb25zZSkKQEAgLTcyLDcgKzY5LDcgQEAgaW5saW5lIGJvb2wgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uV2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXNwb25zZShjb25zdCBGcmFt ZSoKIAogaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0OjppbnRlcmNl cHRSZXF1ZXN0KFJlc291cmNlTG9hZGVyJiBsb2FkZXIsIEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVz b3VyY2VSZXF1ZXN0Jik+JiYgaGFuZGxlcikKIHsKLSAgICBBU1NFUlQoSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uV2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KGxvYWRlci5mcmFtZSgpLCBs b2FkZXIucmVxdWVzdCgpKSk7CisgICAgQVNTRVJUKEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldl YktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChsb2FkZXIpKTsKICAgICBpbnRlcmNlcHRSZXF1 ZXN0SW50ZXJuYWwobG9hZGVyLCBXVEZNb3ZlKGhhbmRsZXIpKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQu Y3BwCmluZGV4IDBiNGNiNDU5OWEzMDllMGI4YzM0MGE2N2VlZDg3MWIyOWUxYTM3MWUuLjVjZTlj MjBlZWI4ZWQxYWM0YWE0NmRkYzg1YWU2YzViNGY5NDMyMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29ya0FnZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvck5ldHdvcmtBZ2VudC5jcHAK QEAgLTExMDgsMTIgKzExMDgsMTcgQEAgYm9vbCBJbnNwZWN0b3JOZXR3b3JrQWdlbnQ6OndpbGxJ bnRlcmNlcHQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogICAgICAgICB8fCBzaG91 bGRJbnRlcmNlcHQocmVxdWVzdC51cmwoKSwgUHJvdG9jb2w6Ok5ldHdvcms6Ok5ldHdvcmtTdGFn ZTo6UmVzcG9uc2UpOwogfQogCi1ib29sIEluc3BlY3Rvck5ldHdvcmtBZ2VudDo6c2hvdWxkSW50 ZXJjZXB0UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCitib29sIEluc3Bl Y3Rvck5ldHdvcmtBZ2VudDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxvYWRlciYg bG9hZGVyKQogewogICAgIGlmICghbV9pbnRlcmNlcHRpb25FbmFibGVkKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICByZXR1cm4gc2hvdWxkSW50ZXJjZXB0KHJlcXVlc3QudXJsKCksIFBy b3RvY29sOjpOZXR3b3JrOjpOZXR3b3JrU3RhZ2U6OlJlcXVlc3QpOworI2lmIEVOQUJMRShTRVJW SUNFX1dPUktFUikKKyAgICBpZiAobG9hZGVyLm9wdGlvbnMoKS5zZXJ2aWNlV29ya2VyUmVnaXN0 cmF0aW9uSWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCisKKyAgICBy ZXR1cm4gc2hvdWxkSW50ZXJjZXB0KGxvYWRlci5yZXF1ZXN0KCkudXJsKCksIFByb3RvY29sOjpO ZXR3b3JrOjpOZXR3b3JrU3RhZ2U6OlJlcXVlc3QpOwogfQogCiBib29sIEluc3BlY3Rvck5ldHdv cmtBZ2VudDo6c2hvdWxkSW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYg cmVzcG9uc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0lu c3BlY3Rvck5ldHdvcmtBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9J bnNwZWN0b3JOZXR3b3JrQWdlbnQuaAppbmRleCA3MmY0MjNmZjYxMjc3ZWVmNGJkMzU2MzI4YzQ2 ZDNiZDkxMzFmZjY1Li5jMzFmZWI1MWRhN2FkNWQxNTMyMGI4Zjg2YTgxNzkxNjg1NzJjYzNhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvck5ldHdv cmtBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9y TmV0d29ya0FnZW50LmgKQEAgLTEyMSw3ICsxMjEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRJ bml0aWFsU2NyaXB0Q29udGVudChSZXNvdXJjZUxvYWRlcklkZW50aWZpZXIsIGNvbnN0IFN0cmlu ZyYgc291cmNlU3RyaW5nKTsKICAgICB2b2lkIGRpZFNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9u KERvY3VtZW50Jik7CiAgICAgYm9vbCB3aWxsSW50ZXJjZXB0KGNvbnN0IFJlc291cmNlUmVxdWVz dCYpOwotICAgIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVl c3QmKTsKKyAgICBib29sIHNob3VsZEludGVyY2VwdFJlcXVlc3QoUmVzb3VyY2VMb2FkZXImKTsK ICAgICBib29sIHNob3VsZEludGVyY2VwdFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2Um KTsKICAgICB2b2lkIGludGVyY2VwdFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBS ZXNvdXJjZUxvYWRlcklkZW50aWZpZXIsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgUmVz b3VyY2VSZXNwb25zZSYsIFJlZlB0cjxGcmFnbWVudGVkU2hhcmVkQnVmZmVyPik+JiYpOwogICAg IHZvaWQgaW50ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxvYWRlciYsIEZ1bmN0aW9uPHZvaWQoY29u c3QgUmVzb3VyY2VSZXF1ZXN0Jik+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDQ2ZjJkOTk2MTBmOWU0 NTlmYTdkZmQwZGUyZjkyZjRjMjkzODg4NzcuLjA2YjYyN2JhYWJlNDZhZjhlOTdkYjg5Nzk4YTNm YTliNDQ1M2U5MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYkxvYWRlclN0cmF0ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0 d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAgLTIzNiwyMCArMjM2LDIwIEBAIHZvaWQgV2Vi TG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2Fk ZXIsIENhY2hlZFJlc291CiAgICAgICAgIHJldHVybjsKICNlbmRpZgogCi0gICAgaWYgKCF0cnlM b2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVyKHJlc291cmNlTG9hZGVyLCB0cmFja2luZ1BhcmFt ZXRlcnMpKSB7Ci0gICAgICAgIFdFQkxPQURFUlNUUkFURUdZX1JFTEVBU0VfTE9HKCJzY2hlZHVs ZUxvYWQ6IFVSTCB3aWxsIGJlIHNjaGVkdWxlZCB3aXRoIHRoZSBOZXR3b3JrUHJvY2VzcyIpOwor ICAgIGlmICh0cnlMb2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVyKHJlc291cmNlTG9hZGVyLCB0 cmFja2luZ1BhcmFtZXRlcnMpKQorICAgICAgICByZXR1cm47CiAKLSNpZiBFTkFCTEUoU0VSVklD RV9XT1JLRVIpCi0gICAgICAgIGlmICghcmVzb3VyY2VMb2FkZXIub3B0aW9ucygpLnNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyICYmIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldl YktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChyZXNvdXJjZUxvYWRlci5mcmFtZSgpLCByZXNv dXJjZUxvYWRlci5yZXF1ZXN0KCkpKSB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25XZWJLaXQ6OmludGVyY2VwdFJlcXVlc3QocmVzb3VyY2VMb2FkZXIsIFt0aGlzLCBwcm90 ZWN0ZWRSZXNvdXJjZUxvYWRlciA9IFJlZiB7IHJlc291cmNlTG9hZGVyIH0sIHRyYWNraW5nUGFy YW1ldGVycywgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgcmVzb3Vy Y2VdKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkgewotICAgICAgICAgICAgICAgIHNj aGVkdWxlTG9hZEZyb21OZXR3b3JrUHJvY2Vzcyhwcm90ZWN0ZWRSZXNvdXJjZUxvYWRlciwgcmVx dWVzdCwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRU UFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJjZSkpOwotICAgICAgICAgICAg fSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSNlbmRpZgotICAgICAgICBzY2hl ZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIsIHJlc291cmNlTG9hZGVy LnJlcXVlc3QoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQ U1RvSFRUUFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJjZSkpOworICAgIGlm IChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlcXVlc3Qo cmVzb3VyY2VMb2FkZXIpKSB7CisgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktp dDo6aW50ZXJjZXB0UmVxdWVzdChyZXNvdXJjZUxvYWRlciwgW3RoaXMsIHByb3RlY3RlZFJlc291 cmNlTG9hZGVyID0gUmVmIHsgcmVzb3VyY2VMb2FkZXIgfSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBz aG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCByZXNvdXJjZV0oY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KSB7CisgICAgICAgICAgICBhdXRvJiByZXNvdXJjZUxv YWRlciA9IHByb3RlY3RlZFJlc291cmNlTG9hZGVyLmdldCgpOworICAgICAgICAgICAgV0VCTE9B REVSU1RSQVRFR1lfUkVMRUFTRV9MT0coInNjaGVkdWxlTG9hZDogaW50ZXJjZXB0ZWQgVVJMIHdp bGwgYmUgc2NoZWR1bGVkIHdpdGggdGhlIE5ldHdvcmtQcm9jZXNzIik7CisgICAgICAgICAgICBz Y2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIsIHJlcXVlc3QsIHRy YWNraW5nUGFyYW1ldGVycywgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVj dCwgbWF4aW11bUJ1ZmZlcmluZ1RpbWUocmVzb3VyY2UpKTsKKyAgICAgICAgfSk7CiAgICAgICAg IHJldHVybjsKICAgICB9CisKKyAgICBXRUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPRygic2No ZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBzY2hlZHVsZWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3Mi KTsKKyAgICBzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIsIHJl c291cmNlTG9hZGVyLnJlcXVlc3QoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJl ZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJj ZSkpOwogfQogCiBib29sIFdlYkxvYWRlclN0cmF0ZWd5Ojp0cnlMb2FkaW5nVXNpbmdVUkxTY2hl bWVIYW5kbGVyKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlciwgY29uc3QgV2ViUmVzb3Vy Y2VMb2FkZXI6OlRyYWNraW5nUGFyYW1ldGVycyYgdHJhY2tpbmdQYXJhbWV0ZXJzKQo= 458285 2022-04-25 11:08:43 -0700 2022-04-25 16:15:32 -0700 Patch 239677.diff text/plain 14918 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYTgwZDQ2MjUzMzVkNGMzNmMzYzAyYzQ4MDQ5MDFlNTliMmMxMDNkLi41 M2MzMjY2Y2YzOTBjZTRlYWU0YTFmYWU2ZDhjYjJjNjAwZDk3Zjc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjkgQEAKKzIwMjItMDQtMjIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcXVlc3QgaW50ZXJjZXB0aW9uIHNob3VsZCBu b3QgYmUgZ3VhcmRlZCBiYXNlZCBvbiBzZXJ2aWNlIHdvcmtlcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTY3NworCisgICAgICAgIFJldmlld2Vk IGJ5IFBhdHJpY2sgQW5nbGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OnNob3VsZEludGVyY2VwdFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjppbnRlcmNlcHRSZXF1ZXN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdEltcGwpOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQuaDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVz dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6Omlu dGVyY2VwdFJlcXVlc3QpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25XZWJLaXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uV2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0SW50ZXJuYWwpOgorICAgICAgICBQYXNz IGFsb25nIGBSZXNvdXJjZUxvYWRlcmAgaW5zdGVhZCBvZiBgUmVzb3VyY2VSZXF1ZXN0YCBzbyB0 aGF0IGBJbnNwZWN0b3JOZXR3b3JrQWdlbnQ6OnNob3VsZEludGVyY2VwdFJlcXVlc3RgCisgICAg ICAgIGNhbiBsb29rIGF0IHRoZSBjb25maWd1cmF0aW9uIG9mIHRoZSBsb2FkIChlLmcuIGBzZXJ2 aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllcmApLCBub3QKKyAgICAgICAganVzdCB0aGUg cmVxdWVzdCBjb25maWd1cmF0aW9uLgorCisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNw ZWN0b3JOZXR3b3JrQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rv ck5ldHdvcmtBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JOZXR3b3JrQWdl bnQ6OnNob3VsZEludGVyY2VwdFJlcXVlc3QpOgorICAgICAgICBNb3ZlIHRoZSBgI2lmIEVOQUJM RShTRVJWSUNFX1dPUktFUilgIGhlcmUuCisKIDIwMjItMDQtMjEgIFR5bGVyIFdpbGNvY2sgIDx0 eWxlcl93QGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGV7 Q2hpbGRyZW4sTm9kZX0gb25jZSB3aGVuIHByb2Nlc3Npbmcgbm90aWZpY2F0aW9ucyBpbiBBWE9i amVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMGI3MDAwYTI2YThiYzVh Mjc4YTcwYWQyZDg1MGYyNThkYTZmNmVjMy4uZDYwYzgwNTAyMDUxMjhjODc4MzdjNWZlNDViOGUy YTc4MGIyOTNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMi0wNC0yMiAgRGV2aW4g Um91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVx dWVzdCBpbnRlcmNlcHRpb24gc2hvdWxkIG5vdCBiZSBndWFyZGVkIGJhc2VkIG9uIHNlcnZpY2Ug d29ya2VycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM5Njc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUGF0cmljayBBbmdsZS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQpOgorICAgICAgICBNb3ZlIHRoZSBg I2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUilgIHRvIGBXZWJDb3JlOjpJbnNwZWN0b3JOZXR3b3Jr QWdlbnQ6OnNob3VsZEludGVyY2VwdFJlcXVlc3RgLgorCiAyMDIyLTA0LTIxICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgaXMgYnJva2VuIG9uIHNoaXBw aW5nIG1hY09TIGR1ZSB0byBUQkEgYW5ub3RhdGlvbnMgcmVwbGFjZW1lbnQgaW4gQVBJIGhlYWRl cnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVt ZW50YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1l bnRhdGlvbi5jcHAKaW5kZXggNGQwNDlkY2I5YjZlNDY1NDMwMjkwMzBiOWY0ZDUxZGIzMjQ5NDY0 ZC4uYmU5YjdhNzRkOTRmOTNmOTk2NGYyNWRlM2EzODdhYmRkZGY3ZDJjYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAK QEAgLTg0NSwxMCArODQ1LDEwIEBAIGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxs SW50ZXJjZXB0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50CiAgICAgcmV0dXJu IGZhbHNlOwogfQogCi1ib29sIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJj ZXB0UmVxdWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywg Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQorYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OnNob3VsZEludGVyY2VwdFJlcXVlc3RJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGlu c3RydW1lbnRpbmdBZ2VudHMsIGNvbnN0IFJlc291cmNlTG9hZGVyJiBsb2FkZXIpCiB7CiAgICAg aWYgKGF1dG8qIG5ldHdvcmtBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMuZW5hYmxlZE5ldHdv cmtBZ2VudCgpKQotICAgICAgICByZXR1cm4gbmV0d29ya0FnZW50LT5zaG91bGRJbnRlcmNlcHRS ZXF1ZXN0KHJlcXVlc3QpOworICAgICAgICByZXR1cm4gbmV0d29ya0FnZW50LT5zaG91bGRJbnRl cmNlcHRSZXF1ZXN0KGxvYWRlcik7CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXgg NTFiYWRmNDlhNmNlMDg5NzVkNjU1ZWZhMDFjY2E5Y2Q4NzdlOGY2Yi4uZDdiZjhjMWQ1NWFlYjA1 M2UwMzFhN2IwNmQ2YTc2YmNkMjE2ZGFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaApAQCAtMjM4LDcgKzIzOCw3IEBAIHB1 YmxpYzoKICAgICBzdGF0aWMgdm9pZCB3aWxsRGVzdHJveUNhY2hlZFJlc291cmNlKENhY2hlZFJl c291cmNlJik7CiAKICAgICBzdGF0aWMgYm9vbCB3aWxsSW50ZXJjZXB0KGNvbnN0IEZyYW1lKiwg Y29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7Ci0gICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0 UmVxdWVzdChjb25zdCBGcmFtZSYsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOworICAgIHN0YXRp YyBib29sIHNob3VsZEludGVyY2VwdFJlcXVlc3QoY29uc3QgUmVzb3VyY2VMb2FkZXImKTsKICAg ICBzdGF0aWMgYm9vbCBzaG91bGRJbnRlcmNlcHRSZXNwb25zZShjb25zdCBGcmFtZSYsIGNvbnN0 IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICBzdGF0aWMgdm9pZCBpbnRlcmNlcHRSZXF1ZXN0KFJl c291cmNlTG9hZGVyJiwgRnVuY3Rpb248dm9pZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKT4mJik7 CiAgICAgc3RhdGljIHZvaWQgaW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgRnJhbWUmLCBjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiwgUmVzb3VyY2VMb2FkZXJJZGVudGlmaWVyLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBSZWZQdHI8RnJhZ21lbnRlZFNoYXJl ZEJ1ZmZlcj4pPiYmKTsKQEAgLTQ0Niw3ICs0NDYsNyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2 b2lkIHdpbGxEZXN0cm95Q2FjaGVkUmVzb3VyY2VJbXBsKENhY2hlZFJlc291cmNlJik7CiAKICAg ICBzdGF0aWMgYm9vbCB3aWxsSW50ZXJjZXB0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0Jik7Ci0gICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVx dWVzdEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOwor ICAgIHN0YXRpYyBib29sIHNob3VsZEludGVyY2VwdFJlcXVlc3RJbXBsKEluc3RydW1lbnRpbmdB Z2VudHMmLCBjb25zdCBSZXNvdXJjZUxvYWRlciYpOwogICAgIHN0YXRpYyBib29sIHNob3VsZElu dGVyY2VwdFJlc3BvbnNlSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYpOwogICAgIHN0YXRpYyB2b2lkIGludGVyY2VwdFJlcXVlc3RJbXBsKEluc3RydW1l bnRpbmdBZ2VudHMmLCBSZXNvdXJjZUxvYWRlciYsIEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0Jik+JiYpOwogICAgIHN0YXRpYyB2b2lkIGludGVyY2VwdFJlc3BvbnNlSW1wbChJ bnN0cnVtZW50aW5nQWdlbnRzJiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFJlc291cmNlTG9h ZGVySWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJiwgUmVmUHRyPEZyYWdtZW50ZWRTaGFyZWRCdWZmZXI+KT4mJik7CkBAIC0xMjg4LDExICsx Mjg4LDExIEBAIGlubGluZSBib29sIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEludGVy Y2VwdChjb25zdCBGcmFtZSogZnJhbWUsIGNvbnN0IFJlCiAgICAgcmV0dXJuIGZhbHNlOwogfQog Ci1pbmxpbmUgYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnNob3VsZEludGVyY2VwdFJl cXVlc3QoY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qp CitpbmxpbmUgYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnNob3VsZEludGVyY2VwdFJl cXVlc3QoY29uc3QgUmVzb3VyY2VMb2FkZXImIGxvYWRlcikKIHsKICAgICBBU1NFUlQoSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uUHVibGljOjpoYXNGcm9udGVuZHMoKSk7Ci0gICAgaWYgKGF1dG8q IGFnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHMoZnJhbWUpKQotICAgICAgICByZXR1cm4gc2hv dWxkSW50ZXJjZXB0UmVxdWVzdEltcGwoKmFnZW50cywgcmVxdWVzdCk7CisgICAgaWYgKGF1dG8q IGFnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHMobG9hZGVyLmZyYW1lKCkpKQorICAgICAgICBy ZXR1cm4gc2hvdWxkSW50ZXJjZXB0UmVxdWVzdEltcGwoKmFnZW50cywgbG9hZGVyKTsKICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTEzMDYsNyArMTMwNiw3IEBAIGlubGluZSBib29sIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgRnJhbWUm IGZyYW1lCiAKIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6aW50ZXJjZXB0 UmVxdWVzdChSZXNvdXJjZUxvYWRlciYgbG9hZGVyLCBGdW5jdGlvbjx2b2lkKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYpPiYmIGhhbmRsZXIpCiB7Ci0gICAgQVNTRVJUKEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdCgqbG9hZGVyLmZyYW1lKCksIGxvYWRlci5y ZXF1ZXN0KCkpKTsKKyAgICBBU1NFUlQoSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpzaG91bGRJ bnRlcmNlcHRSZXF1ZXN0KGxvYWRlcikpOwogICAgIGlmIChhdXRvKiBhZ2VudHMgPSBpbnN0cnVt ZW50aW5nQWdlbnRzKGxvYWRlci5mcmFtZSgpKSkKICAgICAgICAgaW50ZXJjZXB0UmVxdWVzdElt cGwoKmFnZW50cywgbG9hZGVyLCBXVEZNb3ZlKGhhbmRsZXIpKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktp dC5jcHAKaW5kZXggZjA2NDAzYTYyMzRiNDJiNmFkMmE4MGIwMTk0YTU5NmQ4OWY2ZTZiYi4uZjZj YjE4NjQ3MjNhZGJjZWNiZWRmNTYwZjU5MjdiZjc0YTgxNmQzOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktp dC5jcHAKQEAgLTMwLDkgKzMwLDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1ib29sIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVy bmFsKGNvbnN0IEZyYW1lJiBmcmFtZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQor Ym9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlcXVl c3RJbnRlcm5hbChjb25zdCBSZXNvdXJjZUxvYWRlciYgbG9hZGVyKQogewotICAgIHJldHVybiBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnNob3VsZEludGVyY2VwdFJlcXVlc3QoZnJhbWUsIHJl cXVlc3QpOworICAgIHJldHVybiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnNob3VsZEludGVy Y2VwdFJlcXVlc3QobG9hZGVyKTsKIH0KIAogYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25X ZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlc3BvbnNlSW50ZXJuYWwoY29uc3QgRnJhbWUmIGZyYW1l LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQuaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQuaAppbmRl eCAwN2I0MjFiNTljMTU1NWUxYTI5MWUxOGViYjI2MjIxMjJmMTY1OGIyLi5kNjAxMzRiMDVhMDIw MzEyZjc3MDY1NGUwYzdiNWU3NGNhMGNjMjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdC5oCkBAIC00MCwy NSArNDAsMjIgQEAgY2xhc3MgRnJhZ21lbnRlZFNoYXJlZEJ1ZmZlcjsKIAogY2xhc3MgV0VCQ09S RV9FWFBPUlQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0IHsKIHB1YmxpYzoKLSAgICBz dGF0aWMgYm9vbCBzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KGNvbnN0IEZyYW1lKiwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0Jik7CisgICAgc3RhdGljIGJvb2wgc2hvdWxkSW50ZXJjZXB0UmVxdWVzdChj b25zdCBSZXNvdXJjZUxvYWRlciYpOwogICAgIHN0YXRpYyBib29sIHNob3VsZEludGVyY2VwdFJl c3BvbnNlKGNvbnN0IEZyYW1lKiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHN0YXRp YyB2b2lkIGludGVyY2VwdFJlcXVlc3QoUmVzb3VyY2VMb2FkZXImLCBGdW5jdGlvbjx2b2lkKGNv bnN0IFJlc291cmNlUmVxdWVzdCYpPiYmKTsKICAgICBzdGF0aWMgdm9pZCBpbnRlcmNlcHRSZXNw b25zZShjb25zdCBGcmFtZSosIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBSZXNvdXJjZUxvYWRl cklkZW50aWZpZXIsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYsIFJlZlB0cjxGcmFnbWVudGVkU2hhcmVkQnVmZmVyPik+JiYpOwogCiBwcml2YXRlOgotICAg IHN0YXRpYyBib29sIHNob3VsZEludGVyY2VwdFJlcXVlc3RJbnRlcm5hbChjb25zdCBGcmFtZSYs IGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOworICAgIHN0YXRpYyBib29sIHNob3VsZEludGVyY2Vw dFJlcXVlc3RJbnRlcm5hbChjb25zdCBSZXNvdXJjZUxvYWRlciYpOwogICAgIHN0YXRpYyBib29s IHNob3VsZEludGVyY2VwdFJlc3BvbnNlSW50ZXJuYWwoY29uc3QgRnJhbWUmLCBjb25zdCBSZXNv dXJjZVJlc3BvbnNlJik7CiAgICAgc3RhdGljIHZvaWQgaW50ZXJjZXB0UmVxdWVzdEludGVybmFs KFJlc291cmNlTG9hZGVyJiwgRnVuY3Rpb248dm9pZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKT4m Jik7CiAgICAgc3RhdGljIHZvaWQgaW50ZXJjZXB0UmVzcG9uc2VJbnRlcm5hbChjb25zdCBGcmFt ZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBSZXNvdXJjZUxvYWRlcklkZW50aWZpZXIsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIFJlZlB0cjxGcmFn bWVudGVkU2hhcmVkQnVmZmVyPik+JiYpOwogfTsKIAotaW5saW5lIGJvb2wgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uV2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KGNvbnN0IEZyYW1lKiBm cmFtZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQoraW5saW5lIGJvb2wgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uV2ViS2l0OjpzaG91bGRJbnRlcmNlcHRSZXF1ZXN0KGNvbnN0IFJl c291cmNlTG9hZGVyJiBsb2FkZXIpCiB7CiAgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRT KGZhbHNlKTsKLSAgICBpZiAoIWZyYW1lKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBy ZXR1cm4gc2hvdWxkSW50ZXJjZXB0UmVxdWVzdEludGVybmFsKCpmcmFtZSwgcmVxdWVzdCk7Cisg ICAgcmV0dXJuIHNob3VsZEludGVyY2VwdFJlcXVlc3RJbnRlcm5hbChsb2FkZXIpOwogfQogCiBp bmxpbmUgYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2Vw dFJlc3BvbnNlKGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVz cG9uc2UpCkBAIC03Miw3ICs2OSw3IEBAIGlubGluZSBib29sIEluc3BlY3Rvckluc3RydW1lbnRh dGlvbldlYktpdDo6c2hvdWxkSW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgRnJhbWUqCiAKIGlubGlu ZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6aW50ZXJjZXB0UmVxdWVzdChS ZXNvdXJjZUxvYWRlciYgbG9hZGVyLCBGdW5jdGlvbjx2b2lkKGNvbnN0IFJlc291cmNlUmVxdWVz dCYpPiYmIGhhbmRsZXIpCiB7Ci0gICAgQVNTRVJUKEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldl YktpdDo6c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChsb2FkZXIuZnJhbWUoKSwgbG9hZGVyLnJlcXVl c3QoKSkpOworICAgIEFTU0VSVChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3Vs ZEludGVyY2VwdFJlcXVlc3QobG9hZGVyKSk7CiAgICAgaW50ZXJjZXB0UmVxdWVzdEludGVybmFs KGxvYWRlciwgV1RGTW92ZShoYW5kbGVyKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29ya0FnZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29ya0FnZW50LmNwcAppbmRleCAw YjRjYjQ1OTlhMzA5ZTBiOGMzNDBhNjdlZWQ4NzFiMjllMWEzNzFlLi41Y2U5YzIwZWViOGVkMWFj NGFhNDZkZGM4NWFlNmM1YjRmOTQzMjE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvYWdlbnRzL0luc3BlY3Rvck5ldHdvcmtBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3BwCkBAIC0xMTA4LDEy ICsxMTA4LDE3IEBAIGJvb2wgSW5zcGVjdG9yTmV0d29ya0FnZW50Ojp3aWxsSW50ZXJjZXB0KGNv bnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKICAgICAgICAgfHwgc2hvdWxkSW50ZXJjZXB0 KHJlcXVlc3QudXJsKCksIFByb3RvY29sOjpOZXR3b3JrOjpOZXR3b3JrU3RhZ2U6OlJlc3BvbnNl KTsKIH0KIAotYm9vbCBJbnNwZWN0b3JOZXR3b3JrQWdlbnQ6OnNob3VsZEludGVyY2VwdFJlcXVl c3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQorYm9vbCBJbnNwZWN0b3JOZXR3b3Jr QWdlbnQ6OnNob3VsZEludGVyY2VwdFJlcXVlc3QoY29uc3QgUmVzb3VyY2VMb2FkZXImIGxvYWRl cikKIHsKICAgICBpZiAoIW1faW50ZXJjZXB0aW9uRW5hYmxlZCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgcmV0dXJuIHNob3VsZEludGVyY2VwdChyZXF1ZXN0LnVybCgpLCBQcm90b2Nv bDo6TmV0d29yazo6TmV0d29ya1N0YWdlOjpSZXF1ZXN0KTsKKyNpZiBFTkFCTEUoU0VSVklDRV9X T1JLRVIpCisgICAgaWYgKGxvYWRlci5vcHRpb25zKCkuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlv bklkZW50aWZpZXIpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgorCisgICAgcmV0dXJu IHNob3VsZEludGVyY2VwdChsb2FkZXIudXJsKCksIFByb3RvY29sOjpOZXR3b3JrOjpOZXR3b3Jr U3RhZ2U6OlJlcXVlc3QpOwogfQogCiBib29sIEluc3BlY3Rvck5ldHdvcmtBZ2VudDo6c2hvdWxk SW50ZXJjZXB0UmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvck5ldHdvcmtB Z2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3Jr QWdlbnQuaAppbmRleCA3MmY0MjNmZjYxMjc3ZWVmNGJkMzU2MzI4YzQ2ZDNiZDkxMzFmZjY1Li5j MzFmZWI1MWRhN2FkNWQxNTMyMGI4Zjg2YTgxNzkxNjg1NzJjYzNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvck5ldHdvcmtBZ2VudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29ya0FnZW50LmgK QEAgLTEyMSw3ICsxMjEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRJbml0aWFsU2NyaXB0Q29u dGVudChSZXNvdXJjZUxvYWRlcklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgc291cmNlU3RyaW5n KTsKICAgICB2b2lkIGRpZFNjaGVkdWxlU3R5bGVSZWNhbGN1bGF0aW9uKERvY3VtZW50Jik7CiAg ICAgYm9vbCB3aWxsSW50ZXJjZXB0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOwotICAgIGJvb2wg c2hvdWxkSW50ZXJjZXB0UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKKyAgICBib29s IHNob3VsZEludGVyY2VwdFJlcXVlc3QoY29uc3QgUmVzb3VyY2VMb2FkZXImKTsKICAgICBib29s IHNob3VsZEludGVyY2VwdFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICB2 b2lkIGludGVyY2VwdFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBSZXNvdXJjZUxv YWRlcklkZW50aWZpZXIsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgUmVzb3VyY2VSZXNw b25zZSYsIFJlZlB0cjxGcmFnbWVudGVkU2hhcmVkQnVmZmVyPik+JiYpOwogICAgIHZvaWQgaW50 ZXJjZXB0UmVxdWVzdChSZXNvdXJjZUxvYWRlciYsIEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0Jik+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05l dHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05l dHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDQ2ZjJkOTk2MTBmOWU0NTlmYTdkZmQw ZGUyZjkyZjRjMjkzODg4NzcuLjA2YjYyN2JhYWJlNDZhZjhlOTdkYjg5Nzk4YTNmYTliNDQ1M2U5 MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRl clN0cmF0ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJM b2FkZXJTdHJhdGVneS5jcHAKQEAgLTIzNiwyMCArMjM2LDIwIEBAIHZvaWQgV2ViTG9hZGVyU3Ry YXRlZ3k6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2FkZXIsIENhY2hl ZFJlc291CiAgICAgICAgIHJldHVybjsKICNlbmRpZgogCi0gICAgaWYgKCF0cnlMb2FkaW5nVXNp bmdVUkxTY2hlbWVIYW5kbGVyKHJlc291cmNlTG9hZGVyLCB0cmFja2luZ1BhcmFtZXRlcnMpKSB7 Ci0gICAgICAgIFdFQkxPQURFUlNUUkFURUdZX1JFTEVBU0VfTE9HKCJzY2hlZHVsZUxvYWQ6IFVS TCB3aWxsIGJlIHNjaGVkdWxlZCB3aXRoIHRoZSBOZXR3b3JrUHJvY2VzcyIpOworICAgIGlmICh0 cnlMb2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVyKHJlc291cmNlTG9hZGVyLCB0cmFja2luZ1Bh cmFtZXRlcnMpKQorICAgICAgICByZXR1cm47CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIp Ci0gICAgICAgIGlmICghcmVzb3VyY2VMb2FkZXIub3B0aW9ucygpLnNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb25JZGVudGlmaWVyICYmIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6c2hv dWxkSW50ZXJjZXB0UmVxdWVzdChyZXNvdXJjZUxvYWRlci5mcmFtZSgpLCByZXNvdXJjZUxvYWRl ci5yZXF1ZXN0KCkpKSB7Ci0gICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJL aXQ6OmludGVyY2VwdFJlcXVlc3QocmVzb3VyY2VMb2FkZXIsIFt0aGlzLCBwcm90ZWN0ZWRSZXNv dXJjZUxvYWRlciA9IFJlZiB7IHJlc291cmNlTG9hZGVyIH0sIHRyYWNraW5nUGFyYW1ldGVycywg c2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgcmVzb3VyY2VdKGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkgewotICAgICAgICAgICAgICAgIHNjaGVkdWxlTG9h ZEZyb21OZXR3b3JrUHJvY2Vzcyhwcm90ZWN0ZWRSZXNvdXJjZUxvYWRlciwgcmVxdWVzdCwgdHJh Y2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0 LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJjZSkpOwotICAgICAgICAgICAgfSk7Ci0gICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSNlbmRpZgotICAgICAgICBzY2hlZHVsZUxvYWRG cm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIsIHJlc291cmNlTG9hZGVyLnJlcXVlc3Qo KSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJl ZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJjZSkpOworICAgIGlmIChJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OnNob3VsZEludGVyY2VwdFJlcXVlc3QocmVzb3VyY2VM b2FkZXIpKSB7CisgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6aW50ZXJj ZXB0UmVxdWVzdChyZXNvdXJjZUxvYWRlciwgW3RoaXMsIHByb3RlY3RlZFJlc291cmNlTG9hZGVy ID0gUmVmIHsgcmVzb3VyY2VMb2FkZXIgfSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVh clJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCByZXNvdXJjZV0oY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0KSB7CisgICAgICAgICAgICBhdXRvJiByZXNvdXJjZUxvYWRlciA9IHBy b3RlY3RlZFJlc291cmNlTG9hZGVyLmdldCgpOworICAgICAgICAgICAgV0VCTE9BREVSU1RSQVRF R1lfUkVMRUFTRV9MT0coInNjaGVkdWxlTG9hZDogaW50ZXJjZXB0ZWQgVVJMIHdpbGwgYmUgc2No ZWR1bGVkIHdpdGggdGhlIE5ldHdvcmtQcm9jZXNzIik7CisgICAgICAgICAgICBzY2hlZHVsZUxv YWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIsIHJlcXVlc3QsIHRyYWNraW5nUGFy YW1ldGVycywgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgbWF4aW11 bUJ1ZmZlcmluZ1RpbWUocmVzb3VyY2UpKTsKKyAgICAgICAgfSk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CisKKyAgICBXRUJMT0FERVJTVFJBVEVHWV9SRUxFQVNFX0xPRygic2NoZWR1bGVMb2Fk OiBVUkwgd2lsbCBiZSBzY2hlZHVsZWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MiKTsKKyAgICBz Y2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VMb2FkZXIsIHJlc291cmNlTG9h ZGVyLnJlcXVlc3QoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91bGRDbGVhclJlZmVycmVyT25I VFRQU1RvSFRUUFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGltZShyZXNvdXJjZSkpOwogfQog CiBib29sIFdlYkxvYWRlclN0cmF0ZWd5Ojp0cnlMb2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVy KFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlciwgY29uc3QgV2ViUmVzb3VyY2VMb2FkZXI6 OlRyYWNraW5nUGFyYW1ldGVycyYgdHJhY2tpbmdQYXJhbWV0ZXJzKQo=