210589 2020-04-15 20:00:29 -0700 REGRESSION (r260102): ASSERTION FAILED: m_arbitrators.contains(proxy) in WebKit::SharedArbitrator::endRoutingArbitrationForArbitrator 2020-04-15 22:53:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble eric.carlson ews-watchlist glenn peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1642115 0 jer.noble 2020-04-15 20:00:29 -0700 REGRESSION (r260102): ASSERTION FAILED: m_arbitrators.contains(proxy) in WebKit::SharedArbitrator::endRoutingArbitrationForArbitrator 1642116 1 jer.noble 2020-04-15 20:00:51 -0700 <rdar://problem/61844208> 1642119 2 396607 jer.noble 2020-04-15 20:04:38 -0700 Created attachment 396607 Patch 1642131 3 396607 eric.carlson 2020-04-15 21:06:51 -0700 Comment on attachment 396607 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396607&action=review > Source/WebCore/platform/audio/mac/AudioSessionMac.mm:104 > m_routingArbitrationClient->leaveRoutingAbritration(); > + m_private->inRoutingArbitration = false; Nit: I think it is generally a good idea to change the state before making the callback in case the callback results in a call back into this module. 1642141 4 jer.noble 2020-04-15 22:10:59 -0700 (In reply to Eric Carlson from comment #3) > Comment on attachment 396607 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=396607&action=review > > > Source/WebCore/platform/audio/mac/AudioSessionMac.mm:104 > > m_routingArbitrationClient->leaveRoutingAbritration(); > > + m_private->inRoutingArbitration = false; > > Nit: I think it is generally a good idea to change the state before making > the callback in case the callback results in a call back into this module. Good point! 1642142 5 396618 jer.noble 2020-04-15 22:13:02 -0700 Created attachment 396618 Patch for landing 1642154 6 ews-feeder 2020-04-15 22:53:46 -0700 Committed r260172: <https://trac.webkit.org/changeset/260172> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396618. 396607 2020-04-15 20:04:38 -0700 2020-04-15 21:06:51 -0700 Patch bug-210589-20200415200437.patch text/plain 8535 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFlOGYwYTA5ZTg5MzNj OTY3YmIyMzJiY2Y4MGQ5YjZlOWU3MjUyYi4uMzcxMTRmZTVkZmFmMzllZmE5YTNhYTY5MDQ4ZTc3 ZjZhMzg4YzUyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTE1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyNjAx MDIpOiBBU1NFUlRJT04gRkFJTEVEOiBtX2FyYml0cmF0b3JzLmNvbnRhaW5zKHByb3h5KSBpbiBX ZWJLaXQ6OlNoYXJlZEFyYml0cmF0b3I6OmVuZFJvdXRpbmdBcmJpdHJhdGlvbkZvckFyYml0cmF0 b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDU4 OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE4NDQyMDg+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHJhY2sgd2hldGhlciB0aGUgc2Vzc2lvbiBz dWNjZXNzZnVsbHkgZW50ZXJlZCByb3V0aW5nIGFyYml0cmF0aW9uIGFuZCBvbmx5IGNhbGwKKyAg ICAgICAgbGVhdmVSb3V0aW5nQWJyaXRyYXRpb24oKSBpZiBlbnRlcmluZyB3YXMgc3VjZXNzZnVs LgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2Vzc2lvbk1hYy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OkF1ZGlvU2Vzc2lvbjo6c2V0Q2F0ZWdvcnkpOgorCiAyMDIwLTA0LTE0 ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIGlzTnVsbEZ1bmN0 aW9uUG9pbnRlcigpIGNhbiBmYWlsIGZvciBzeW1ib2xzIG5vdCBleHBsaWNpdGx5IG1hcmtlZCBh cyB3ZWFrbHkgbGlua2VkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBkZTI3OWZmZjIwODIyMzAxYWJiNTZkZmY0YmJi NDhjOTg5YTliZDU1Li5iNDU5YWMxMmJkZDMwNWFkM2VjY2EzYzM3YjllYmI0NWM5MzA3ZThiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA0LTE1ICBKZXIgTm9ibGUgIDxqZXIubm9i bGVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyNjAxMDIpOiBBU1NFUlRJT04g RkFJTEVEOiBtX2FyYml0cmF0b3JzLmNvbnRhaW5zKHByb3h5KSBpbiBXZWJLaXQ6OlNoYXJlZEFy Yml0cmF0b3I6OmVuZFJvdXRpbmdBcmJpdHJhdGlvbkZvckFyYml0cmF0b3IKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDU4OQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNjE4NDQyMDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUHJvdGVjdCBhZ2FpbnN0IGFuIGFzc2VydGlvbiBpbiB0aGUgU2hhcmVk QXJiaXRyYXRvciBpbiBjYXNlIHdoZXJlIGEgV2ViUHJvY2VzcyBpcyB0ZXJtaW5hdGVkIGJlZm9y ZSBpdCBjYW4gY2FsbAorICAgICAgICBlbmRSb3V0aW5nQXJiaXRyYXRpb24oKS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9NZWRpYS9BdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eTo6 cHJvY2Vzc0RpZFRlcm1pbmF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL01lZGlhL0F1ZGlvU2Vz c2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvTWVkaWEv Y29jb2EvQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eUNvY29hLm1tOgorICAgICAg ICAoV2ViS2l0OjpTaGFyZWRBcmJpdHJhdG9yOjppc0luUm91dGluZ0FyYml0cmF0aW9uRm9yQXJi aXRyYXRvcik6CisgICAgICAgIChXZWJLaXQ6OlNoYXJlZEFyYml0cmF0b3I6OmJlZ2luUm91dGlu Z0FyYml0cmF0aW9uRm9yQXJiaXRyYXRvcik6CisgICAgICAgIChXZWJLaXQ6OlNoYXJlZEFyYml0 cmF0b3I6OmVuZFJvdXRpbmdBcmJpdHJhdGlvbkZvckFyYml0cmF0b3IpOgorICAgICAgICAoV2Vi S2l0OjpBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5Ojpwcm9jZXNzRGlkVGVybWlu YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzRGlkVGVybWluYXRlT3JGYWlsZWRUb0xh dW5jaCk6CisKIDIwMjAtMDQtMTUgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAog ICAgICAgICBWaWRlbyBlbGVtZW50cyBkb24ndCByZXR1cm4gdG8gdGhlIGNvcnJlY3QgcG9zaXRp b24gd2hlbiBleGl0aW5nIGZ1bGxzY3JlZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2F1ZGlvL21hYy9BdWRpb1Nlc3Npb25NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9hdWRpby9tYWMvQXVkaW9TZXNzaW9uTWFjLm1tCmluZGV4IGRkNjIzMGQyYzVkNDRiOTQ0 ZmRjZTYxZDZlZTAzODBmMzJkZmQyZGQuLjVmMWYxMjU1ZWE0NjRkMThmYjM5NjE0M2MxYWJiNDRm MGVjZTNjMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9B dWRpb1Nlc3Npb25NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFj L0F1ZGlvU2Vzc2lvbk1hYy5tbQpAQCAtNjUsNiArNjUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBz ZXR1cEFyYml0cmF0aW9uT25nb2luZyB7IGZhbHNlIH07CiAjZW5kaWYKICAgICBBdWRpb1Nlc3Np b246OkNhdGVnb3J5VHlwZSBtX2NhdGVnb3J5T3ZlcnJpZGU7CisgICAgYm9vbCBpblJvdXRpbmdB cmJpdHJhdGlvbiB7IGZhbHNlIH07CiB9OwogCiBBdWRpb1Nlc3Npb246OkF1ZGlvU2Vzc2lvbigp CkBAIC05OCw4ICs5OSwxMCBAQCB2b2lkIEF1ZGlvU2Vzc2lvbjo6c2V0Q2F0ZWdvcnkoQ2F0ZWdv cnlUeXBlIGNhdGVnb3J5LCBSb3V0ZVNoYXJpbmdQb2xpY3kpCiAgICAgaWYgKCFtX3JvdXRpbmdB cmJpdHJhdGlvbkNsaWVudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fcHJpdmF0ZS0+ Y2F0ZWdvcnkgIT0gTm9uZSkKKyAgICBpZiAobV9wcml2YXRlLT5pblJvdXRpbmdBcmJpdHJhdGlv bikgewogICAgICAgICBtX3JvdXRpbmdBcmJpdHJhdGlvbkNsaWVudC0+bGVhdmVSb3V0aW5nQWJy aXRyYXRpb24oKTsKKyAgICAgICAgbV9wcml2YXRlLT5pblJvdXRpbmdBcmJpdHJhdGlvbiA9IGZh bHNlOworICAgIH0KIAogICAgIG1fcHJpdmF0ZS0+Y2F0ZWdvcnkgPSBjYXRlZ29yeTsKICAgICBp ZiAobV9wcml2YXRlLT5jYXRlZ29yeSA9PSBOb25lKQpAQCAtMTE1LDYgKzExOCw4IEBAIHZvaWQg QXVkaW9TZXNzaW9uOjpzZXRDYXRlZ29yeShDYXRlZ29yeVR5cGUgY2F0ZWdvcnksIFJvdXRlU2hh cmluZ1BvbGljeSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCisgICAgICAgIG1f cHJpdmF0ZS0+aW5Sb3V0aW5nQXJiaXRyYXRpb24gPSB0cnVlOworCiAgICAgICAgIC8vIEZJWE1F OiBEbyB3ZSBuZWVkIHRvIHJlc2V0IHNhbXBsZSByYXRlIGFuZCBidWZmZXIgc2l6ZSBmb3IgdGhl IG5ldyBkZWZhdWx0IGRldmljZT8KICAgICAgICAgaWYgKGRlZmF1bHRSb3V0ZUNoYW5nZWQgPT0g RGVmYXVsdFJvdXRlQ2hhbmdlZDo6WWVzKQogICAgICAgICAgICAgTE9HKE1lZGlhLCAiQXVkaW9T ZXNzaW9uOjpzZXRDYXRlZ29yeSgpIC0gZGVmYXVsdFJvdXRlQ2hhbmdlZCEiKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL01lZGlhL0F1ZGlvU2Vzc2lvblJvdXRpbmdBcmJp dHJhdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvQXVkaW9TZXNz aW9uUm91dGluZ0FyYml0cmF0b3JQcm94eS5jcHAKaW5kZXggN2I0OGZjNmYwNGJmMzg3OTgzMzRj ZmU4MDlkZWZiMmVjYjkxNTdkMy4uNDI4NTFlNGIzOWFmOGIwMGY2Y2IzYmVlMWI2ZjllZGEyMTIy NDQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvQXVkaW9TZXNz aW9uUm91dGluZ0FyYml0cmF0b3JQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvTWVkaWEvQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eS5jcHAKQEAgLTQzLDYg KzQzLDExIEBAIEF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHk6On5BdWRpb1Nlc3Np b25Sb3V0aW5nQXJiaXRyYXRvclByb3h5KCkKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCit2 b2lkIEF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5h dGUoKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKIHZvaWQgQXVkaW9TZXNzaW9uUm91 dGluZ0FyYml0cmF0b3JQcm94eTo6YmVnaW5Sb3V0aW5nQXJiaXRyYXRpb25XaXRoQ2F0ZWdvcnko V2ViQ29yZTo6QXVkaW9TZXNzaW9uOjpDYXRlZ29yeVR5cGUsIEFyYml0cmF0aW9uQ2FsbGJhY2sm JiBjYWxsYmFjaykKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94 eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvQXVkaW9TZXNzaW9uUm91dGluZ0Fy Yml0cmF0b3JQcm94eS5oCmluZGV4IGYyY2RmOGQwNTA2ZGM3MzdlYmJlNTcyZDJkZmNkNWMwZWVj MjJiOWEuLjI1OGI4MWNiMzlhMTEyYzU1YTE5NjJmM2JlYTg4YWFhZGZmNGRjZDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL01lZGlhL0F1ZGlvU2Vzc2lvblJvdXRpbmdBcmJp dHJhdG9yUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9NZWRpYS9BdWRpb1Nl c3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5LmgKQEAgLTQzLDYgKzQzLDcgQEAgcHVibGljOgog ICAgIEF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHkoV2ViUHJvY2Vzc1Byb3h5Jik7 CiAgICAgdmlydHVhbCB+QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eSgpOwogCisg ICAgdm9pZCBwcm9jZXNzRGlkVGVybWluYXRlKCk7CiAgICAgV2ViQ29yZTo6QXVkaW9TZXNzaW9u OjpDYXRlZ29yeVR5cGUgY2F0ZWdvcnkoKSBjb25zdCB7IHJldHVybiBtX2NhdGVnb3J5OyB9CiAK ICAgICBzdGF0aWMgdWludDY0X3QgZGVzdGluYXRpb25JZCgpIHsgcmV0dXJuIDE7IH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL01lZGlhL2NvY29hL0F1ZGlvU2Vzc2lvblJv dXRpbmdBcmJpdHJhdG9yUHJveHlDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL01l ZGlhL2NvY29hL0F1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHlDb2NvYS5tbQppbmRl eCAxOGI0YThkZjI1NmY4MjAwZDUwMzZmZWJmZTEzYzlmN2M1ZmUzNzk2Li45ZGNiYzhjMjAzODhi MjMzMWU3OTcwNzMyYTViNjA4OWU4YjVjYTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9NZWRpYS9jb2NvYS9BdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5Q29j b2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvY29jb2EvQXVkaW9TZXNz aW9uUm91dGluZ0FyYml0cmF0b3JQcm94eUNvY29hLm1tCkBAIC00OSw2ICs0OSw3IEBAIHB1Ymxp YzoKICAgICB1c2luZyBEZWZhdWx0Um91dGVDaGFuZ2VkID0gQXVkaW9TZXNzaW9uUm91dGluZ0Fy Yml0cmF0aW9uQ2xpZW50OjpEZWZhdWx0Um91dGVDaGFuZ2VkOwogICAgIHVzaW5nIEFyYml0cmF0 aW9uQ2FsbGJhY2sgPSBBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5OjpBcmJpdHJh dGlvbkNhbGxiYWNrOwogCisgICAgYm9vbCBpc0luUm91dGluZ0FyYml0cmF0aW9uRm9yQXJiaXRy YXRvcihBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5Jik7CiAgICAgdm9pZCBiZWdp blJvdXRpbmdBcmJpdHJhdGlvbkZvckFyYml0cmF0b3IoQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0 cmF0b3JQcm94eSYsIEFyYml0cmF0aW9uQ2FsbGJhY2smJik7CiAgICAgdm9pZCBlbmRSb3V0aW5n QXJiaXRyYXRpb25Gb3JBcmJpdHJhdG9yKEF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJv eHkmKTsKIApAQCAtNjUsOSArNjYsMTQgQEAgU2hhcmVkQXJiaXRyYXRvciYgU2hhcmVkQXJiaXRy YXRvcjo6c2hhcmVkSW5zdGFuY2UoKQogICAgIHJldHVybiBpbnN0YW5jZTsKIH0KIAorYm9vbCBT aGFyZWRBcmJpdHJhdG9yOjppc0luUm91dGluZ0FyYml0cmF0aW9uRm9yQXJiaXRyYXRvcihBdWRp b1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5JiBwcm94eSkKK3sKKyAgICByZXR1cm4gbV9h cmJpdHJhdG9ycy5jb250YWlucyhwcm94eSk7Cit9CisKIHZvaWQgU2hhcmVkQXJiaXRyYXRvcjo6 YmVnaW5Sb3V0aW5nQXJiaXRyYXRpb25Gb3JBcmJpdHJhdG9yKEF1ZGlvU2Vzc2lvblJvdXRpbmdB cmJpdHJhdG9yUHJveHkmIHByb3h5LCBBcmJpdHJhdGlvbkNhbGxiYWNrJiYgY2FsbGJhY2spCiB7 Ci0gICAgQVNTRVJUKCFtX2FyYml0cmF0b3JzLmNvbnRhaW5zKHByb3h5KSk7CisgICAgQVNTRVJU KCFpc0luUm91dGluZ0FyYml0cmF0aW9uRm9yQXJiaXRyYXRvcihwcm94eSkpOwogICAgIG1fYXJi aXRyYXRvcnMuYWRkKHByb3h5KTsKIAogICAgIGlmIChtX3NldHVwQXJiaXRyYXRpb25PbmdvaW5n KSB7CkBAIC0xMjUsNyArMTMxLDcgQEAgdm9pZCBTaGFyZWRBcmJpdHJhdG9yOjpiZWdpblJvdXRp bmdBcmJpdHJhdGlvbkZvckFyYml0cmF0b3IoQXVkaW9TZXNzaW9uUm91dGluZ0EKIAogdm9pZCBT aGFyZWRBcmJpdHJhdG9yOjplbmRSb3V0aW5nQXJiaXRyYXRpb25Gb3JBcmJpdHJhdG9yKEF1ZGlv U2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHkmIHByb3h5KQogewotICAgIEFTU0VSVChtX2Fy Yml0cmF0b3JzLmNvbnRhaW5zKHByb3h5KSk7CisgICAgQVNTRVJUKGlzSW5Sb3V0aW5nQXJiaXRy YXRpb25Gb3JBcmJpdHJhdG9yKHByb3h5KSk7CiAgICAgbV9hcmJpdHJhdG9ycy5yZW1vdmUocHJv eHkpOwogCiAgICAgaWYgKCFtX2FyYml0cmF0b3JzLmNvbXB1dGVzRW1wdHkoKSkKQEAgLTE1MCw2 ICsxNTYsMTIgQEAgQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eTo6fkF1ZGlvU2Vz c2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHkoKQogICAgIG1fcHJvY2Vzcy5yZW1vdmVNZXNzYWdl UmVjZWl2ZXIoTWVzc2FnZXM6OkF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHk6Om1l c3NhZ2VSZWNlaXZlck5hbWUoKSwgZGVzdGluYXRpb25JZCgpKTsKIH0KIAordm9pZCBBdWRpb1Nl c3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5Ojpwcm9jZXNzRGlkVGVybWluYXRlKCkKK3sKKyAg ICBpZiAoU2hhcmVkQXJiaXRyYXRvcjo6c2hhcmVkSW5zdGFuY2UoKS5pc0luUm91dGluZ0FyYml0 cmF0aW9uRm9yQXJiaXRyYXRvcigqdGhpcykpCisgICAgICAgIFNoYXJlZEFyYml0cmF0b3I6OnNo YXJlZEluc3RhbmNlKCkuZW5kUm91dGluZ0FyYml0cmF0aW9uRm9yQXJiaXRyYXRvcigqdGhpcyk7 Cit9CisKIHZvaWQgQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eTo6YmVnaW5Sb3V0 aW5nQXJiaXRyYXRpb25XaXRoQ2F0ZWdvcnkoV2ViQ29yZTo6QXVkaW9TZXNzaW9uOjpDYXRlZ29y eVR5cGUgY2F0ZWdvcnksIEFyYml0cmF0aW9uQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKICAgICBt X2NhdGVnb3J5ID0gY2F0ZWdvcnk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmNwcAppbmRleCBjM2FmYzU2YTA3Nzc0OTc5NDZhMzcwNTRlNDk2MDFmNzU3MjViOGM4 Li5lY2M1YmE0OGZjYzNkOGM0MjljYWYyM2Y3ZDgxYmIxOGRhYjJmMDJjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTgzMCw2ICs4MzAsMTAgQEAg dm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRvTGF1bmNo KCkKICAgICB9CiAjZW5kaWYKIAorI2lmIEVOQUJMRShST1VUSU5HX0FSQklUUkFUSU9OKQorICAg IG1fcm91dGluZ0FyYml0cmF0b3ItPnByb2Nlc3NEaWRUZXJtaW5hdGUoKTsKKyNlbmRpZgorCiAg ICAgZm9yIChhdXRvJiBwYWdlIDogcGFnZXMpCiAgICAgICAgIHBhZ2UtPnByb2Nlc3NEaWRUZXJt aW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpDcmFzaCk7CiAK 396618 2020-04-15 22:13:02 -0700 2020-04-15 22:53:47 -0700 Patch for landing bug-210589-20200415221302.patch text/plain 8531 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFlOGYwYTA5ZTg5MzNj OTY3YmIyMzJiY2Y4MGQ5YjZlOWU3MjUyYi4uZGNmYWQxZDNiOTMzZWYxYTlhMjlmZTA0ZjNiNTU5 NDY2MGU1NjM5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTE1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyNjAx MDIpOiBBU1NFUlRJT04gRkFJTEVEOiBtX2FyYml0cmF0b3JzLmNvbnRhaW5zKHByb3h5KSBpbiBX ZWJLaXQ6OlNoYXJlZEFyYml0cmF0b3I6OmVuZFJvdXRpbmdBcmJpdHJhdGlvbkZvckFyYml0cmF0 b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDU4 OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE4NDQyMDg+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIFRyYWNrIHdoZXRoZXIgdGhlIHNlc3Npb24gc3Vj Y2Vzc2Z1bGx5IGVudGVyZWQgcm91dGluZyBhcmJpdHJhdGlvbiBhbmQgb25seSBjYWxsCisgICAg ICAgIGxlYXZlUm91dGluZ0Ficml0cmF0aW9uKCkgaWYgZW50ZXJpbmcgd2FzIHN1Y2Vzc2Z1bC4K KworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb1Nlc3Npb25NYWMubW06CisgICAg ICAgIChXZWJDb3JlOjpBdWRpb1Nlc3Npb246OnNldENhdGVnb3J5KToKKwogMjAyMC0wNC0xNCAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBpc051bGxGdW5jdGlv blBvaW50ZXIoKSBjYW4gZmFpbCBmb3Igc3ltYm9scyBub3QgZXhwbGljaXRseSBtYXJrZWQgYXMg d2Vha2x5IGxpbmtlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZGUyNzlmZmYyMDgyMjMwMWFiYjU2ZGZmNGJiYjQ4 Yzk4OWE5YmQ1NS4uYTliY2NlN2UwYWE4ZGEyMjU4NTljZmVhMWFjMmEyYzNmYzM0YjI0MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAyMC0wNC0xNSAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjYwMTAyKTogQVNTRVJUSU9OIEZB SUxFRDogbV9hcmJpdHJhdG9ycy5jb250YWlucyhwcm94eSkgaW4gV2ViS2l0OjpTaGFyZWRBcmJp dHJhdG9yOjplbmRSb3V0aW5nQXJiaXRyYXRpb25Gb3JBcmJpdHJhdG9yCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTA1ODkKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzYxODQ0MjA4PgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4K KworICAgICAgICBQcm90ZWN0IGFnYWluc3QgYW4gYXNzZXJ0aW9uIGluIHRoZSBTaGFyZWRBcmJp dHJhdG9yIGluIGNhc2Ugd2hlcmUgYSBXZWJQcm9jZXNzIGlzIHRlcm1pbmF0ZWQgYmVmb3JlIGl0 IGNhbiBjYWxsCisgICAgICAgIGVuZFJvdXRpbmdBcmJpdHJhdGlvbigpLgorCisgICAgICAgICog VUlQcm9jZXNzL01lZGlhL0F1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5Ojpwcm9j ZXNzRGlkVGVybWluYXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvTWVkaWEvQXVkaW9TZXNzaW9u Um91dGluZ0FyYml0cmF0b3JQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9NZWRpYS9jb2Nv YS9BdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5Q29jb2EubW06CisgICAgICAgIChX ZWJLaXQ6OlNoYXJlZEFyYml0cmF0b3I6OmlzSW5Sb3V0aW5nQXJiaXRyYXRpb25Gb3JBcmJpdHJh dG9yKToKKyAgICAgICAgKFdlYktpdDo6U2hhcmVkQXJiaXRyYXRvcjo6YmVnaW5Sb3V0aW5nQXJi aXRyYXRpb25Gb3JBcmJpdHJhdG9yKToKKyAgICAgICAgKFdlYktpdDo6U2hhcmVkQXJiaXRyYXRv cjo6ZW5kUm91dGluZ0FyYml0cmF0aW9uRm9yQXJiaXRyYXRvcik6CisgICAgICAgIChXZWJLaXQ6 OkF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRvTGF1bmNo KToKKwogMjAyMC0wNC0xNSAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAgICAg ICAgIFZpZGVvIGVsZW1lbnRzIGRvbid0IHJldHVybiB0byB0aGUgY29ycmVjdCBwb3NpdGlvbiB3 aGVuIGV4aXRpbmcgZnVsbHNjcmVlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYXVkaW8vbWFjL0F1ZGlvU2Vzc2lvbk1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2F1ZGlvL21hYy9BdWRpb1Nlc3Npb25NYWMubW0KaW5kZXggZGQ2MjMwZDJjNWQ0NGI5NDRmZGNl NjFkNmVlMDM4MGYzMmRmZDJkZC4uNTQ2NDhhYWM3ZjEwYzk3MDFiMWQ5MDlkZTRkZTVhMjYzNWQ5 M2ZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlv U2Vzc2lvbk1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMvQXVk aW9TZXNzaW9uTWFjLm1tCkBAIC02NSw2ICs2NSw3IEBAIHB1YmxpYzoKICAgICBib29sIHNldHVw QXJiaXRyYXRpb25PbmdvaW5nIHsgZmFsc2UgfTsKICNlbmRpZgogICAgIEF1ZGlvU2Vzc2lvbjo6 Q2F0ZWdvcnlUeXBlIG1fY2F0ZWdvcnlPdmVycmlkZTsKKyAgICBib29sIGluUm91dGluZ0FyYml0 cmF0aW9uIHsgZmFsc2UgfTsKIH07CiAKIEF1ZGlvU2Vzc2lvbjo6QXVkaW9TZXNzaW9uKCkKQEAg LTk4LDggKzk5LDEwIEBAIHZvaWQgQXVkaW9TZXNzaW9uOjpzZXRDYXRlZ29yeShDYXRlZ29yeVR5 cGUgY2F0ZWdvcnksIFJvdXRlU2hhcmluZ1BvbGljeSkKICAgICBpZiAoIW1fcm91dGluZ0FyYml0 cmF0aW9uQ2xpZW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9wcml2YXRlLT5jYXRl Z29yeSAhPSBOb25lKQorICAgIGlmIChtX3ByaXZhdGUtPmluUm91dGluZ0FyYml0cmF0aW9uKSB7 CisgICAgICAgIG1fcHJpdmF0ZS0+aW5Sb3V0aW5nQXJiaXRyYXRpb24gPSBmYWxzZTsKICAgICAg ICAgbV9yb3V0aW5nQXJiaXRyYXRpb25DbGllbnQtPmxlYXZlUm91dGluZ0Ficml0cmF0aW9uKCk7 CisgICAgfQogCiAgICAgbV9wcml2YXRlLT5jYXRlZ29yeSA9IGNhdGVnb3J5OwogICAgIGlmICht X3ByaXZhdGUtPmNhdGVnb3J5ID09IE5vbmUpCkBAIC0xMTUsNiArMTE4LDggQEAgdm9pZCBBdWRp b1Nlc3Npb246OnNldENhdGVnb3J5KENhdGVnb3J5VHlwZSBjYXRlZ29yeSwgUm91dGVTaGFyaW5n UG9saWN5KQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKKyAgICAgICAgbV9wcml2 YXRlLT5pblJvdXRpbmdBcmJpdHJhdGlvbiA9IHRydWU7CisKICAgICAgICAgLy8gRklYTUU6IERv IHdlIG5lZWQgdG8gcmVzZXQgc2FtcGxlIHJhdGUgYW5kIGJ1ZmZlciBzaXplIGZvciB0aGUgbmV3 IGRlZmF1bHQgZGV2aWNlPwogICAgICAgICBpZiAoZGVmYXVsdFJvdXRlQ2hhbmdlZCA9PSBEZWZh dWx0Um91dGVDaGFuZ2VkOjpZZXMpCiAgICAgICAgICAgICBMT0coTWVkaWEsICJBdWRpb1Nlc3Np b246OnNldENhdGVnb3J5KCkgLSBkZWZhdWx0Um91dGVDaGFuZ2VkISIpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0 b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9NZWRpYS9BdWRpb1Nlc3Npb25S b3V0aW5nQXJiaXRyYXRvclByb3h5LmNwcAppbmRleCA3YjQ4ZmM2ZjA0YmYzODc5ODMzNGNmZTgw OWRlZmIyZWNiOTE1N2QzLi40Mjg1MWU0YjM5YWY4YjAwZjZjYjNiZWUxYjZmOWVkYTIxMjI0NDlm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9NZWRpYS9BdWRpb1Nlc3Npb25S b3V0aW5nQXJiaXRyYXRvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9N ZWRpYS9BdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5LmNwcApAQCAtNDMsNiArNDMs MTEgQEAgQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eTo6fkF1ZGlvU2Vzc2lvblJv dXRpbmdBcmJpdHJhdG9yUHJveHkoKQogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKK3ZvaWQg QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZSgp Cit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKK30KKwogdm9pZCBBdWRpb1Nlc3Npb25Sb3V0aW5n QXJiaXRyYXRvclByb3h5OjpiZWdpblJvdXRpbmdBcmJpdHJhdGlvbldpdGhDYXRlZ29yeShXZWJD b3JlOjpBdWRpb1Nlc3Npb246OkNhdGVnb3J5VHlwZSwgQXJiaXRyYXRpb25DYWxsYmFjayYmIGNh bGxiYWNrKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9NZWRpYS9BdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9NZWRpYS9BdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRy YXRvclByb3h5LmgKaW5kZXggZjJjZGY4ZDA1MDZkYzczN2ViYmU1NzJkMmRmY2Q1YzBlZWMyMmI5 YS4uMjU4YjgxY2IzOWExMTJjNTVhMTk2MmYzYmVhODhhYWFkZmY0ZGNkNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0 b3JQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL01lZGlhL0F1ZGlvU2Vzc2lv blJvdXRpbmdBcmJpdHJhdG9yUHJveHkuaApAQCAtNDMsNiArNDMsNyBAQCBwdWJsaWM6CiAgICAg QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eShXZWJQcm9jZXNzUHJveHkmKTsKICAg ICB2aXJ0dWFsIH5BdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5KCk7CiAKKyAgICB2 b2lkIHByb2Nlc3NEaWRUZXJtaW5hdGUoKTsKICAgICBXZWJDb3JlOjpBdWRpb1Nlc3Npb246OkNh dGVnb3J5VHlwZSBjYXRlZ29yeSgpIGNvbnN0IHsgcmV0dXJuIG1fY2F0ZWdvcnk7IH0KIAogICAg IHN0YXRpYyB1aW50NjRfdCBkZXN0aW5hdGlvbklkKCkgeyByZXR1cm4gMTsgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTWVkaWEvY29jb2EvQXVkaW9TZXNzaW9uUm91dGlu Z0FyYml0cmF0b3JQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTWVkaWEv Y29jb2EvQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eUNvY29hLm1tCmluZGV4IDE4 YjRhOGRmMjU2ZjgyMDBkNTAzNmZlYmZlMTNjOWY3YzVmZTM3OTYuLjlkY2JjOGMyMDM4OGIyMzMx ZTc5NzA3MzJhNWI2MDg5ZThiNWNhMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL01lZGlhL2NvY29hL0F1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHlDb2NvYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9NZWRpYS9jb2NvYS9BdWRpb1Nlc3Npb25S b3V0aW5nQXJiaXRyYXRvclByb3h5Q29jb2EubW0KQEAgLTQ5LDYgKzQ5LDcgQEAgcHVibGljOgog ICAgIHVzaW5nIERlZmF1bHRSb3V0ZUNoYW5nZWQgPSBBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRy YXRpb25DbGllbnQ6OkRlZmF1bHRSb3V0ZUNoYW5nZWQ7CiAgICAgdXNpbmcgQXJiaXRyYXRpb25D YWxsYmFjayA9IEF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHk6OkFyYml0cmF0aW9u Q2FsbGJhY2s7CiAKKyAgICBib29sIGlzSW5Sb3V0aW5nQXJiaXRyYXRpb25Gb3JBcmJpdHJhdG9y KEF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHkmKTsKICAgICB2b2lkIGJlZ2luUm91 dGluZ0FyYml0cmF0aW9uRm9yQXJiaXRyYXRvcihBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRv clByb3h5JiwgQXJiaXRyYXRpb25DYWxsYmFjayYmKTsKICAgICB2b2lkIGVuZFJvdXRpbmdBcmJp dHJhdGlvbkZvckFyYml0cmF0b3IoQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eSYp OwogCkBAIC02NSw5ICs2NiwxNCBAQCBTaGFyZWRBcmJpdHJhdG9yJiBTaGFyZWRBcmJpdHJhdG9y OjpzaGFyZWRJbnN0YW5jZSgpCiAgICAgcmV0dXJuIGluc3RhbmNlOwogfQogCitib29sIFNoYXJl ZEFyYml0cmF0b3I6OmlzSW5Sb3V0aW5nQXJiaXRyYXRpb25Gb3JBcmJpdHJhdG9yKEF1ZGlvU2Vz c2lvblJvdXRpbmdBcmJpdHJhdG9yUHJveHkmIHByb3h5KQoreworICAgIHJldHVybiBtX2FyYml0 cmF0b3JzLmNvbnRhaW5zKHByb3h5KTsKK30KKwogdm9pZCBTaGFyZWRBcmJpdHJhdG9yOjpiZWdp blJvdXRpbmdBcmJpdHJhdGlvbkZvckFyYml0cmF0b3IoQXVkaW9TZXNzaW9uUm91dGluZ0FyYml0 cmF0b3JQcm94eSYgcHJveHksIEFyYml0cmF0aW9uQ2FsbGJhY2smJiBjYWxsYmFjaykKIHsKLSAg ICBBU1NFUlQoIW1fYXJiaXRyYXRvcnMuY29udGFpbnMocHJveHkpKTsKKyAgICBBU1NFUlQoIWlz SW5Sb3V0aW5nQXJiaXRyYXRpb25Gb3JBcmJpdHJhdG9yKHByb3h5KSk7CiAgICAgbV9hcmJpdHJh dG9ycy5hZGQocHJveHkpOwogCiAgICAgaWYgKG1fc2V0dXBBcmJpdHJhdGlvbk9uZ29pbmcpIHsK QEAgLTEyNSw3ICsxMzEsNyBAQCB2b2lkIFNoYXJlZEFyYml0cmF0b3I6OmJlZ2luUm91dGluZ0Fy Yml0cmF0aW9uRm9yQXJiaXRyYXRvcihBdWRpb1Nlc3Npb25Sb3V0aW5nQQogCiB2b2lkIFNoYXJl ZEFyYml0cmF0b3I6OmVuZFJvdXRpbmdBcmJpdHJhdGlvbkZvckFyYml0cmF0b3IoQXVkaW9TZXNz aW9uUm91dGluZ0FyYml0cmF0b3JQcm94eSYgcHJveHkpCiB7Ci0gICAgQVNTRVJUKG1fYXJiaXRy YXRvcnMuY29udGFpbnMocHJveHkpKTsKKyAgICBBU1NFUlQoaXNJblJvdXRpbmdBcmJpdHJhdGlv bkZvckFyYml0cmF0b3IocHJveHkpKTsKICAgICBtX2FyYml0cmF0b3JzLnJlbW92ZShwcm94eSk7 CiAKICAgICBpZiAoIW1fYXJiaXRyYXRvcnMuY29tcHV0ZXNFbXB0eSgpKQpAQCAtMTUwLDYgKzE1 NiwxMiBAQCBBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5Ojp+QXVkaW9TZXNzaW9u Um91dGluZ0FyYml0cmF0b3JQcm94eSgpCiAgICAgbV9wcm9jZXNzLnJlbW92ZU1lc3NhZ2VSZWNl aXZlcihNZXNzYWdlczo6QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0b3JQcm94eTo6bWVzc2Fn ZVJlY2VpdmVyTmFtZSgpLCBkZXN0aW5hdGlvbklkKCkpOwogfQogCit2b2lkIEF1ZGlvU2Vzc2lv blJvdXRpbmdBcmJpdHJhdG9yUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGUoKQoreworICAgIGlm IChTaGFyZWRBcmJpdHJhdG9yOjpzaGFyZWRJbnN0YW5jZSgpLmlzSW5Sb3V0aW5nQXJiaXRyYXRp b25Gb3JBcmJpdHJhdG9yKCp0aGlzKSkKKyAgICAgICAgU2hhcmVkQXJiaXRyYXRvcjo6c2hhcmVk SW5zdGFuY2UoKS5lbmRSb3V0aW5nQXJiaXRyYXRpb25Gb3JBcmJpdHJhdG9yKCp0aGlzKTsKK30K Kwogdm9pZCBBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRvclByb3h5OjpiZWdpblJvdXRpbmdB cmJpdHJhdGlvbldpdGhDYXRlZ29yeShXZWJDb3JlOjpBdWRpb1Nlc3Npb246OkNhdGVnb3J5VHlw ZSBjYXRlZ29yeSwgQXJiaXRyYXRpb25DYWxsYmFjayYmIGNhbGxiYWNrKQogewogICAgIG1fY2F0 ZWdvcnkgPSBjYXRlZ29yeTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuY3BwCmluZGV4IGMzYWZjNTZhMDc3NzQ5Nzk0NmEzNzA1NGU0OTYwMWY3NTcyNWI4YzguLmVj YzViYTQ4ZmNjM2Q4YzQyOWNhZjIzZjdkODFiYjE4ZGFiMmYwMmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtODMwLDYgKzgzMCwxMCBAQCB2b2lk IFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9MYXVuY2goKQog ICAgIH0KICNlbmRpZgogCisjaWYgRU5BQkxFKFJPVVRJTkdfQVJCSVRSQVRJT04pCisgICAgbV9y b3V0aW5nQXJiaXRyYXRvci0+cHJvY2Vzc0RpZFRlcm1pbmF0ZSgpOworI2VuZGlmCisKICAgICBm b3IgKGF1dG8mIHBhZ2UgOiBwYWdlcykKICAgICAgICAgcGFnZS0+cHJvY2Vzc0RpZFRlcm1pbmF0 ZShQcm9jZXNzVGVybWluYXRpb25SZWFzb246OkNyYXNoKTsKIAo=