223143 2021-03-12 15:19:26 -0800 Add more MediaStream logging 2021-03-12 18:01:16 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1739042 0 eric.carlson 2021-03-12 15:19:26 -0800 Add more MediaStream logging 1739043 1 webkit-bug-importer 2021-03-12 15:19:35 -0800 <rdar://problem/75380363> 1739064 2 423091 eric.carlson 2021-03-12 16:39:08 -0800 Created attachment 423091 Patch 1739083 3 ews-feeder 2021-03-12 18:01:14 -0800 Committed r274376: <https://commits.webkit.org/r274376> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423091. 423091 2021-03-12 16:39:08 -0800 2021-03-12 18:01:15 -0800 Patch bug-223143-20210312163907.patch text/plain 12844 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI5NDE5MzQwMTY5MTlj NGQ0ZTI1NzBmNTIwYWJhM2IxZTRkMTBlOS4uYzBhN2E0NjdjYTNiOTdjM2Y5NTRkODhjNDg5N2Fi MmU2OTRiNGJjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDIxLTAzLTEyICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBtb3JlIE1l ZGlhU3RyZWFtIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyMzE0MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzUzODAzNjM+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBubyBmdW5jdGlvbmFsIGNoYW5nZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW1UcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNr OjpjbG9uZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjpzdG9wVHJhY2sp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6dHJhY2tTdGFydGVkKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2s6OnRyYWNrRW5kZWQpOgorICAgICAgICAq IHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpNZWRpYVN0cmVhbVRyYWNrUHJp dmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTo6fk1lZGlh U3RyZWFtVHJhY2tQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2tQ cml2YXRlOjpzZXRFbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2tQ cml2YXRlOjplbmRUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrUHJp dmF0ZTo6Y2xvbmUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6 OmNyZWF0ZUF1ZGlvU291cmNlUHJvdmlkZXIpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJl YW1UcmFja1ByaXZhdGU6OnNvdXJjZVN0YXJ0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFT dHJlYW1UcmFja1ByaXZhdGU6OnNvdXJjZVN0b3BwZWQpOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFTdHJlYW1UcmFja1ByaXZhdGU6OnNvdXJjZU11dGVkQ2hhbmdlZCk6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTo6c291cmNlU2V0dGluZ3NDaGFuZ2VkKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpwcmV2ZW50U291cmNlRnJv bVN0b3BwaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpo YXNTdGFydGVkUHJvZHVjaW5nRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRy YWNrUHJpdmF0ZTo6dXBkYXRlUmVhZHlTdGF0ZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz dHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGlt ZU1lZGlhU291cmNlOjpzZXRNdXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU1lZGlh U291cmNlOjpyZXF1ZXN0VG9FbmQpOgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVNZWRpYVNv dXJjZTo6ZW5kKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0Nh cHR1cmVTb3VyY2UubW06CisgICAgICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6 fkFWVmlkZW9DYXB0dXJlU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJl U291cmNlOjpzdGFydFByb2R1Y2luZ0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0Nh cHR1cmVTb3VyY2U6OnN0b3BQcm9kdWNpbmdEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkFWVmlk ZW9DYXB0dXJlU291cmNlOjpzaHV0ZG93bkNhcHR1cmVTZXNzaW9uKToKKyAgICAgICAgKFdlYkNv cmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpvcmllbnRhdGlvbkNoYW5nZWQpOgorCiAyMDIxLTAz LTExICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBB bGlnbiBKU0dsb2JhbE9iamVjdDo6ZGVmaW5lT3duUHJvcGVydHkoKSB3aXRoIHRoZSBzcGVjIGFu ZCBvdGhlciBydW50aW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5jcHAKaW5kZXggODNjMzIzM2RjMjMwMWY2ZmE4ZTNj YjQ3MmNiNzEwM2E3MWJmM2VjZi4uNmMxZjE3YTAzZjc5MjI1MWE1MmJhOGFkNDAwMmRlOGFiYmE3 YmU0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbVRyYWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L01lZGlhU3RyZWFtVHJhY2suY3BwCkBAIC0yMTgsNiArMjE4LDggQEAgUmVmUHRyPE1lZGlhU3Ry ZWFtVHJhY2s+IE1lZGlhU3RyZWFtVHJhY2s6OmNsb25lKCkKICAgICBpZiAoIXNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKKyAgICBBTFdBWVNfTE9H KExPR0lERU5USUZJRVIpOworCiAgICAgcmV0dXJuIE1lZGlhU3RyZWFtVHJhY2s6OmNyZWF0ZSgq c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBtX3ByaXZhdGUtPmNsb25lKCkpOwogfQogCkBAIC0y MjksNiArMjMxLDggQEAgdm9pZCBNZWRpYVN0cmVhbVRyYWNrOjpzdG9wVHJhY2soU3RvcE1vZGUg bW9kZSkKICAgICBpZiAoZW5kZWQoKSkKICAgICAgICAgcmV0dXJuOwogCisgICAgQUxXQVlTX0xP RyhMT0dJREVOVElGSUVSLCBzdGF0aWNfY2FzdDxpbnQ+KG1vZGUpKTsKKwogICAgIC8vIEFuICdl bmRlZCcgZXZlbnQgaXMgbm90IHBvc3RlZCBpZiBtX2VuZGVkIGlzIHRydWUgd2hlbiB0cmFja0Vu ZGVkIGlzIGNhbGxlZCwgc28gc2V0IGl0IG5vdyBpZiB3ZSBhcmUKICAgICAvLyBub3Qgc3VwcG9z ZWQgdG8gcG9zdCB0aGUgZXZlbnQuCiAgICAgaWYgKG1vZGUgPT0gU3RvcE1vZGU6OlNpbGVudGx5 KQpAQCAtNTQ5LDYgKzU1Myw3IEBAIHZvaWQgTWVkaWFTdHJlYW1UcmFjazo6ZW5kQ2FwdHVyZShE b2N1bWVudCYgZG9jdW1lbnQsIE1lZGlhUHJvZHVjZXI6Ok1lZGlhQ2FwdHVyCiAKIHZvaWQgTWVk aWFTdHJlYW1UcmFjazo6dHJhY2tTdGFydGVkKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJikKIHsK KyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOwogICAgIGNvbmZpZ3VyZVRyYWNrUmVuZGVy aW5nKCk7CiB9CiAKQEAgLTU2Myw2ICs1NjgsOCBAQCB2b2lkIE1lZGlhU3RyZWFtVHJhY2s6OnRy YWNrRW5kZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmKQogICAgIGlmIChtX2VuZGVkKQogICAg ICAgICByZXR1cm47CiAKKyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOworCiAgICAgaWYg KG1faXNDYXB0dXJlVHJhY2sgJiYgbV9wcml2YXRlLT5zb3VyY2UoKS5jYXB0dXJlRGlkRmFpbCgp KQogICAgICAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmFkZENvbnNvbGVNZXNzYWdlKE1l c3NhZ2VTb3VyY2U6OkpTLCBNZXNzYWdlTGV2ZWw6OkVycm9yLCAiQSBNZWRpYVN0cmVhbVRyYWNr IGVuZGVkIGR1ZSB0byBhIGNhcHR1cmUgZmFpbHVyZSJfcyk7CiAKQEAgLTU3Miw2ICs1NzksOCBA QCB2b2lkIE1lZGlhU3RyZWFtVHJhY2s6OnRyYWNrRW5kZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZh dGUmKQogICAgIGlmIChzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmFjdGl2ZURPTU9iamVjdHNB cmVTdXNwZW5kZWQoKSB8fCBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmFjdGl2ZURPTU9iamVj dHNBcmVTdG9wcGVkKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIEFMV0FZU19MT0coTE9HSURF TlRJRklFUiwgImZpcmluZyAnZW5kZWQnIGV2ZW50Iik7CisKICAgICAvLyAzLiBOb3RpZnkgdHJh Y2sncyBzb3VyY2UgdGhhdCB0cmFjayBpcyBlbmRlZCBzbyB0aGF0IHRoZSBzb3VyY2UgbWF5IGJl IHN0b3BwZWQsIHVubGVzcyBvdGhlciBNZWRpYVN0cmVhbVRyYWNrIG9iamVjdHMgZGVwZW5kIG9u IGl0LgogICAgIC8vIDQuIEZpcmUgYSBzaW1wbGUgZXZlbnQgbmFtZWQgZW5kZWQgYXQgdGhlIG9i amVjdC4KICAgICBkaXNwYXRjaEV2ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmVuZGVk RXZlbnQsIEV2ZW50OjpDYW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5jZWxhYmxlOjpObykpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJl YW1UcmFja1ByaXZhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW1UcmFja1ByaXZhdGUuY3BwCmluZGV4IGQ2MTYzMTRkNjJhYTdhMTJhZDJjZDRl N2QxNGFkM2Q0YjVkYzU0NTguLjM5ZWFiOGM3NjgxY2FmYWFmMmZhZjE1ZmFkNDYzZTM5YjdkYzQ0 NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlh U3RyZWFtVHJhY2tQcml2YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5jcHAKQEAgLTU2LDE2ICs1NiwxNyBAQCBS ZWY8TWVkaWFTdHJlYW1UcmFja1ByaXZhdGU+IE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpjcmVh dGUoUmVmPGNvbnN0IExvZ2dlcj4mJgogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IE1lZGlhU3Ry ZWFtVHJhY2tQcml2YXRlKFdURk1vdmUobG9nZ2VyKSwgV1RGTW92ZShzb3VyY2UpLCBXVEZNb3Zl KGlkKSkpOwogfQogCi1NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTo6TWVkaWFTdHJlYW1UcmFja1By aXZhdGUoUmVmPGNvbnN0IExvZ2dlcj4mJiBsb2dnZXIsIFJlZjxSZWFsdGltZU1lZGlhU291cmNl PiYmIHNvdXJjZSwgU3RyaW5nJiYgaWQpCitNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTo6TWVkaWFT dHJlYW1UcmFja1ByaXZhdGUoUmVmPGNvbnN0IExvZ2dlcj4mJiB0cmFja0xvZ2dlciwgUmVmPFJl YWx0aW1lTWVkaWFTb3VyY2U+JiYgc291cmNlLCBTdHJpbmcmJiBpZCkKICAgICA6IG1fc291cmNl KFdURk1vdmUoc291cmNlKSkKICAgICAsIG1faWQoV1RGTW92ZShpZCkpCi0gICAgLCBtX2xvZ2dl cihXVEZNb3ZlKGxvZ2dlcikpCisgICAgLCBtX2xvZ2dlcihXVEZNb3ZlKHRyYWNrTG9nZ2VyKSkK ICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAgICAsIG1fbG9nSWRlbnRpZmllcih1bmlxdWVM b2dJZGVudGlmaWVyKCkpCiAjZW5kaWYKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwot ICAgIFVOVVNFRF9QQVJBTShsb2dnZXIpOworICAgIFVOVVNFRF9QQVJBTSh0cmFja0xvZ2dlcik7 CisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSKTsKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJM RUQKICAgICBtX3NvdXJjZS0+c2V0TG9nZ2VyKG1fbG9nZ2VyLmNvcHlSZWYoKSwgbV9sb2dJZGVu dGlmaWVyKTsKICNlbmRpZgpAQCAtNzUsNiArNzYsOCBAQCBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0 ZTo6TWVkaWFTdHJlYW1UcmFja1ByaXZhdGUoUmVmPGNvbnN0IExvZ2dlcj4mJiBsb2dnZXIsIFJl ZgogTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6On5NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSgpCiB7 CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKworICAgIEFMV0FZU19MT0coTE9HSURFTlRJ RklFUik7CiAgICAgbV9zb3VyY2UtPnJlbW92ZU9ic2VydmVyKCp0aGlzKTsKIH0KIApAQCAtMTIz LDYgKzEyNiw4IEBAIHZvaWQgTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6OnNldEVuYWJsZWQoYm9v bCBlbmFibGVkKQogICAgIGlmIChtX2lzRW5hYmxlZCA9PSBlbmFibGVkKQogICAgICAgICByZXR1 cm47CiAKKyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsIGVuYWJsZWQpOworCiAgICAgLy8g QWx3YXlzIHVwZGF0ZSB0aGUgZW5hYmxlZCBzdGF0ZSByZWdhcmRsZXNzIG9mIHRoZSB0cmFjayBi ZWluZyBlbmRlZC4KICAgICBtX2lzRW5hYmxlZCA9IGVuYWJsZWQ7CiAKQEAgLTEzNiw2ICsxNDEs OCBAQCB2b2lkIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjplbmRUcmFjaygpCiAgICAgaWYgKG1f aXNFbmRlZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVS KTsKKwogICAgIC8vIFNldCBtX2lzRW5kZWQgdG8gdHJ1ZSBiZWZvcmUgdGVsbGluZyB0aGUgc291 cmNlIGl0IGNhbiBzdG9wLCBzbyBpZiB0aGlzIGlzIHRoZQogICAgIC8vIG9ubHkgdHJhY2sgdXNp bmcgdGhlIHNvdXJjZSBhbmQgaXQgZG9lcyBzdG9wLCB3ZSB3aWxsIG9ubHkgY2FsbCBlYWNoIG9i c2VydmVyJ3MKICAgICAvLyB0cmFja0VuZGVkIG1ldGhvZCBvbmNlLgpAQCAtMTUzLDYgKzE2MCw4 IEBAIFJlZjxNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZT4gTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6 OmNsb25lKCkKIHsKICAgICBhdXRvIGNsb25lZE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlID0gY3Jl YXRlKG1fbG9nZ2VyLmNvcHlSZWYoKSwgbV9zb3VyY2UtPmNsb25lKCkpOwogCisgICAgQUxXQVlT X0xPRyhMT0dJREVOVElGSUVSLCBjbG9uZWRNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS0+bG9nSWRl bnRpZmllcigpKTsKKwogICAgIGNsb25lZE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlLT5tX2lzRW5h YmxlZCA9IHRoaXMtPm1faXNFbmFibGVkOwogICAgIGNsb25lZE1lZGlhU3RyZWFtVHJhY2tQcml2 YXRlLT5tX2lzRW5kZWQgPSB0aGlzLT5tX2lzRW5kZWQ7CiAgICAgY2xvbmVkTWVkaWFTdHJlYW1U cmFja1ByaXZhdGUtPm1fY29udGVudEhpbnQgPSB0aGlzLT5tX2NvbnRlbnRIaW50OwpAQCAtMTg2 LDYgKzE5NSw4IEBAIHZvaWQgTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6OmFwcGx5Q29uc3RyYWlu dHMoY29uc3QgTWVkaWFDb25zdHJhaW50cyYgY29uc3RyYWluCiAKIFJlZlB0cjxXZWJBdWRpb1Nv dXJjZVByb3ZpZGVyPiBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTo6Y3JlYXRlQXVkaW9Tb3VyY2VQ cm92aWRlcigpCiB7CisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSKTsKKwogI2lmIFBMQVRG T1JNKENPQ09BKQogICAgIHJldHVybiBNZWRpYVN0cmVhbVRyYWNrQXVkaW9Tb3VyY2VQcm92aWRl ckNvY29hOjpjcmVhdGUoKnRoaXMpOwogI2VsaWYgVVNFKExJQldFQlJUQykgJiYgVVNFKEdTVFJF QU1FUikKQEAgLTE5Nyw2ICsyMDgsOCBAQCBSZWZQdHI8V2ViQXVkaW9Tb3VyY2VQcm92aWRlcj4g TWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6OmNyZWF0ZUF1ZGlvU291cmNlUHJvdmlkZQogCiB2b2lk IE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpzb3VyY2VTdGFydGVkKCkKIHsKKyAgICBBTFdBWVNf TE9HKExPR0lERU5USUZJRVIpOworCiAgICAgZm9yRWFjaE9ic2VydmVyKFt0aGlzXShhdXRvJiBv YnNlcnZlcikgewogICAgICAgICBvYnNlcnZlci50cmFja1N0YXJ0ZWQoKnRoaXMpOwogICAgIH0p OwpAQCAtMjA3LDYgKzIyMCw4IEBAIHZvaWQgTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6OnNvdXJj ZVN0b3BwZWQoKQogICAgIGlmIChtX2lzRW5kZWQpCiAgICAgICAgIHJldHVybjsKIAorICAgIEFM V0FZU19MT0coTE9HSURFTlRJRklFUik7CisKICAgICBtX2lzRW5kZWQgPSB0cnVlOwogICAgIHVw ZGF0ZVJlYWR5U3RhdGUoKTsKIApAQCAtMjE3LDYgKzIzMiw4IEBAIHZvaWQgTWVkaWFTdHJlYW1U cmFja1ByaXZhdGU6OnNvdXJjZVN0b3BwZWQoKQogCiB2b2lkIE1lZGlhU3RyZWFtVHJhY2tQcml2 YXRlOjpzb3VyY2VNdXRlZENoYW5nZWQoKQogeworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklF Uik7CisKICAgICBmb3JFYWNoT2JzZXJ2ZXIoW3RoaXNdKGF1dG8mIG9ic2VydmVyKSB7CiAgICAg ICAgIG9ic2VydmVyLnRyYWNrTXV0ZWRDaGFuZ2VkKCp0aGlzKTsKICAgICB9KTsKQEAgLTIyNCw2 ICsyNDEsOCBAQCB2b2lkIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpzb3VyY2VNdXRlZENoYW5n ZWQoKQogCiB2b2lkIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpzb3VyY2VTZXR0aW5nc0NoYW5n ZWQoKQogeworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUik7CisKICAgICBmb3JFYWNoT2Jz ZXJ2ZXIoW3RoaXNdKGF1dG8mIG9ic2VydmVyKSB7CiAgICAgICAgIG9ic2VydmVyLnRyYWNrU2V0 dGluZ3NDaGFuZ2VkKCp0aGlzKTsKICAgICB9KTsKQEAgLTIzMSw2ICsyNTAsOCBAQCB2b2lkIE1l ZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpzb3VyY2VTZXR0aW5nc0NoYW5nZWQoKQogCiBib29sIE1l ZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpwcmV2ZW50U291cmNlRnJvbVN0b3BwaW5nKCkKIHsKKyAg ICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsIG1faXNFbmRlZCk7CisKICAgICAvLyBEbyBub3Qg YWxsb3cgdGhlIHNvdXJjZSB0byBzdG9wIGlmIHdlIGFyZSBzdGlsbCB1c2luZyBpdC4KICAgICBy ZXR1cm4gIW1faXNFbmRlZDsKIH0KQEAgLTI0MCw2ICsyNjEsNyBAQCB2b2lkIE1lZGlhU3RyZWFt VHJhY2tQcml2YXRlOjpoYXNTdGFydGVkUHJvZHVjaW5nRGF0YSgpCiAgICAgQVNTRVJUKGlzTWFp blRocmVhZCgpKTsKICAgICBpZiAobV9oYXNTdGFydGVkUHJvZHVjaW5nRGF0YSkKICAgICAgICAg cmV0dXJuOworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUik7CiAgICAgbV9oYXNTdGFydGVk UHJvZHVjaW5nRGF0YSA9IHRydWU7CiAgICAgdXBkYXRlUmVhZHlTdGF0ZSgpOwogfQpAQCAtMjU2 LDcgKzI3OCw3IEBAIHZvaWQgTWVkaWFTdHJlYW1UcmFja1ByaXZhdGU6OnVwZGF0ZVJlYWR5U3Rh dGUoKQogICAgIGlmIChzdGF0ZSA9PSBtX3JlYWR5U3RhdGUpCiAgICAgICAgIHJldHVybjsKIAot ICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUik7CisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElG SUVSLCBzdGF0ZSA9PSBSZWFkeVN0YXRlOjpFbmRlZCA/ICJFbmRlZCIgOiAiTGl2ZSIpOwogCiAg ICAgbV9yZWFkeVN0YXRlID0gc3RhdGU7CiAgICAgZm9yRWFjaE9ic2VydmVyKFt0aGlzXShhdXRv JiBvYnNlcnZlcikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmNwcAppbmRleCA1NTI5ZDczNjE3YmRhNDJk MWM1YmI0Njk5ZjQ3YWYyMTM2ZjJlZDkzLi5lYmIyMjQzYzExYmYxMzIyNTE2Zjc4MTMzMDFhM2Vl YmIzMDUzN2FlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9SZWFsdGltZU1lZGlhU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmNwcApAQCAtMTA0LDEwICsxMDQsMTIgQEAg dm9pZCBSZWFsdGltZU1lZGlhU291cmNlOjpyZW1vdmVPYnNlcnZlcihPYnNlcnZlciYgb2JzZXJ2 ZXIpCiAKIHZvaWQgUmVhbHRpbWVNZWRpYVNvdXJjZTo6c2V0TXV0ZWQoYm9vbCBtdXRlZCkKIHsK LSAgICBBTFdBWVNfTE9HX0lGKG1fbG9nZ2VyLCBMT0dJREVOVElGSUVSLCBtdXRlZCk7Ci0KICAg ICAvLyBDaGFuZ2VkIG1fbXV0ZWQgYmVmb3JlIGNhbGxpbmcgc3RhcnQvc3RvcCBzbyBtdXRlZCgp IHdpbGwgcmVmbGVjdCB0aGUgY29ycmVjdCBzdGF0ZS4KICAgICBib29sIGNoYW5nZWQgPSBtX211 dGVkICE9IG11dGVkOworCisgICAgaWYgKGNoYW5nZWQpCisgICAgICAgIEFMV0FZU19MT0dfSUYo bV9sb2dnZXIsIExPR0lERU5USUZJRVIsIG11dGVkKTsKKwogICAgIG1fbXV0ZWQgPSBtdXRlZDsK ICAgICBpZiAobXV0ZWQpCiAgICAgICAgIHN0b3AoKTsKQEAgLTI1NiwxOCArMjU4LDE5IEBAIHZv aWQgUmVhbHRpbWVNZWRpYVNvdXJjZTo6cmVxdWVzdFRvRW5kKE9ic2VydmVyJiBjYWxsaW5nT2Jz ZXJ2ZXIpCiAgICAgaWYgKGhhc09ic2VydmVyUHJldmVudGluZ1N0b3BwaW5nKQogICAgICAgICBy ZXR1cm47CiAKKyAgICBBTFdBWVNfTE9HX0lGKG1fbG9nZ2VyLCBMT0dJREVOVElGSUVSKTsKICAg ICBlbmQoJmNhbGxpbmdPYnNlcnZlcik7CiB9CiAKIHZvaWQgUmVhbHRpbWVNZWRpYVNvdXJjZTo6 ZW5kKE9ic2VydmVyKiBjYWxsaW5nT2JzZXJ2ZXIpCiB7Ci0gICAgQUxXQVlTX0xPR19JRihtX2xv Z2dlciwgTE9HSURFTlRJRklFUik7Ci0KICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCiAg ICAgaWYgKG1faXNFbmRlZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgQUxXQVlTX0xPR19JRiht X2xvZ2dlciwgTE9HSURFTlRJRklFUik7CisKICAgICBhdXRvIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKTsKIAogICAgIHN0b3AoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbSBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQpp bmRleCAyN2ZkODc3MjVhNzcwN2IzZmQ1NDQ2NzU1MDYxYzMzNzBhNzFlMDcwLi4yYjQ5YjJlOTNm ZTUxZWJkNjhhMmJlZGZhNTdkZGE2ZmFjMmRmMWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291 cmNlLm1tCkBAIC0xMzUsNiArMTM1LDggQEAgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OkFWVmlkZW9D YXB0dXJlU291cmNlKEFWQ2FwdHVyZURldmljZSogZGV2aWNlLCBTdHJpbmcmJiBpZCwKIAogQVZW aWRlb0NhcHR1cmVTb3VyY2U6On5BVlZpZGVvQ2FwdHVyZVNvdXJjZSgpCiB7CisgICAgQUxXQVlT X0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUik7CisKICNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQogICAgIFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXI6OnNpbmdsZXRvbigpLnZpZGVv Q2FwdHVyZUZhY3RvcnkoKS51bnNldEFjdGl2ZVNvdXJjZSgqdGhpcyk7CiAjZW5kaWYKQEAgLTE5 MiwxMCArMTk0LDExIEBAIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnN0YXJ0UHJvZHVjaW5n RGF0YSgpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKFttX3Nlc3Npb24g aXNSdW5uaW5nXSkKKyAgICBib29sIGlzUnVubmluZyA9ICEhW21fc2Vzc2lvbiBpc1J1bm5pbmdd OworICAgIEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lERU5USUZJRVIsIGlzUnVubmlu Zyk7CisgICAgaWYgKGlzUnVubmluZykKICAgICAgICAgcmV0dXJuOwogCi0gICAgQUxXQVlTX0xP R19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUik7CiAgICAgW21fb2JqY09ic2VydmVyIGFk ZE5vdGlmaWNhdGlvbk9ic2VydmVyc107CiAgICAgW21fc2Vzc2lvbiBzdGFydFJ1bm5pbmddOwog fQpAQCAtMjA1LDExICsyMDgsOSBAQCB2b2lkIEFWVmlkZW9DYXB0dXJlU291cmNlOjpzdG9wUHJv ZHVjaW5nRGF0YSgpCiAgICAgaWYgKCFtX3Nlc3Npb24pCiAgICAgICAgIHJldHVybjsKIAotICAg IEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lERU5USUZJRVIpOworICAgIEFMV0FZU19M T0dfSUYobG9nZ2VyUHRyKCksIExPR0lERU5USUZJRVIsICEhW21fc2Vzc2lvbiBpc1J1bm5pbmdd KTsKICAgICBbbV9vYmpjT2JzZXJ2ZXIgcmVtb3ZlTm90aWZpY2F0aW9uT2JzZXJ2ZXJzXTsKLQot ICAgIGlmIChbbV9zZXNzaW9uIGlzUnVubmluZ10pCi0gICAgICAgIFttX3Nlc3Npb24gc3RvcFJ1 bm5pbmddOworICAgIFttX3Nlc3Npb24gc3RvcFJ1bm5pbmddOwogCiAgICAgbV9pbnRlcnJ1cHRl ZCA9IGZhbHNlOwogCkBAIC00OTEsNiArNDkyLDcgQEAgYm9vbCBBVlZpZGVvQ2FwdHVyZVNvdXJj ZTo6c2V0dXBDYXB0dXJlU2Vzc2lvbigpCiAKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnNo dXRkb3duQ2FwdHVyZVNlc3Npb24oKQogeworICAgIEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCks IExPR0lERU5USUZJRVIpOwogICAgIG1fYnVmZmVyID0gbnVsbHB0cjsKIH0KIApAQCAtNTA5LDYg KzUxMSw3IEBAIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6Om9yaWVudGF0aW9uQ2hhbmdlZChp bnQgb3JpZW50YXRpb24pCiAgICAgQVNTRVJUKG9yaWVudGF0aW9uID09IDAgfHwgb3JpZW50YXRp b24gPT0gOTAgfHwgb3JpZW50YXRpb24gPT0gLTkwIHx8IG9yaWVudGF0aW9uID09IDE4MCk7CiAg ICAgbV9kZXZpY2VPcmllbnRhdGlvbiA9IG9yaWVudGF0aW9uOwogICAgIGNvbXB1dGVTYW1wbGVS b3RhdGlvbigpOworICAgIEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lERU5USUZJRVIs ICJyb3RhdGlvbiA9ICIsIG1fc2FtcGxlUm90YXRpb24sICIsIG9yaWVudGF0aW9uID0gIiwgbV9k ZXZpY2VPcmllbnRhdGlvbik7CiB9CiAKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNvbXB1 dGVTYW1wbGVSb3RhdGlvbigpCg==