182614 2018-02-08 12:20:50 -0800 Make CoreAudioCaptureSource error logging be release logging 2018-02-09 10:11:19 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1397645 0 youennf 2018-02-08 12:20:50 -0800 Make CoreAudioCaptureSource error logging be release logging 1397646 1 333407 youennf 2018-02-08 12:21:48 -0800 Created attachment 333407 Patch 1397647 2 youennf 2018-02-08 12:23:17 -0800 Will probably conflict with bug 182606 patch. I prefer landing bug 182606 before this one. 1397997 3 333407 commit-queue 2018-02-09 10:10:58 -0800 Comment on attachment 333407 Patch Clearing flags on attachment: 333407 Committed r228325: <https://trac.webkit.org/changeset/228325> 1397998 4 commit-queue 2018-02-09 10:10:59 -0800 All reviewed patches have been landed. Closing bug. 1397999 5 webkit-bug-importer 2018-02-09 10:11:19 -0800 <rdar://problem/37394955> 333407 2018-02-08 12:21:48 -0800 2018-02-09 10:10:58 -0800 Patch bug-182614-20180208122147.patch text/plain 15641 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4Mjg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmRmYjdkMDQxMWFkYmE0 OWZjMmJlYjVkMzUyM2QzZTc4MjlmNmU5NS4uYjFiMmM1MGU2YjMzZDFiNGM3MDU5Y2E1MTQ4ZGM1 ZjE4ODc0MGViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTAyLTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIENvcmVBdWRpb0Nh cHR1cmVTb3VyY2UgZXJyb3IgbG9nZ2luZyBiZSByZWxlYXNlIGxvZ2dpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjYxNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBvZiBiZWhhdmlv ci4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJl U291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRpb1NoYXJlZFVuaXQ6OmFkZEVj aG9DYW5jZWxsYXRpb25Tb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvU2hhcmVk VW5pdDo6c2V0dXBBdWRpb1VuaXQpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvU2hhcmVk VW5pdDo6Y29uZmlndXJlTWljcm9waG9uZVByb2MpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1 ZGlvU2hhcmVkVW5pdDo6Y29uZmlndXJlU3BlYWtlclByb2MpOgorICAgICAgICAoV2ViQ29yZTo6 Q29yZUF1ZGlvU2hhcmVkVW5pdDo6Y2hlY2tUaW1lc3RhbXBzKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvcmVBdWRpb1NoYXJlZFVuaXQ6OnByb3ZpZGVTcGVha2VyRGF0YSk6CisgICAgICAgIChXZWJD b3JlOjpDb3JlQXVkaW9TaGFyZWRVbml0Ojpwcm9jZXNzTWljcm9waG9uZVNhbXBsZXMpOgorICAg ICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvU2hhcmVkVW5pdDo6Y2xlYW51cEF1ZGlvVW5pdCk6Cisg ICAgICAgIChXZWJDb3JlOjpDb3JlQXVkaW9TaGFyZWRVbml0OjpyZWNvbmZpZ3VyZUF1ZGlvVW5p dCk6CisgICAgICAgIChXZWJDb3JlOjpDb3JlQXVkaW9TaGFyZWRVbml0OjpzdGFydEludGVybmFs KToKKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRpb1NoYXJlZFVuaXQ6OnZlcmlmeUlzQ2FwdHVy aW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRpb1NoYXJlZFVuaXQ6OnN0b3BJbnRlcm5h bCk6CisgICAgICAgIChXZWJDb3JlOjpDb3JlQXVkaW9TaGFyZWRVbml0OjpkZWZhdWx0SW5wdXRE ZXZpY2UpOgorCiAyMDE4LTAyLTA4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBVc2UgaW52YWxpZGF0aW9uIHJ1bGVzZXRzIGZvciBhdHRyaWJ1dGUgc2VsZWN0 b3JzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMv Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKaW5kZXggNzI0YzY3OGE5YjQw OWJjM2E2ZDU4MzUwYTE0NjliYmY4OTVlM2Q0Yy4uYWMyOTg0ZmZiYzI0Y2Y0N2ZhYTkwY2ZmY2Nj ODQ2YTQ0NDM5ZmY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlU291cmNlLmNwcApAQCAt MjA1LDcgKzIwNSw3IEBAIHZvaWQgQ29yZUF1ZGlvU2hhcmVkVW5pdDo6cmVtb3ZlQ2xpZW50KENv cmVBdWRpb0NhcHR1cmVTb3VyY2UmIGNsaWVudCkKIHZvaWQgQ29yZUF1ZGlvU2hhcmVkVW5pdDo6 YWRkRWNob0NhbmNlbGxhdGlvblNvdXJjZShBdWRpb1NhbXBsZURhdGFTb3VyY2UmIHNvdXJjZSkK IHsKICAgICBpZiAoIXNvdXJjZS5zZXRPdXRwdXRGb3JtYXQobV9zcGVha2VyUHJvY0Zvcm1hdCkp IHsKLSAgICAgICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6YWRkRWNob0NhbmNl bGxhdGlvblNvdXJjZTogc291cmNlICVwIGNvbmZpZ3VyZU91dHB1dCBmYWlsZWQiLCAmc291cmNl KTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEsICJDb3JlQXVkaW9TaGFyZWRVbml0 OjphZGRFY2hvQ2FuY2VsbGF0aW9uU291cmNlOiBzb3VyY2UgJXAgY29uZmlndXJlT3V0cHV0IGZh aWxlZCIsICZzb3VyY2UpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0yMzksNyArMjM5 LDcgQEAgT1NTdGF0dXMgQ29yZUF1ZGlvU2hhcmVkVW5pdDo6c2V0dXBBdWRpb1VuaXQoKQogICAg IEF1ZGlvQ29tcG9uZW50IGlvQ29tcG9uZW50ID0gQXVkaW9Db21wb25lbnRGaW5kTmV4dChudWxs cHRyLCAmaW9Vbml0RGVzY3JpcHRpb24pOwogICAgIEFTU0VSVChpb0NvbXBvbmVudCk7CiAgICAg aWYgKCFpb0NvbXBvbmVudCkgewotICAgICAgICBMT0coTWVkaWEsICJDb3JlQXVkaW9DYXB0dXJl U291cmNlOjpzZXR1cEF1ZGlvVW5pdCglcCkgdW5hYmxlIHRvIGZpbmQgdnBpbyB1bml0IGNvbXBv bmVudCIsIHRoaXMpOworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgIkNvcmVBdWRp b0NhcHR1cmVTb3VyY2U6OnNldHVwQXVkaW9Vbml0KCVwKSB1bmFibGUgdG8gZmluZCB2cGlvIHVu aXQgY29tcG9uZW50IiwgdGhpcyk7CiAgICAgICAgIHJldHVybiAtMTsKICAgICB9CiAKQEAgLTI0 OSwxMyArMjQ5LDEzIEBAIE9TU3RhdHVzIENvcmVBdWRpb1NoYXJlZFVuaXQ6OnNldHVwQXVkaW9V bml0KCkKICAgICBpZiAobmFtZSkgewogICAgICAgICBtX2lvVW5pdE5hbWUgPSBuYW1lOwogICAg ICAgICBDRlJlbGVhc2UobmFtZSk7Ci0gICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb0NhcHR1 cmVTb3VyY2U6OnNldHVwQXVkaW9Vbml0KCVwKSBjcmVhdGVkIFwiJXNcIiBjb21wb25lbnQiLCB0 aGlzLCBtX2lvVW5pdE5hbWUudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIFJFTEVBU0VfTE9HKE1l ZGlhLCAiQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6c2V0dXBBdWRpb1VuaXQoJXApIGNyZWF0ZWQg XCIlc1wiIGNvbXBvbmVudCIsIHRoaXMsIG1faW9Vbml0TmFtZS51dGY4KCkuZGF0YSgpKTsKICAg ICB9CiAjZW5kaWYKIAogICAgIGF1dG8gZXJyID0gQXVkaW9Db21wb25lbnRJbnN0YW5jZU5ldyhp b0NvbXBvbmVudCwgJm1faW9Vbml0KTsKICAgICBpZiAoZXJyKSB7Ci0gICAgICAgIExPRyhNZWRp YSwgIkNvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnNldHVwQXVkaW9Vbml0KCVwKSB1bmFibGUgdG8g b3BlbiB2cGlvIHVuaXQsIGVycm9yICVkICglLjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciop JmVycik7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKE1lZGlhLCAiQ29yZUF1ZGlvQ2FwdHVy ZVNvdXJjZTo6c2V0dXBBdWRpb1VuaXQoJXApIHVuYWJsZSB0byBvcGVuIHZwaW8gdW5pdCwgZXJy b3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKICAgICAgICAgcmV0 dXJuIGVycjsKICAgICB9CiAKQEAgLTI2MywxMyArMjYzLDEzIEBAIE9TU3RhdHVzIENvcmVBdWRp b1NoYXJlZFVuaXQ6OnNldHVwQXVkaW9Vbml0KCkKICAgICAgICAgdWludDMyX3QgcGFyYW0gPSAw OwogICAgICAgICBlcnIgPSBBdWRpb1VuaXRTZXRQcm9wZXJ0eShtX2lvVW5pdCwga0FVVm9pY2VJ T1Byb3BlcnR5X1ZvaWNlUHJvY2Vzc2luZ0VuYWJsZUFHQywga0F1ZGlvVW5pdFNjb3BlX0dsb2Jh bCwgaW5wdXRCdXMsICZwYXJhbSwgc2l6ZW9mKHBhcmFtKSk7CiAgICAgICAgIGlmIChlcnIpIHsK LSAgICAgICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnNldHVwQXVk aW9Vbml0KCVwKSB1bmFibGUgdG8gc2V0IHZwaW8gYXV0b21hdGljIGdhaW4gY29udHJvbCwgZXJy b3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKKyAgICAgICAgICAg IFJFTEVBU0VfTE9HX0VSUk9SKE1lZGlhLCAiQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6c2V0dXBB dWRpb1VuaXQoJXApIHVuYWJsZSB0byBzZXQgdnBpbyBhdXRvbWF0aWMgZ2FpbiBjb250cm9sLCBl cnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOwogICAgICAgICAg ICAgcmV0dXJuIGVycjsKICAgICAgICAgfQogICAgICAgICBwYXJhbSA9IDE7CiAgICAgICAgIGVy ciA9IEF1ZGlvVW5pdFNldFByb3BlcnR5KG1faW9Vbml0LCBrQVVWb2ljZUlPUHJvcGVydHlfQnlw YXNzVm9pY2VQcm9jZXNzaW5nLCBrQXVkaW9Vbml0U2NvcGVfR2xvYmFsLCBpbnB1dEJ1cywgJnBh cmFtLCBzaXplb2YocGFyYW0pKTsKICAgICAgICAgaWYgKGVycikgewotICAgICAgICAgICAgTE9H KE1lZGlhLCAiQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6c2V0dXBBdWRpb1VuaXQoJXApIHVuYWJs ZSB0byBzZXQgdnBpbyB1bml0IGVjaG8gY2FuY2VsbGF0aW9uLCBlcnJvciAlZCAoJS40cykiLCB0 aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOworICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJS T1IoTWVkaWEsICJDb3JlQXVkaW9DYXB0dXJlU291cmNlOjpzZXR1cEF1ZGlvVW5pdCglcCkgdW5h YmxlIHRvIHNldCB2cGlvIHVuaXQgZWNobyBjYW5jZWxsYXRpb24sIGVycm9yICVkICglLjRzKSIs IHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7CiAgICAgICAgICAgICByZXR1cm4gZXJyOwog ICAgICAgICB9CiAgICAgfQpAQCAtMjc4LDcgKzI3OCw3IEBAIE9TU3RhdHVzIENvcmVBdWRpb1No YXJlZFVuaXQ6OnNldHVwQXVkaW9Vbml0KCkKICAgICB1aW50MzJfdCBwYXJhbSA9IDE7CiAgICAg ZXJyID0gQXVkaW9Vbml0U2V0UHJvcGVydHkobV9pb1VuaXQsIGtBdWRpb091dHB1dFVuaXRQcm9w ZXJ0eV9FbmFibGVJTywga0F1ZGlvVW5pdFNjb3BlX0lucHV0LCBpbnB1dEJ1cywgJnBhcmFtLCBz aXplb2YocGFyYW0pKTsKICAgICBpZiAoZXJyKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIkNvcmVB dWRpb0NhcHR1cmVTb3VyY2U6OnNldHVwQXVkaW9Vbml0KCVwKSB1bmFibGUgdG8gZW5hYmxlIHZw aW8gdW5pdCBpbnB1dCwgZXJyb3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikm ZXJyKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEsICJDb3JlQXVkaW9DYXB0dXJl U291cmNlOjpzZXR1cEF1ZGlvVW5pdCglcCkgdW5hYmxlIHRvIGVuYWJsZSB2cGlvIHVuaXQgaW5w dXQsIGVycm9yICVkICglLjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7CiAgICAg ICAgIHJldHVybiBlcnI7CiAgICAgfQogI2Vsc2UKQEAgLTI5MCw3ICsyOTAsNyBAQCBPU1N0YXR1 cyBDb3JlQXVkaW9TaGFyZWRVbml0OjpzZXR1cEF1ZGlvVW5pdCgpCiAKICAgICBlcnIgPSBBdWRp b1VuaXRTZXRQcm9wZXJ0eShtX2lvVW5pdCwga0F1ZGlvT3V0cHV0VW5pdFByb3BlcnR5X0N1cnJl bnREZXZpY2UsIGtBdWRpb1VuaXRTY29wZV9HbG9iYWwsIGlucHV0QnVzLCAmbV9jYXB0dXJlRGV2 aWNlSUQsIHNpemVvZihtX2NhcHR1cmVEZXZpY2VJRCkpOwogICAgIGlmIChlcnIpIHsKLSAgICAg ICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6c2V0dXBBdWRpb1VuaXQoJXAp IHVuYWJsZSB0byBzZXQgdnBpbyB1bml0IGNhcHR1cmUgZGV2aWNlIElELCBlcnJvciAlZCAoJS40 cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOworICAgICAgICBSRUxFQVNFX0xPR19F UlJPUihNZWRpYSwgIkNvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnNldHVwQXVkaW9Vbml0KCVwKSB1 bmFibGUgdG8gc2V0IHZwaW8gdW5pdCBjYXB0dXJlIGRldmljZSBJRCwgZXJyb3IgJWQgKCUuNHMp IiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKICAgICAgICAgcmV0dXJuIGVycjsKICAg ICB9CiAjZW5kaWYKQEAgLTMwMyw3ICszMDMsNyBAQCBPU1N0YXR1cyBDb3JlQXVkaW9TaGFyZWRV bml0OjpzZXR1cEF1ZGlvVW5pdCgpCiAKICAgICBlcnIgPSBBdWRpb1VuaXRJbml0aWFsaXplKG1f aW9Vbml0KTsKICAgICBpZiAoZXJyKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb0Nh cHR1cmVTb3VyY2U6OnNldHVwQXVkaW9Vbml0KCVwKSBBdWRpb1VuaXRJbml0aWFsaXplKCkgZmFp bGVkLCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOworICAg ICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgIkNvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnNl dHVwQXVkaW9Vbml0KCVwKSBBdWRpb1VuaXRJbml0aWFsaXplKCkgZmFpbGVkLCBlcnJvciAlZCAo JS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOwogICAgICAgICByZXR1cm4gZXJy OwogICAgIH0KICAgICBtX2lvVW5pdEluaXRpYWxpemVkID0gdHJ1ZTsKQEAgLTMxNyw3ICszMTcs NyBAQCBPU1N0YXR1cyBDb3JlQXVkaW9TaGFyZWRVbml0Ojpjb25maWd1cmVNaWNyb3Bob25lUHJv YygpCiAgICAgQVVSZW5kZXJDYWxsYmFja1N0cnVjdCBjYWxsYmFjayA9IHsgbWljcm9waG9uZUNh bGxiYWNrLCB0aGlzIH07CiAgICAgYXV0byBlcnIgPSBBdWRpb1VuaXRTZXRQcm9wZXJ0eShtX2lv VW5pdCwga0F1ZGlvT3V0cHV0VW5pdFByb3BlcnR5X1NldElucHV0Q2FsbGJhY2ssIGtBdWRpb1Vu aXRTY29wZV9HbG9iYWwsIGlucHV0QnVzLCAmY2FsbGJhY2ssIHNpemVvZihjYWxsYmFjaykpOwog ICAgIGlmIChlcnIpIHsKLSAgICAgICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6 Y29uZmlndXJlTWljcm9waG9uZVByb2MoJXApIHVuYWJsZSB0byBzZXQgdnBpbyB1bml0IG1pYyBw cm9jLCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOworICAg ICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OmNvbmZp Z3VyZU1pY3JvcGhvbmVQcm9jKCVwKSB1bmFibGUgdG8gc2V0IHZwaW8gdW5pdCBtaWMgcHJvYywg ZXJyb3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKICAgICAgICAg cmV0dXJuIGVycjsKICAgICB9CiAKQEAgLTMyNiwxNCArMzI2LDE0IEBAIE9TU3RhdHVzIENvcmVB dWRpb1NoYXJlZFVuaXQ6OmNvbmZpZ3VyZU1pY3JvcGhvbmVQcm9jKCkKICAgICBVSW50MzIgc2l6 ZSA9IHNpemVvZihtaWNyb3Bob25lUHJvY0Zvcm1hdCk7CiAgICAgZXJyID0gQXVkaW9Vbml0R2V0 UHJvcGVydHkobV9pb1VuaXQsIGtBdWRpb1VuaXRQcm9wZXJ0eV9TdHJlYW1Gb3JtYXQsIGtBdWRp b1VuaXRTY29wZV9PdXRwdXQsIGlucHV0QnVzLCAmbWljcm9waG9uZVByb2NGb3JtYXQsICZzaXpl KTsKICAgICBpZiAoZXJyKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVu aXQ6OmNvbmZpZ3VyZU1pY3JvcGhvbmVQcm9jKCVwKSB1bmFibGUgdG8gZ2V0IG91dHB1dCBzdHJl YW0gZm9ybWF0LCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIp OworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6 OmNvbmZpZ3VyZU1pY3JvcGhvbmVQcm9jKCVwKSB1bmFibGUgdG8gZ2V0IG91dHB1dCBzdHJlYW0g Zm9ybWF0LCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOwog ICAgICAgICByZXR1cm4gZXJyOwogICAgIH0KIAogICAgIG1pY3JvcGhvbmVQcm9jRm9ybWF0Lm1T YW1wbGVSYXRlID0gbV9zYW1wbGVSYXRlOwogICAgIGVyciA9IEF1ZGlvVW5pdFNldFByb3BlcnR5 KG1faW9Vbml0LCBrQXVkaW9Vbml0UHJvcGVydHlfU3RyZWFtRm9ybWF0LCBrQXVkaW9Vbml0U2Nv cGVfT3V0cHV0LCBpbnB1dEJ1cywgJm1pY3JvcGhvbmVQcm9jRm9ybWF0LCBzaXplKTsKICAgICBp ZiAoZXJyKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OmNvbmZp Z3VyZU1pY3JvcGhvbmVQcm9jKCVwKSB1bmFibGUgdG8gc2V0IG91dHB1dCBzdHJlYW0gZm9ybWF0 LCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOworICAgICAg ICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OmNvbmZpZ3Vy ZU1pY3JvcGhvbmVQcm9jKCVwKSB1bmFibGUgdG8gc2V0IG91dHB1dCBzdHJlYW0gZm9ybWF0LCBl cnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOwogICAgICAgICBy ZXR1cm4gZXJyOwogICAgIH0KIApAQCAtMzQ4LDcgKzM0OCw3IEBAIE9TU3RhdHVzIENvcmVBdWRp b1NoYXJlZFVuaXQ6OmNvbmZpZ3VyZVNwZWFrZXJQcm9jKCkKICAgICBBVVJlbmRlckNhbGxiYWNr U3RydWN0IGNhbGxiYWNrID0geyBzcGVha2VyQ2FsbGJhY2ssIHRoaXMgfTsKICAgICBhdXRvIGVy ciA9IEF1ZGlvVW5pdFNldFByb3BlcnR5KG1faW9Vbml0LCBrQXVkaW9Vbml0UHJvcGVydHlfU2V0 UmVuZGVyQ2FsbGJhY2ssIGtBdWRpb1VuaXRTY29wZV9JbnB1dCwgb3V0cHV0QnVzLCAmY2FsbGJh Y2ssIHNpemVvZihjYWxsYmFjaykpOwogICAgIGlmIChlcnIpIHsKLSAgICAgICAgTE9HKE1lZGlh LCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6Y29uZmlndXJlU3BlYWtlclByb2MoJXApIHVuYWJsZSB0 byBzZXQgdnBpbyB1bml0IHNwZWFrZXIgcHJvYywgZXJyb3IgJWQgKCUuNHMpIiwgdGhpcywgKGlu dCllcnIsIChjaGFyKikmZXJyKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEsICJD b3JlQXVkaW9TaGFyZWRVbml0Ojpjb25maWd1cmVTcGVha2VyUHJvYyglcCkgdW5hYmxlIHRvIHNl dCB2cGlvIHVuaXQgc3BlYWtlciBwcm9jLCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVy ciwgKGNoYXIqKSZlcnIpOwogICAgICAgICByZXR1cm4gZXJyOwogICAgIH0KIApAQCAtMzU3LDE0 ICszNTcsMTQgQEAgT1NTdGF0dXMgQ29yZUF1ZGlvU2hhcmVkVW5pdDo6Y29uZmlndXJlU3BlYWtl clByb2MoKQogICAgIFVJbnQzMiBzaXplID0gc2l6ZW9mKHNwZWFrZXJQcm9jRm9ybWF0KTsKICAg ICBlcnIgPSBBdWRpb1VuaXRHZXRQcm9wZXJ0eShtX2lvVW5pdCwga0F1ZGlvVW5pdFByb3BlcnR5 X1N0cmVhbUZvcm1hdCwga0F1ZGlvVW5pdFNjb3BlX0lucHV0LCBvdXRwdXRCdXMsICZzcGVha2Vy UHJvY0Zvcm1hdCwgJnNpemUpOwogICAgIGlmIChlcnIpIHsKLSAgICAgICAgTE9HKE1lZGlhLCAi Q29yZUF1ZGlvU2hhcmVkVW5pdDo6Y29uZmlndXJlU3BlYWtlclByb2MoJXApIHVuYWJsZSB0byBn ZXQgaW5wdXQgc3RyZWFtIGZvcm1hdCwgZXJyb3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIs IChjaGFyKikmZXJyKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEsICJDb3JlQXVk aW9TaGFyZWRVbml0Ojpjb25maWd1cmVTcGVha2VyUHJvYyglcCkgdW5hYmxlIHRvIGdldCBpbnB1 dCBzdHJlYW0gZm9ybWF0LCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIq KSZlcnIpOwogICAgICAgICByZXR1cm4gZXJyOwogICAgIH0KIAogICAgIHNwZWFrZXJQcm9jRm9y bWF0Lm1TYW1wbGVSYXRlID0gbV9zYW1wbGVSYXRlOwogICAgIGVyciA9IEF1ZGlvVW5pdFNldFBy b3BlcnR5KG1faW9Vbml0LCBrQXVkaW9Vbml0UHJvcGVydHlfU3RyZWFtRm9ybWF0LCBrQXVkaW9V bml0U2NvcGVfSW5wdXQsIG91dHB1dEJ1cywgJnNwZWFrZXJQcm9jRm9ybWF0LCBzaXplKTsKICAg ICBpZiAoZXJyKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OmNv bmZpZ3VyZVNwZWFrZXJQcm9jKCVwKSB1bmFibGUgdG8gZ2V0IGlucHV0IHN0cmVhbSBmb3JtYXQs IGVycm9yICVkICglLjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7CisgICAgICAg IFJFTEVBU0VfTE9HX0VSUk9SKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6Y29uZmlndXJl U3BlYWtlclByb2MoJXApIHVuYWJsZSB0byBnZXQgaW5wdXQgc3RyZWFtIGZvcm1hdCwgZXJyb3Ig JWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKICAgICAgICAgcmV0dXJu IGVycjsKICAgICB9CiAKQEAgLTM3OCw3ICszNzgsNyBAQCBPU1N0YXR1cyBDb3JlQXVkaW9TaGFy ZWRVbml0Ojpjb25maWd1cmVTcGVha2VyUHJvYygpCiB2b2lkIENvcmVBdWRpb1NoYXJlZFVuaXQ6 OmNoZWNrVGltZXN0YW1wcyhjb25zdCBBdWRpb1RpbWVTdGFtcCYgdGltZVN0YW1wLCB1aW50NjRf dCBzYW1wbGVUaW1lLCBkb3VibGUgaG9zdFRpbWUpCiB7CiAgICAgaWYgKCF0aW1lU3RhbXAubVNh bXBsZVRpbWUgfHwgc2FtcGxlVGltZSA9PSBtX2xhdGVzdE1pY1RpbWVTdGFtcCB8fCAhaG9zdFRp bWUpCi0gICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OmNoZWNrVGltZXN0 YW1wczogdW51c3VhbCB0aW1lc3RhbXBzLCBzYW1wbGUgdGltZSA9ICVsbGQsIHByZXZpb3VzIHNh bXBsZSB0aW1lID0gJWxsZCwgaG9zdFRpbWUgJWYiLCBzYW1wbGVUaW1lLCBtX2xhdGVzdE1pY1Rp bWVTdGFtcCwgaG9zdFRpbWUpOworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgIkNv cmVBdWRpb1NoYXJlZFVuaXQ6OmNoZWNrVGltZXN0YW1wczogdW51c3VhbCB0aW1lc3RhbXBzLCBz YW1wbGUgdGltZSA9ICVsbGQsIHByZXZpb3VzIHNhbXBsZSB0aW1lID0gJWxsZCwgaG9zdFRpbWUg JWYiLCBzYW1wbGVUaW1lLCBtX2xhdGVzdE1pY1RpbWVTdGFtcCwgaG9zdFRpbWUpOwogfQogI2Vu ZGlmCiAKQEAgLTM5MCw3ICszOTAsNyBAQCBPU1N0YXR1cyBDb3JlQXVkaW9TaGFyZWRVbml0Ojpw cm92aWRlU3BlYWtlckRhdGEoQXVkaW9Vbml0UmVuZGVyQWN0aW9uRmxhZ3MmIC8qaQogI2VuZGlm CiAKICAgICBpZiAobV9zcGVha2VyU2FtcGxlQnVmZmVyLT5zYW1wbGVDYXBhY2l0eSgpIDwgaW5O dW1iZXJGcmFtZXMpIHsKLSAgICAgICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6 cHJvdmlkZVNwZWFrZXJEYXRhOiBzcGVha2VyIHNhbXBsZSBidWZmZXIgc2l6ZSAoJWQpIHRvbyBz bWFsbCBmb3IgYW1vdW50IG9mIHNhbXBsZSBkYXRhIHJlcXVlc3RlZCAoJWQpISIsIG1fc3BlYWtl clNhbXBsZUJ1ZmZlci0+c2FtcGxlQ2FwYWNpdHkoKSwgKGludClpbk51bWJlckZyYW1lcyk7Cisg ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6cHJv dmlkZVNwZWFrZXJEYXRhOiBzcGVha2VyIHNhbXBsZSBidWZmZXIgc2l6ZSAoJWQpIHRvbyBzbWFs bCBmb3IgYW1vdW50IG9mIHNhbXBsZSBkYXRhIHJlcXVlc3RlZCAoJWQpISIsIG1fc3BlYWtlclNh bXBsZUJ1ZmZlci0+c2FtcGxlQ2FwYWNpdHkoKSwgKGludClpbk51bWJlckZyYW1lcyk7CiAgICAg ICAgIHJldHVybiBrQXVkaW9fUGFyYW1FcnJvcjsKICAgICB9CiAKQEAgLTQ1Myw3ICs0NTMsNyBA QCBPU1N0YXR1cyBDb3JlQXVkaW9TaGFyZWRVbml0Ojpwcm9jZXNzTWljcm9waG9uZVNhbXBsZXMo QXVkaW9Vbml0UmVuZGVyQWN0aW9uRmxhZwogICAgIEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyTGlz dCA9IG1fbWljcm9waG9uZVNhbXBsZUJ1ZmZlci0+YnVmZmVyTGlzdCgpOwogICAgIGF1dG8gZXJy ID0gQXVkaW9Vbml0UmVuZGVyKG1faW9Vbml0LCAmaW9BY3Rpb25GbGFncywgJnRpbWVTdGFtcCwg aW5CdXNOdW1iZXIsIGluTnVtYmVyRnJhbWVzLCAmYnVmZmVyTGlzdCk7CiAgICAgaWYgKGVycikg ewotICAgICAgICBMT0coTWVkaWEsICJDb3JlQXVkaW9TaGFyZWRVbml0Ojpwcm9jZXNzTWljcm9w aG9uZVNhbXBsZXMoJXApIEF1ZGlvVW5pdFJlbmRlciBmYWlsZWQgd2l0aCBlcnJvciAlZCAoJS40 cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOworICAgICAgICBSRUxFQVNFX0xPR19F UlJPUihNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OnByb2Nlc3NNaWNyb3Bob25lU2FtcGxl cyglcCkgQXVkaW9Vbml0UmVuZGVyIGZhaWxlZCB3aXRoIGVycm9yICVkICglLjRzKSIsIHRoaXMs IChpbnQpZXJyLCAoY2hhciopJmVycik7CiAgICAgICAgIHJldHVybiBlcnI7CiAgICAgfQogCkBA IC00ODksNyArNDg5LDcgQEAgdm9pZCBDb3JlQXVkaW9TaGFyZWRVbml0OjpjbGVhbnVwQXVkaW9V bml0KCkKICAgICAgICAgQVNTRVJUKG1faW9Vbml0KTsKICAgICAgICAgYXV0byBlcnIgPSBBdWRp b1VuaXRVbmluaXRpYWxpemUobV9pb1VuaXQpOwogICAgICAgICBpZiAoZXJyKQotICAgICAgICAg ICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6Y2xlYW51cEF1ZGlvVW5pdCglcCkg QXVkaW9Vbml0VW5pbml0aWFsaXplIGZhaWxlZCB3aXRoIGVycm9yICVkICglLjRzKSIsIHRoaXMs IChpbnQpZXJyLCAoY2hhciopJmVycik7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihN ZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OmNsZWFudXBBdWRpb1VuaXQoJXApIEF1ZGlvVW5p dFVuaW5pdGlhbGl6ZSBmYWlsZWQgd2l0aCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVy ciwgKGNoYXIqKSZlcnIpOwogICAgICAgICBtX2lvVW5pdEluaXRpYWxpemVkID0gZmFsc2U7CiAg ICAgfQogCkBAIC01MTQsNyArNTE0LDcgQEAgT1NTdGF0dXMgQ29yZUF1ZGlvU2hhcmVkVW5pdDo6 cmVjb25maWd1cmVBdWRpb1VuaXQoKQogICAgIGlmIChtX2lvVW5pdFN0YXJ0ZWQpIHsKICAgICAg ICAgZXJyID0gQXVkaW9PdXRwdXRVbml0U3RvcChtX2lvVW5pdCk7CiAgICAgICAgIGlmIChlcnIp IHsKLSAgICAgICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OnJlY29uZmln dXJlQXVkaW9Vbml0KCVwKSBBdWRpb091dHB1dFVuaXRTdG9wIGZhaWxlZCB3aXRoIGVycm9yICVk ICglLjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7CisgICAgICAgICAgICBSRUxF QVNFX0xPR19FUlJPUihNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OnJlY29uZmlndXJlQXVk aW9Vbml0KCVwKSBBdWRpb091dHB1dFVuaXRTdG9wIGZhaWxlZCB3aXRoIGVycm9yICVkICglLjRz KSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7CiAgICAgICAgICAgICByZXR1cm4gZXJy OwogICAgICAgICB9CiAgICAgfQpAQCAtNTI3LDcgKzUyNyw3IEBAIE9TU3RhdHVzIENvcmVBdWRp b1NoYXJlZFVuaXQ6OnJlY29uZmlndXJlQXVkaW9Vbml0KCkKICAgICBpZiAobV9pb1VuaXRTdGFy dGVkKSB7CiAgICAgICAgIGVyciA9IEF1ZGlvT3V0cHV0VW5pdFN0YXJ0KG1faW9Vbml0KTsKICAg ICAgICAgaWYgKGVycikgewotICAgICAgICAgICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVk VW5pdDo6cmVjb25maWd1cmVBdWRpb1VuaXQoJXApIEF1ZGlvT3V0cHV0VW5pdFN0YXJ0IGZhaWxl ZCB3aXRoIGVycm9yICVkICglLjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7Cisg ICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6 OnJlY29uZmlndXJlQXVkaW9Vbml0KCVwKSBBdWRpb091dHB1dFVuaXRTdGFydCBmYWlsZWQgd2l0 aCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwgKGNoYXIqKSZlcnIpOwogICAgICAg ICAgICAgcmV0dXJuIGVycjsKICAgICAgICAgfQogICAgIH0KQEAgLTU4Nyw3ICs1ODcsNyBAQCB2 b2lkIENvcmVBdWRpb1NoYXJlZFVuaXQ6OnN0YXJ0SW50ZXJuYWwoKQogCiAgICAgZXJyID0gQXVk aW9PdXRwdXRVbml0U3RhcnQobV9pb1VuaXQpOwogICAgIGlmIChlcnIpIHsKLSAgICAgICAgTE9H KE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6c3RhcnQoJXApIEF1ZGlvT3V0cHV0VW5pdFN0 YXJ0IGZhaWxlZCB3aXRoIGVycm9yICVkICglLjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciop JmVycik7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVk VW5pdDo6c3RhcnQoJXApIEF1ZGlvT3V0cHV0VW5pdFN0YXJ0IGZhaWxlZCB3aXRoIGVycm9yICVk ICglLjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKQEAgLTYwOCw3ICs2MDgsNyBAQCB2b2lkIENvcmVBdWRpb1NoYXJlZFVuaXQ6OnZl cmlmeUlzQ2FwdHVyaW5nKCkKICAgICB9CiAKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAg ICBSRUxFQVNFX0xPRyhNZWRpYSwgIkNvcmVBdWRpb1NoYXJlZFVuaXQ6OnZlcmlmeUlzQ2FwdHVy aW5nIC0gY2FwdHVyZSBmYWlsZWRcbiIpOworICAgIFJFTEVBU0VfTE9HX0VSUk9SKE1lZGlhLCAi Q29yZUF1ZGlvU2hhcmVkVW5pdDo6dmVyaWZ5SXNDYXB0dXJpbmcgLSBjYXB0dXJlIGZhaWxlZFxu Iik7CiAjZW5kaWYKICAgICBmb3IgKENvcmVBdWRpb0NhcHR1cmVTb3VyY2UmIGNsaWVudCA6IG1f Y2xpZW50cykKICAgICAgICAgY2xpZW50LmNhcHR1cmVGYWlsZWQoKTsKQEAgLTY0OSw3ICs2NDks NyBAQCB2b2lkIENvcmVBdWRpb1NoYXJlZFVuaXQ6OnN0b3BJbnRlcm5hbCgpCiAKICAgICBhdXRv IGVyciA9IEF1ZGlvT3V0cHV0VW5pdFN0b3AobV9pb1VuaXQpOwogICAgIGlmIChlcnIpIHsKLSAg ICAgICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvU2hhcmVkVW5pdDo6c3RvcCglcCkgQXVkaW9PdXRw dXRVbml0U3RvcCBmYWlsZWQgd2l0aCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwg KGNoYXIqKSZlcnIpOworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgIkNvcmVBdWRp b1NoYXJlZFVuaXQ6OnN0b3AoJXApIEF1ZGlvT3V0cHV0VW5pdFN0b3AgZmFpbGVkIHdpdGggZXJy b3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIApAQCAtNjYzLDcgKzY2Myw3IEBAIE9TU3RhdHVzIENvcmVBdWRpb1NoYXJl ZFVuaXQ6OmRlZmF1bHRJbnB1dERldmljZSh1aW50MzJfdCogZGV2aWNlSUQpCiAgICAgVUludDMy IHByb3BlcnR5U2l6ZSA9IHNpemVvZigqZGV2aWNlSUQpOwogICAgIGF1dG8gZXJyID0gQXVkaW9V bml0R2V0UHJvcGVydHkobV9pb1VuaXQsIGtBdWRpb091dHB1dFVuaXRQcm9wZXJ0eV9DdXJyZW50 RGV2aWNlLCBrQXVkaW9Vbml0U2NvcGVfR2xvYmFsLCBpbnB1dEJ1cywgZGV2aWNlSUQsICZwcm9w ZXJ0eVNpemUpOwogICAgIGlmIChlcnIpCi0gICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb1No YXJlZFVuaXQ6OmRlZmF1bHRJbnB1dERldmljZSglcCkgdW5hYmxlIHRvIGdldCBkZWZhdWx0IGlu cHV0IGRldmljZSBJRCwgZXJyb3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikm ZXJyKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEsICJDb3JlQXVkaW9TaGFyZWRV bml0OjpkZWZhdWx0SW5wdXREZXZpY2UoJXApIHVuYWJsZSB0byBnZXQgZGVmYXVsdCBpbnB1dCBk ZXZpY2UgSUQsIGVycm9yICVkICglLjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7 CiAKICAgICByZXR1cm4gZXJyOwogfQo=