154029 2016-02-09 08:21:07 -0800 checkValidity() sometimes asserts in WebUserMediaClient::pageDestroyed 2016-02-09 09:14:30 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson webkit-bug-importer oldest_to_newest 1163185 0 eric.carlson 2016-02-09 08:21:07 -0800 webkitGetUserMedia-shadowing-then.html sometimes triggers an assertion while enumerating the request map. 1163188 1 270927 eric.carlson 2016-02-09 08:39:16 -0800 Created attachment 270927 Proposed patch. 1163189 2 eric.carlson 2016-02-09 08:39:41 -0800 <rdar://problem/24065022> 1163192 3 270929 eric.carlson 2016-02-09 08:53:47 -0800 Created attachment 270929 Updated patch. 1163193 4 270929 achristensen 2016-02-09 08:57:34 -0800 Comment on attachment 270929 Updated patch. View in context: https://bugs.webkit.org/attachment.cgi?id=270929&action=review r=me > Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm:118 > + ASSERT(userMediaRequestsMap().isEmpty()); These assertions seem kind of silly after calling clear, and they could be right after the call to clear, unless you are actually asserting that the map is still empty after calling cancelUserMediaAccessRequest on each request that used to be in the map. 1163197 5 270929 eric.carlson 2016-02-09 09:11:49 -0800 Comment on attachment 270929 Updated patch. View in context: https://bugs.webkit.org/attachment.cgi?id=270929&action=review >> Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm:118 >> + ASSERT(userMediaRequestsMap().isEmpty()); > > These assertions seem kind of silly after calling clear, and they could be right after the call to clear, unless you are actually asserting that the map is still empty after calling cancelUserMediaAccessRequest on each request that used to be in the map. That is the idea, assert that the map is still empty after cancelling the requests to ensure that no new ones were added. This isn't currently possible, but if a future change enabled JS to run it could be. 1163199 6 eric.carlson 2016-02-09 09:14:17 -0800 Committed r196310: https://trac.webkit.org/r196310 270927 2016-02-09 08:39:16 -0800 2016-02-09 08:53:47 -0800 Proposed patch. page_destroyed_patch.txt text/plain 4686 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjMwOCkKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTAyLTA5 ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIGNoZWNr VmFsaWRpdHkoKSBzb21ldGltZXMgYXNzZXJ0cyBpbiBXZWJVc2VyTWVkaWFDbGllbnQ6OnBhZ2VE ZXN0cm95ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1NDAyOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjQwNjUwMjI+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJV c2VyTWVkaWFDbGllbnQubW06CisgICAgICAgIChXZWJVc2VyTWVkaWFDbGllbnQ6OnBhZ2VEZXN0 cm95ZWQpOiBDb3B5IG1hcCBrZXlzIHRvIGEgdmVjdG9yIGFuZCBjbGVhciB0aGUgbWFwIGJlZm9y ZQorICAgICAgICAgIGVudW1lcmF0aW5nIHRoZSB2ZWN0b3IgYW5kIGNhbmNlbGluZyB0aGUgcmVx dWVzdHMuIEFTU0VSVCB0aGF0IHRoZSBtYXAgaXMgbm90IG1vZGlmaWVkCisgICAgICAgICAgZHVy aW5nIGNsZWFudXAuIENsZWFuIHVwIHRoZSBwZXJtaXNzaW9uIGNoZWNrIG1hcC4KKyAgICAgICAg KFdlYlVzZXJNZWRpYUNsaWVudDo6cmVxdWVzdFVzZXJNZWRpYUFjY2Vzcyk6IEFkZCB0aGUgcmVx dWVzdCB0byB0aGUgbWFwIGJlZm9yZSBjYWxsaW5nIHRoZQorICAgICAgICAgIFVJIGRlbGVnYXRl IGluIGNhc2UgaXQgd29ya3Mgc3luY2hyb25vdXNseSAoYXMgaXQgZG9lcyBpbiBEUlQpLgorICAg ICAgICAoV2ViVXNlck1lZGlhQ2xpZW50OjpjaGVja1VzZXJNZWRpYVBlcm1pc3Npb24pOiBEaXR0 by4KKyAgICAgICAgKFdlYlVzZXJNZWRpYUNsaWVudDo6Y2FuY2VsVXNlck1lZGlhUGVybWlzc2lv bkNoZWNrKTogV2hpdGUtc3BhY2UgY2xlYW51cC4KKyAgICAgICAgKC1bV2ViVXNlck1lZGlhUG9s aWN5TGlzdGVuZXIgYWxsb3ddKTogRGl0dG8uCisKIDIwMTYtMDItMDggIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCB3aGVuIHRyeWluZyB0byBj aGFpbiB0byB0aGUgb2xkIC1bTlNWaWV3IHNldE5lZWRzRGlzcGxheUluUmVjdDpdCkluZGV4OiBT b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJVc2VyTWVkaWFDbGllbnQubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViVXNlck1lZGlh Q2xpZW50Lm1tCShyZXZpc2lvbiAxOTYxMzgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3Jl U3VwcG9ydC9XZWJVc2VyTWVkaWFDbGllbnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1 IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtOTYsNyArOTYsNiBA QCBzdGF0aWMgdm9pZCBSZW1vdmVQZXJtaXNzaW9uQ2hlY2tGcm9tTWFwCiAgICAgdXNlck1lZGlh Q2hlY2tNYXAoKS5yZW1vdmUocmVxdWVzdCk7CiB9CiAKLQogV2ViVXNlck1lZGlhQ2xpZW50OjpX ZWJVc2VyTWVkaWFDbGllbnQoV2ViVmlldyogd2ViVmlldykKICAgICA6IG1fd2ViVmlldyh3ZWJW aWV3KQogewpAQCAtMTA4LDExICsxMDcsMjUgQEAgV2ViVXNlck1lZGlhQ2xpZW50Ojp+V2ViVXNl ck1lZGlhQ2xpZW50KAogCiB2b2lkIFdlYlVzZXJNZWRpYUNsaWVudDo6cGFnZURlc3Ryb3llZCgp CiB7Ci0gICAgVXNlck1lZGlhUmVxdWVzdHNNYXAmIHJlcXVlc3RzTWFwID0gdXNlck1lZGlhUmVx dWVzdHNNYXAoKTsKLSAgICBmb3IgKFVzZXJNZWRpYVJlcXVlc3RzTWFwOjppdGVyYXRvciBpdCA9 IHJlcXVlc3RzTWFwLmJlZ2luKCk7IGl0ICE9IHJlcXVlc3RzTWFwLmVuZCgpOyArK2l0KSB7Ci0g ICAgICAgIFtpdC0+dmFsdWUgY2FuY2VsVXNlck1lZGlhQWNjZXNzUmVxdWVzdF07Ci0gICAgICAg IHJlcXVlc3RzTWFwLnJlbW92ZShpdCk7Ci0gICAgfQorICAgIGF1dG8mIHJlcXVlc3RzTWFwID0g dXNlck1lZGlhUmVxdWVzdHNNYXAoKTsKKyAgICBWZWN0b3I8UmV0YWluUHRyPFdlYlVzZXJNZWRp YVBvbGljeUxpc3RlbmVyPj4gcGVuZGluZ1JlcXVlc3RzOworICAgIGNvcHlWYWx1ZXNUb1ZlY3Rv cihyZXF1ZXN0c01hcCwgcGVuZGluZ1JlcXVlc3RzKTsKKyAgICByZXF1ZXN0c01hcC5jbGVhcigp OworCisgICAgZm9yIChhdXRvJiByZXF1ZXN0OiBwZW5kaW5nUmVxdWVzdHMpCisgICAgICAgIFty ZXF1ZXN0IGNhbmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3RdOworCisgICAgQVNTRVJUKHVzZXJN ZWRpYVJlcXVlc3RzTWFwKCkuaXNFbXB0eSgpKTsKKworICAgIGF1dG8mIGNoZWNrTWFwID0gdXNl ck1lZGlhQ2hlY2tNYXAoKTsKKyAgICBWZWN0b3I8UmV0YWluUHRyPFdlYlVzZXJNZWRpYVBvbGlj eUNoZWNrZXJMaXN0ZW5lcj4+IHBlbmRpbmdDaGVja3M7CisgICAgY29weVZhbHVlc1RvVmVjdG9y KGNoZWNrTWFwLCBwZW5kaW5nQ2hlY2tzKTsKKyAgICBjaGVja01hcC5jbGVhcigpOworCisgICAg Zm9yIChhdXRvJiBjaGVjazogcGVuZGluZ0NoZWNrcykKKyAgICAgICAgW2NoZWNrIGNhbmNlbFVz ZXJNZWRpYVBlcm1pc3Npb25DaGVja107CisKKyAgICBBU1NFUlQodXNlck1lZGlhQ2hlY2tNYXAo KS5pc0VtcHR5KCkpOwogCiAgICAgZGVsZXRlIHRoaXM7CiB9CkBAIC0xMzAsOCArMTQzLDggQEAg dm9pZCBXZWJVc2VyTWVkaWFDbGllbnQ6OnJlcXVlc3RVc2VyTWVkaQogICAgIFdlYlVzZXJNZWRp YVBvbGljeUxpc3RlbmVyICpsaXN0ZW5lciA9IFtbV2ViVXNlck1lZGlhUG9saWN5TGlzdGVuZXIg YWxsb2NdIGluaXRXaXRoVXNlck1lZGlhUmVxdWVzdDomcmVxdWVzdF07CiAgICAgV2ViU2VjdXJp dHlPcmlnaW4gKndlYk9yaWdpbiA9IFtbV2ViU2VjdXJpdHlPcmlnaW4gYWxsb2NdIF9pbml0V2l0 aFdlYkNvcmVTZWN1cml0eU9yaWdpbjpyZXF1ZXN0LnNlY3VyaXR5T3JpZ2luKCldOwogCi0gICAg Q2FsbFVJRGVsZWdhdGUobV93ZWJWaWV3LCBzZWxlY3Rvciwgd2ViT3JpZ2luLCBsaXN0ZW5lcik7 CiAgICAgQWRkUmVxdWVzdFRvUmVxdWVzdE1hcCgmcmVxdWVzdCwgbGlzdGVuZXIpOworICAgIENh bGxVSURlbGVnYXRlKG1fd2ViVmlldywgc2VsZWN0b3IsIHdlYk9yaWdpbiwgbGlzdGVuZXIpOwog CiAgICAgW3dlYk9yaWdpbiByZWxlYXNlXTsKICAgICBbbGlzdGVuZXIgcmVsZWFzZV07CkBAIC0x NjMsOCArMTc2LDggQEAgdm9pZCBXZWJVc2VyTWVkaWFDbGllbnQ6OmNoZWNrVXNlck1lZGlhUAog ICAgIFdlYlVzZXJNZWRpYVBvbGljeUNoZWNrZXJMaXN0ZW5lciAqbGlzdGVuZXIgPSBbW1dlYlVz ZXJNZWRpYVBvbGljeUNoZWNrZXJMaXN0ZW5lciBhbGxvY10gaW5pdFdpdGhVc2VyTWVkaWFQZXJt aXNzaW9uQ2hlY2s6JnJlcXVlc3RdOwogICAgIFdlYlNlY3VyaXR5T3JpZ2luICp3ZWJPcmlnaW4g PSBbW1dlYlNlY3VyaXR5T3JpZ2luIGFsbG9jXSBfaW5pdFdpdGhXZWJDb3JlU2VjdXJpdHlPcmln aW46cmVxdWVzdC5zZWN1cml0eU9yaWdpbigpXTsKIAotICAgIENhbGxVSURlbGVnYXRlKG1fd2Vi Vmlldywgc2VsZWN0b3IsIHdlYk9yaWdpbiwgbGlzdGVuZXIpOwogICAgIEFkZFBlcm1pc3Npb25D aGVja1RvTWFwKCZyZXF1ZXN0LCBsaXN0ZW5lcik7CisgICAgQ2FsbFVJRGVsZWdhdGUobV93ZWJW aWV3LCBzZWxlY3Rvciwgd2ViT3JpZ2luLCBsaXN0ZW5lcik7CiAKICAgICBbd2ViT3JpZ2luIHJl bGVhc2VdOwogICAgIFtsaXN0ZW5lciByZWxlYXNlXTsKQEAgLTE3Miw3ICsxODUsNiBAQCB2b2lk IFdlYlVzZXJNZWRpYUNsaWVudDo6Y2hlY2tVc2VyTWVkaWFQCiAgICAgRU5EX0JMT0NLX09CSkNf RVhDRVBUSU9OUzsKIH0KIAotCiB2b2lkIFdlYlVzZXJNZWRpYUNsaWVudDo6Y2FuY2VsVXNlck1l ZGlhUGVybWlzc2lvbkNoZWNrKFdlYkNvcmU6OlVzZXJNZWRpYVBlcm1pc3Npb25DaGVjayYgcmVx dWVzdCkKIHsKICAgICBVc2VyTWVkaWFDaGVja01hcCYgcmVxdWVzdHNNYXAgPSB1c2VyTWVkaWFD aGVja01hcCgpOwpAQCAtMjE1LDcgKzIyNyw2IEBAIC0gKHZvaWQpYWxsb3cKICAgICAgICAgcmV0 dXJuOwogICAgIAogICAgIF9yZXF1ZXN0LT51c2VyTWVkaWFBY2Nlc3NHcmFudGVkKF9yZXF1ZXN0 LT5hbGxvd2VkQXVkaW9EZXZpY2VVSUQoKSwgX3JlcXVlc3QtPmFsbG93ZWRWaWRlb0RldmljZVVJ RCgpKTsKLQogICAgIFJlbW92ZVJlcXVlc3RGcm9tUmVxdWVzdE1hcChfcmVxdWVzdC5nZXQoKSk7 CiAjZW5kaWYKIH0K 270929 2016-02-09 08:53:47 -0800 2016-02-09 09:14:30 -0800 Updated patch. page_destroyed_patch.txt text/plain 4688 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjMwOCkKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTAyLTA5 ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIGNoZWNr VmFsaWRpdHkoKSBzb21ldGltZXMgYXNzZXJ0cyBpbiBXZWJVc2VyTWVkaWFDbGllbnQ6OnBhZ2VE ZXN0cm95ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1NDAyOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjQwNjUwMjI+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJV c2VyTWVkaWFDbGllbnQubW06CisgICAgICAgIChXZWJVc2VyTWVkaWFDbGllbnQ6OnBhZ2VEZXN0 cm95ZWQpOiBDb3B5IG1hcCBrZXlzIHRvIGEgdmVjdG9yIGFuZCBjbGVhciB0aGUgbWFwIGJlZm9y ZQorICAgICAgICAgIGVudW1lcmF0aW5nIHRoZSB2ZWN0b3IgYW5kIGNhbmNlbGluZyB0aGUgcmVx dWVzdHMuIEFTU0VSVCB0aGF0IHRoZSBtYXAgaXMgbm90IG1vZGlmaWVkCisgICAgICAgICAgZHVy aW5nIGNsZWFudXAuIENsZWFuIHVwIHRoZSBwZXJtaXNzaW9uIGNoZWNrIG1hcC4KKyAgICAgICAg KFdlYlVzZXJNZWRpYUNsaWVudDo6cmVxdWVzdFVzZXJNZWRpYUFjY2Vzcyk6IEFkZCB0aGUgcmVx dWVzdCB0byB0aGUgbWFwIGJlZm9yZSBjYWxsaW5nIHRoZQorICAgICAgICAgIFVJIGRlbGVnYXRl IGluIGNhc2UgaXQgd29ya3Mgc3luY2hyb25vdXNseSAoYXMgaXQgZG9lcyBpbiBEUlQpLgorICAg ICAgICAoV2ViVXNlck1lZGlhQ2xpZW50OjpjaGVja1VzZXJNZWRpYVBlcm1pc3Npb24pOiBEaXR0 by4KKyAgICAgICAgKFdlYlVzZXJNZWRpYUNsaWVudDo6Y2FuY2VsVXNlck1lZGlhUGVybWlzc2lv bkNoZWNrKTogV2hpdGUtc3BhY2UgY2xlYW51cC4KKyAgICAgICAgKC1bV2ViVXNlck1lZGlhUG9s aWN5TGlzdGVuZXIgYWxsb3ddKTogRGl0dG8uCisKIDIwMTYtMDItMDggIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCB3aGVuIHRyeWluZyB0byBj aGFpbiB0byB0aGUgb2xkIC1bTlNWaWV3IHNldE5lZWRzRGlzcGxheUluUmVjdDpdCkluZGV4OiBT b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJVc2VyTWVkaWFDbGllbnQubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViVXNlck1lZGlh Q2xpZW50Lm1tCShyZXZpc2lvbiAxOTYxMzgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3Jl U3VwcG9ydC9XZWJVc2VyTWVkaWFDbGllbnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1 IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtOTYsNyArOTYsNiBA QCBzdGF0aWMgdm9pZCBSZW1vdmVQZXJtaXNzaW9uQ2hlY2tGcm9tTWFwCiAgICAgdXNlck1lZGlh Q2hlY2tNYXAoKS5yZW1vdmUocmVxdWVzdCk7CiB9CiAKLQogV2ViVXNlck1lZGlhQ2xpZW50OjpX ZWJVc2VyTWVkaWFDbGllbnQoV2ViVmlldyogd2ViVmlldykKICAgICA6IG1fd2ViVmlldyh3ZWJW aWV3KQogewpAQCAtMTA4LDExICsxMDcsMjUgQEAgV2ViVXNlck1lZGlhQ2xpZW50Ojp+V2ViVXNl ck1lZGlhQ2xpZW50KAogCiB2b2lkIFdlYlVzZXJNZWRpYUNsaWVudDo6cGFnZURlc3Ryb3llZCgp CiB7Ci0gICAgVXNlck1lZGlhUmVxdWVzdHNNYXAmIHJlcXVlc3RzTWFwID0gdXNlck1lZGlhUmVx dWVzdHNNYXAoKTsKLSAgICBmb3IgKFVzZXJNZWRpYVJlcXVlc3RzTWFwOjppdGVyYXRvciBpdCA9 IHJlcXVlc3RzTWFwLmJlZ2luKCk7IGl0ICE9IHJlcXVlc3RzTWFwLmVuZCgpOyArK2l0KSB7Ci0g ICAgICAgIFtpdC0+dmFsdWUgY2FuY2VsVXNlck1lZGlhQWNjZXNzUmVxdWVzdF07Ci0gICAgICAg IHJlcXVlc3RzTWFwLnJlbW92ZShpdCk7Ci0gICAgfQorICAgIGF1dG8mIHJlcXVlc3RzTWFwID0g dXNlck1lZGlhUmVxdWVzdHNNYXAoKTsKKyAgICBWZWN0b3I8UmV0YWluUHRyPFdlYlVzZXJNZWRp YVBvbGljeUxpc3RlbmVyPj4gcGVuZGluZ1JlcXVlc3RzOworICAgIGNvcHlWYWx1ZXNUb1ZlY3Rv cihyZXF1ZXN0c01hcCwgcGVuZGluZ1JlcXVlc3RzKTsKKyAgICByZXF1ZXN0c01hcC5jbGVhcigp OworCisgICAgZm9yIChhdXRvJiByZXF1ZXN0IDogcGVuZGluZ1JlcXVlc3RzKQorICAgICAgICBb cmVxdWVzdCBjYW5jZWxVc2VyTWVkaWFBY2Nlc3NSZXF1ZXN0XTsKKworICAgIEFTU0VSVCh1c2Vy TWVkaWFSZXF1ZXN0c01hcCgpLmlzRW1wdHkoKSk7CisKKyAgICBhdXRvJiBjaGVja01hcCA9IHVz ZXJNZWRpYUNoZWNrTWFwKCk7CisgICAgVmVjdG9yPFJldGFpblB0cjxXZWJVc2VyTWVkaWFQb2xp Y3lDaGVja2VyTGlzdGVuZXI+PiBwZW5kaW5nQ2hlY2tzOworICAgIGNvcHlWYWx1ZXNUb1ZlY3Rv cihjaGVja01hcCwgcGVuZGluZ0NoZWNrcyk7CisgICAgY2hlY2tNYXAuY2xlYXIoKTsKKworICAg IGZvciAoYXV0byYgY2hlY2sgOiBwZW5kaW5nQ2hlY2tzKQorICAgICAgICBbY2hlY2sgY2FuY2Vs VXNlck1lZGlhUGVybWlzc2lvbkNoZWNrXTsKKworICAgIEFTU0VSVCh1c2VyTWVkaWFDaGVja01h cCgpLmlzRW1wdHkoKSk7CiAKICAgICBkZWxldGUgdGhpczsKIH0KQEAgLTEzMCw4ICsxNDMsOCBA QCB2b2lkIFdlYlVzZXJNZWRpYUNsaWVudDo6cmVxdWVzdFVzZXJNZWRpCiAgICAgV2ViVXNlck1l ZGlhUG9saWN5TGlzdGVuZXIgKmxpc3RlbmVyID0gW1tXZWJVc2VyTWVkaWFQb2xpY3lMaXN0ZW5l ciBhbGxvY10gaW5pdFdpdGhVc2VyTWVkaWFSZXF1ZXN0OiZyZXF1ZXN0XTsKICAgICBXZWJTZWN1 cml0eU9yaWdpbiAqd2ViT3JpZ2luID0gW1tXZWJTZWN1cml0eU9yaWdpbiBhbGxvY10gX2luaXRX aXRoV2ViQ29yZVNlY3VyaXR5T3JpZ2luOnJlcXVlc3Quc2VjdXJpdHlPcmlnaW4oKV07CiAKLSAg ICBDYWxsVUlEZWxlZ2F0ZShtX3dlYlZpZXcsIHNlbGVjdG9yLCB3ZWJPcmlnaW4sIGxpc3RlbmVy KTsKICAgICBBZGRSZXF1ZXN0VG9SZXF1ZXN0TWFwKCZyZXF1ZXN0LCBsaXN0ZW5lcik7CisgICAg Q2FsbFVJRGVsZWdhdGUobV93ZWJWaWV3LCBzZWxlY3Rvciwgd2ViT3JpZ2luLCBsaXN0ZW5lcik7 CiAKICAgICBbd2ViT3JpZ2luIHJlbGVhc2VdOwogICAgIFtsaXN0ZW5lciByZWxlYXNlXTsKQEAg LTE2Myw4ICsxNzYsOCBAQCB2b2lkIFdlYlVzZXJNZWRpYUNsaWVudDo6Y2hlY2tVc2VyTWVkaWFQ CiAgICAgV2ViVXNlck1lZGlhUG9saWN5Q2hlY2tlckxpc3RlbmVyICpsaXN0ZW5lciA9IFtbV2Vi VXNlck1lZGlhUG9saWN5Q2hlY2tlckxpc3RlbmVyIGFsbG9jXSBpbml0V2l0aFVzZXJNZWRpYVBl cm1pc3Npb25DaGVjazomcmVxdWVzdF07CiAgICAgV2ViU2VjdXJpdHlPcmlnaW4gKndlYk9yaWdp biA9IFtbV2ViU2VjdXJpdHlPcmlnaW4gYWxsb2NdIF9pbml0V2l0aFdlYkNvcmVTZWN1cml0eU9y aWdpbjpyZXF1ZXN0LnNlY3VyaXR5T3JpZ2luKCldOwogCi0gICAgQ2FsbFVJRGVsZWdhdGUobV93 ZWJWaWV3LCBzZWxlY3Rvciwgd2ViT3JpZ2luLCBsaXN0ZW5lcik7CiAgICAgQWRkUGVybWlzc2lv bkNoZWNrVG9NYXAoJnJlcXVlc3QsIGxpc3RlbmVyKTsKKyAgICBDYWxsVUlEZWxlZ2F0ZShtX3dl YlZpZXcsIHNlbGVjdG9yLCB3ZWJPcmlnaW4sIGxpc3RlbmVyKTsKIAogICAgIFt3ZWJPcmlnaW4g cmVsZWFzZV07CiAgICAgW2xpc3RlbmVyIHJlbGVhc2VdOwpAQCAtMTcyLDcgKzE4NSw2IEBAIHZv aWQgV2ViVXNlck1lZGlhQ2xpZW50OjpjaGVja1VzZXJNZWRpYVAKICAgICBFTkRfQkxPQ0tfT0JK Q19FWENFUFRJT05TOwogfQogCi0KIHZvaWQgV2ViVXNlck1lZGlhQ2xpZW50OjpjYW5jZWxVc2Vy TWVkaWFQZXJtaXNzaW9uQ2hlY2soV2ViQ29yZTo6VXNlck1lZGlhUGVybWlzc2lvbkNoZWNrJiBy ZXF1ZXN0KQogewogICAgIFVzZXJNZWRpYUNoZWNrTWFwJiByZXF1ZXN0c01hcCA9IHVzZXJNZWRp YUNoZWNrTWFwKCk7CkBAIC0yMTUsNyArMjI3LDYgQEAgLSAodm9pZClhbGxvdwogICAgICAgICBy ZXR1cm47CiAgICAgCiAgICAgX3JlcXVlc3QtPnVzZXJNZWRpYUFjY2Vzc0dyYW50ZWQoX3JlcXVl c3QtPmFsbG93ZWRBdWRpb0RldmljZVVJRCgpLCBfcmVxdWVzdC0+YWxsb3dlZFZpZGVvRGV2aWNl VUlEKCkpOwotCiAgICAgUmVtb3ZlUmVxdWVzdEZyb21SZXF1ZXN0TWFwKF9yZXF1ZXN0LmdldCgp KTsKICNlbmRpZgogfQo=