200448 2019-08-05 14:57:49 -0700 Make Logger::log thread safe so that it can be used from background threads 2019-08-05 20:45:48 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf cdumez commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1558571 0 youennf 2019-08-05 14:57:49 -0700 Make Logger::log thread safe so that it can be used from background threads 1558573 1 375563 youennf 2019-08-05 15:03:28 -0700 Created attachment 375563 Patch 1558578 2 375568 youennf 2019-08-05 15:21:17 -0700 Created attachment 375568 Patch 1558592 3 webkit-bug-importer 2019-08-05 15:45:58 -0700 <rdar://problem/53962288> 1558664 4 375568 eric.carlson 2019-08-05 18:03:38 -0700 Comment on attachment 375568 Patch Thanks Youenn! 1558701 5 375568 commit-queue 2019-08-05 20:45:46 -0700 Comment on attachment 375568 Patch Clearing flags on attachment: 375568 Committed r248288: <https://trac.webkit.org/changeset/248288> 1558702 6 commit-queue 2019-08-05 20:45:48 -0700 All reviewed patches have been landed. Closing bug. 375563 2019-08-05 15:03:28 -0700 2019-08-05 15:21:16 -0700 Patch bug-200448-20190805150328.patch text/plain 8583 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGM3ODYwNTg0OTcyNTE5NTJhZjY5ZDZi MWU3OTg4NzZhNGEzNTVjNTYuLmVmMzU3MWJjNjNmOWVjYjk2MzU3MjM2MWZhYTI0OWE1YzM1NTcy OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDgtMDUgIFlvdWVubiBGYWJsZXQgIDx5b3Vl bm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgTG9nZ2VyOjpsb2cgdGhyZWFkIHNhZmUgc28g dGhhdCBpdCBjYW4gYmUgdXNlZCBmcm9tIGJhY2tncm91bmQgdGhyZWFkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNDQ4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbG9jayB0byBlbnN1cmUg Y2FsbGluZyBsb2cgaXMgdGhyZWFkLXNhZmUuCisKKyAgICAgICAgKiB3dGYvTG9nZ2VyLmg6Cisg ICAgICAgIChXVEY6OkxvZ2dlcjo6YWRkT2JzZXJ2ZXIpOgorICAgICAgICAoV1RGOjpMb2dnZXI6 OnJlbW92ZU9ic2VydmVyKToKKyAgICAgICAgKFdURjo6TG9nZ2VyOjpsb2cpOgorICAgICAgICAo V1RGOjpMb2dnZXI6Om9ic2VydmVyTG9jayk6CisKIDIwMTktMDctMzEgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0 ZXJzV2l0aExhbmd1YWdlQW5kT3B0aW9uIGlmIGF2YWlsYWJsZSBpbnN0ZWFkIG9mIENURm9udENy ZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NTVjYTVmNWI4ODRj NWQ5OTY4M2UyMjU3ZmZlNDUyNDYzYTk0NDQwLi5kZDRlNzZhMGVkYjk2ZjQ0MmY4N2RiZjUwZjBm YWRjZGE4NWUyZDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDgtMDUgIFlv dWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgTG9nZ2VyOjps b2cgdGhyZWFkIHNhZmUgc28gdGhhdCBpdCBjYW4gYmUgdXNlZCBmcm9tIGJhY2tncm91bmQgdGhy ZWFkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAw NDQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8g Y2hhbmdlIG9mIGJlaGF2aW9yLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNyb3NzVGhyZWFkQ29weSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dDo6ZGlkTG9nTWVzc2FnZSk6CisgICAgICAgIE1ha2Ugc3VyZSB0byBob3AgdG8gdGhlIG1haW4g dGhyZWFkIGlmIG5lZWRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVh bHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVh bHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2E6Ok9uRGF0YSk6CisgICAgICAgIFJlbW92ZSBo b3BwaW5nIHRvIHRoZSBtYWluIHRocmVhZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVh bS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW06CisgICAgICAgIChXZWJD b3JlOjpSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYTo6T25GcmFtZSk6CisgICAgICAg IFJlbW92ZSBob3BwaW5nIHRvIHRoZSBtYWluIHRocmVhZC4KKwogMjAxOS0wOC0wMSAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gRGlyZWN0bHkgdXNl IFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXIgdG8gY29tcHV0ZSB0aGUgbWVkaWEgY2FwdHVyZSAg c3RhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xvZ2dlci5oIGIvU291cmNlL1dURi93 dGYvTG9nZ2VyLmgKaW5kZXggMDM2OGFiMDFjMDZlNTdhMTNkMjE1ZTcxNmUyZjVmNTU1MzdhNjc2 My4uYjgxYjBmOThjZjdkMmIwYjM1YmJkNjkxYzljYjgyZGE4ZDViYWM0ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvTG9nZ2VyLmgKKysrIGIvU291cmNlL1dURi93dGYvTG9nZ2VyLmgKQEAg LTI1LDYgKzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlIDx3dGYvTG9jay5oPgog I2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KIAogbmFtZXNwYWNlIFdURiB7CkBA IC0xMTIsNiArMTEzLDcgQEAgcHVibGljOgogICAgIGNsYXNzIE9ic2VydmVyIHsKICAgICBwdWJs aWM6CiAgICAgICAgIHZpcnR1YWwgfk9ic2VydmVyKCkgPSBkZWZhdWx0OworICAgICAgICAvLyBD YW4gYmUgY2FsbGVkIG9uIGFueSB0aHJlYWQuCiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRMb2dN ZXNzYWdlKGNvbnN0IFdURkxvZ0NoYW5uZWwmLCBXVEZMb2dMZXZlbCwgVmVjdG9yPEpTT05Mb2dW YWx1ZT4mJikgPSAwOwogICAgIH07CiAKQEAgLTIxNiwxMCArMjE4LDEyIEBAIHB1YmxpYzoKIAog ICAgIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRPYnNlcnZlcihPYnNlcnZlciYgb2JzZXJ2ZXIpCiAg ICAgeworICAgICAgICBhdXRvIGxvY2sgPSBob2xkTG9jayhvYnNlcnZlckxvY2soKSk7CiAgICAg ICAgIG9ic2VydmVycygpLmFwcGVuZChvYnNlcnZlcik7CiAgICAgfQogICAgIHN0YXRpYyBpbmxp bmUgdm9pZCByZW1vdmVPYnNlcnZlcihPYnNlcnZlciYgb2JzZXJ2ZXIpCiAgICAgeworICAgICAg ICBhdXRvIGxvY2sgPSBob2xkTG9jayhvYnNlcnZlckxvY2soKSk7CiAgICAgICAgIG9ic2VydmVy cygpLnJlbW92ZUZpcnN0TWF0Y2hpbmcoWyZvYnNlcnZlcl0oYXV0byBhbk9ic2VydmVyKSB7CiAg ICAgICAgICAgICByZXR1cm4gJmFuT2JzZXJ2ZXIuZ2V0KCkgPT0gJm9ic2VydmVyOwogICAgICAg ICB9KTsKQEAgLTI0Nyw2ICsyNTEsMTAgQEAgcHJpdmF0ZToKICAgICAgICAgaWYgKGNoYW5uZWwu c3RhdGUgPT0gV1RGTG9nQ2hhbm5lbFN0YXRlOjpPZmYgfHwgbGV2ZWwgPiBjaGFubmVsLmxldmVs KQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIGF1dG8gbG9jayA9IHRyeUhvbGRMb2Nr KG9ic2VydmVyTG9jaygpKTsKKyAgICAgICAgaWYgKCFsb2NrKQorICAgICAgICAgICAgcmV0dXJu OworCiAgICAgICAgIGZvciAoT2JzZXJ2ZXImIG9ic2VydmVyIDogb2JzZXJ2ZXJzKCkpCiAgICAg ICAgICAgICBvYnNlcnZlci5kaWRMb2dNZXNzYWdlKGNoYW5uZWwsIGxldmVsLCB7IENvbnNvbGVM b2dWYWx1ZTxBcmd1bWVudD46OnRvVmFsdWUoYXJndW1lbnRzKS4uLiB9KTsKICAgICB9CkBAIC0y NTcsNiArMjY1LDEzIEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiBvYnNlcnZlcnM7CiAgICAg fQogCisgICAgc3RhdGljIExvY2smIG9ic2VydmVyTG9jaygpCisgICAgeworICAgICAgICBzdGF0 aWMgTmV2ZXJEZXN0cm95ZWQ8TG9jaz4gb2JzZXJ2ZXJMb2NrOworICAgICAgICByZXR1cm4gb2Jz ZXJ2ZXJMb2NrOworICAgIH0KKworCiAgICAgYm9vbCBtX2VuYWJsZWQgeyB0cnVlIH07CiAgICAg Y29uc3Qgdm9pZCogbV9vd25lcjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAyZmQ1 MTZhMzEwMzdiYjE3OTczZWQ5ZGE5MTUyOGUxN2NkMjY1MWFhLi5kMTNlZTUyNmUxYzVlYjU0ZGMz ZjA0YzYxOGE4NmUwODgzZmM1Mzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTgwMjAs OCArODAyMCwyMiBAQCBzdGF0aWMgTWVzc2FnZUxldmVsIG1lc3NhZ2VMZXZlbEZyb21XVEZMb2dM ZXZlbChXVEZMb2dMZXZlbCBsZXZlbCkKICAgICByZXR1cm4gTWVzc2FnZUxldmVsOjpMb2c7CiB9 CiAKK3N0YXRpYyBpbmxpbmUgVmVjdG9yPEpTT05Mb2dWYWx1ZT4gY3Jvc3NUaHJlYWRDb3B5KFZl Y3RvcjxKU09OTG9nVmFsdWU+JiYgc291cmNlKQoreworICAgIGF1dG8gdmFsdWVzID0gV1RGTW92 ZShzb3VyY2UpOworICAgIGZvciAoYXV0byYgdmFsdWUgOiB2YWx1ZXMpCisgICAgICAgIHZhbHVl LnZhbHVlID0gY3Jvc3NUaHJlYWRDb3B5KFdURk1vdmUodmFsdWUudmFsdWUpKTsKKyAgICByZXR1 cm4gdmFsdWVzOworfQorCiB2b2lkIERvY3VtZW50OjpkaWRMb2dNZXNzYWdlKGNvbnN0IFdURkxv Z0NoYW5uZWwmIGNoYW5uZWwsIFdURkxvZ0xldmVsIGxldmVsLCBWZWN0b3I8SlNPTkxvZ1ZhbHVl PiYmIGxvZ01lc3NhZ2VzKQogeworICAgIGlmICghaXNNYWluVGhyZWFkKCkpIHsKKyAgICAgICAg cG9zdFRhc2soW3RoaXMsIGNoYW5uZWwsIGxldmVsLCBsb2dNZXNzYWdlcyA9IGNyb3NzVGhyZWFk Q29weShXVEZNb3ZlKGxvZ01lc3NhZ2VzKSldKGF1dG8mKSBtdXRhYmxlIHsKKyAgICAgICAgICAg IGRpZExvZ01lc3NhZ2UoY2hhbm5lbCwgbGV2ZWwsIFdURk1vdmUobG9nTWVzc2FnZXMpKTsKKyAg ICAgICAgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgaWYgKCFwYWdlKCkpCiAgICAg ICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29hLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3Vy Y2VDb2NvYS5jcHAKaW5kZXggMmRmOWM0ODJjMjJmZGE3ZGIxZTBlNGEzOTUxN2E4MzliZmRmZjQ1 Yi4uOGYxMmMxZDMzNTI4MjFjN2Q0NzMyZDA2MmFmNjI1ODFmNDVhYzYyNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdB dWRpb1NvdXJjZUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2EuY3BwCkBAIC04NywxMSAr ODcsNyBAQCB2b2lkIFJlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29hOjpPbkRhdGEoY29u c3Qgdm9pZCogYXVkaW9EYXRhLCBpbnQgYml0c1BlcgogICAgICAgICBtZW1jcHkoYXVkaW9CdWZm ZXJMaXN0LmJ1ZmZlcigwKS0+bURhdGEsIGF1ZGlvRGF0YSwgYXVkaW9CdWZmZXJMaXN0LmJ1ZmZl cigwKS0+bURhdGFCeXRlU2l6ZSk7CiAKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBp ZiAoISgrK21fY2h1bmtzUmVjZWl2ZWQgJSAyMDApKSB7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJl YWQoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0gewotICAgICAgICAgICAg QUxXQVlTX0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUiwgImNodW5rICIsIG1fY2h1 bmtzUmVjZWl2ZWQpOwotICAgICAgICB9KTsKLSAgICB9CisgICAgQUxXQVlTX0xPR19JRihsb2dn ZXJQdHIoKSAmJiAhKCsrbV9jaHVua3NSZWNlaXZlZCAlIDIwMCksIExPR0lERU5USUZJRVIsICJj aHVuayAiLCBtX2NodW5rc1JlY2VpdmVkKTsKICNlbmRpZgogCiAgICAgYXVkaW9TYW1wbGVzQXZh aWxhYmxlKG1lZGlhVGltZSwgYXVkaW9CdWZmZXJMaXN0LCBDQUF1ZGlvU3RyZWFtRGVzY3JpcHRp b24obmV3RGVzY3JpcHRpb24pLCBudW1iZXJPZkZyYW1lcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291 cmNlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVh bHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW0KaW5kZXggMTdlYmQ2NmQ4ZWI1NTA3Mjg4 ZWEwZDVhYzc5Nzc2YmUyZTFmYzJlNS4uZjVlNzgxZGExOGY2YzFjZmRjM2E3YWZlMzFjN2NhODU0 MDBlY2NiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v bWFjL1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VD b2NvYS5tbQpAQCAtMTU4LDE4ICsxNTgsMTIgQEAgdm9pZCBSZWFsdGltZUluY29taW5nVmlkZW9T b3VyY2VDb2NvYTo6T25GcmFtZShjb25zdCB3ZWJydGM6OlZpZGVvRnJhbWUmIGZyYW1lKQogICAg ICAgICByZXR1cm47CiAKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBpZiAoISgrK21f bnVtYmVyT2ZGcmFtZXMgJSA2MCkpIHsKLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBudW1iZXJPZkZyYW1lcyA9IG1fbnVtYmVy T2ZGcmFtZXNdIHsKLSAgICAgICAgICAgIEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lE RU5USUZJRVIsICJmcmFtZSAiLCBudW1iZXJPZkZyYW1lcyk7Ci0gICAgICAgIH0pOwotICAgIH0K KyAgICBBTFdBWVNfTE9HX0lGKGxvZ2dlclB0cigpICYmICEoKyttX251bWJlck9mRnJhbWVzICUg NjApLCBMT0dJREVOVElGSUVSLCAiZnJhbWUgIiwgbnVtYmVyT2ZGcmFtZXMpOwogI2VuZGlmCiAK ICAgICBhdXRvIHBpeGVsQnVmZmVyID0gcGl4ZWxCdWZmZXJGcm9tVmlkZW9GcmFtZShmcmFtZSk7 CiAgICAgaWYgKCFwaXhlbEJ1ZmZlcikgewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlz LCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKLSAgICAgICAgICAgIEVSUk9SX0xP R19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUiwgIkZhaWxlZCB0byBnZXQgYSBwaXhlbCBi dWZmZXIgZnJvbSBhIGZyYW1lIik7Ci0gICAgICAgIH0pOworICAgICAgICBFUlJPUl9MT0dfSUYo bG9nZ2VyUHRyKCksIExPR0lERU5USUZJRVIsICJGYWlsZWQgdG8gZ2V0IGEgcGl4ZWwgYnVmZmVy IGZyb20gYSBmcmFtZSIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xODMsOSArMTc3 LDcgQEAgdm9pZCBSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYTo6T25GcmFtZShjb25z dCB3ZWJydGM6OlZpZGVvRnJhbWUmIGZyYW1lKQogICAgIENNVmlkZW9Gb3JtYXREZXNjcmlwdGlv blJlZiBmb3JtYXREZXNjcmlwdGlvbjsKICAgICBPU1N0YXR1cyBvc3RhdHVzID0gQ01WaWRlb0Zv cm1hdERlc2NyaXB0aW9uQ3JlYXRlRm9ySW1hZ2VCdWZmZXIoa0NGQWxsb2NhdG9yRGVmYXVsdCwg KENWSW1hZ2VCdWZmZXJSZWYpcGl4ZWxCdWZmZXIsICZmb3JtYXREZXNjcmlwdGlvbik7CiAgICAg aWYgKG9zdGF0dXMgIT0gbm9FcnIpIHsKLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBvc3RhdHVzXSB7Ci0gICAgICAgICAgICBF UlJPUl9MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lERU5USUZJRVIsICJGYWlsZWQgdG8gaW5pdGlh bGl6ZSBDTVZpZGVvRm9ybWF0RGVzY3JpcHRpb24gd2l0aCBlcnJvciAiLCBzdGF0aWNfY2FzdDxp bnQ+KG9zdGF0dXMpKTsKLSAgICAgICAgfSk7CisgICAgICAgIEVSUk9SX0xPR19JRihsb2dnZXJQ dHIoKSwgTE9HSURFTlRJRklFUiwgIkZhaWxlZCB0byBpbml0aWFsaXplIENNVmlkZW9Gb3JtYXRE ZXNjcmlwdGlvbiB3aXRoIGVycm9yICIsIHN0YXRpY19jYXN0PGludD4ob3N0YXR1cykpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xOTMsOSArMTg1LDcgQEAgdm9pZCBSZWFsdGltZUlu Y29taW5nVmlkZW9Tb3VyY2VDb2NvYTo6T25GcmFtZShjb25zdCB3ZWJydGM6OlZpZGVvRnJhbWUm IGZyYW1lKQogICAgIG9zdGF0dXMgPSBDTVNhbXBsZUJ1ZmZlckNyZWF0ZVJlYWR5V2l0aEltYWdl QnVmZmVyKGtDRkFsbG9jYXRvckRlZmF1bHQsIChDVkltYWdlQnVmZmVyUmVmKXBpeGVsQnVmZmVy LCBmb3JtYXREZXNjcmlwdGlvbiwgJnRpbWluZ0luZm8sICZzYW1wbGVCdWZmZXIpOwogICAgIENG UmVsZWFzZShmb3JtYXREZXNjcmlwdGlvbik7CiAgICAgaWYgKG9zdGF0dXMgIT0gbm9FcnIpIHsK LSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYo KnRoaXMpLCBvc3RhdHVzXSB7Ci0gICAgICAgICAgICBFUlJPUl9MT0dfSUYobG9nZ2VyUHRyKCks IExPR0lERU5USUZJRVIsICJGYWlsZWQgdG8gY3JlYXRlIHRoZSBzYW1wbGUgYnVmZmVyIHdpdGgg ZXJyb3IgIiwgc3RhdGljX2Nhc3Q8aW50Pihvc3RhdHVzKSk7Ci0gICAgICAgIH0pOworICAgICAg ICBFUlJPUl9MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lERU5USUZJRVIsICJGYWlsZWQgdG8gY3Jl YXRlIHRoZSBzYW1wbGUgYnVmZmVyIHdpdGggZXJyb3IgIiwgc3RhdGljX2Nhc3Q8aW50Pihvc3Rh dHVzKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK 375568 2019-08-05 15:21:17 -0700 2019-08-05 20:45:46 -0700 Patch bug-200448-20190805152116.patch text/plain 8585 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGM3ODYwNTg0OTcyNTE5NTJhZjY5ZDZi MWU3OTg4NzZhNGEzNTVjNTYuLmVmMzU3MWJjNjNmOWVjYjk2MzU3MjM2MWZhYTI0OWE1YzM1NTcy OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDgtMDUgIFlvdWVubiBGYWJsZXQgIDx5b3Vl bm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgTG9nZ2VyOjpsb2cgdGhyZWFkIHNhZmUgc28g dGhhdCBpdCBjYW4gYmUgdXNlZCBmcm9tIGJhY2tncm91bmQgdGhyZWFkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNDQ4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbG9jayB0byBlbnN1cmUg Y2FsbGluZyBsb2cgaXMgdGhyZWFkLXNhZmUuCisKKyAgICAgICAgKiB3dGYvTG9nZ2VyLmg6Cisg ICAgICAgIChXVEY6OkxvZ2dlcjo6YWRkT2JzZXJ2ZXIpOgorICAgICAgICAoV1RGOjpMb2dnZXI6 OnJlbW92ZU9ic2VydmVyKToKKyAgICAgICAgKFdURjo6TG9nZ2VyOjpsb2cpOgorICAgICAgICAo V1RGOjpMb2dnZXI6Om9ic2VydmVyTG9jayk6CisKIDIwMTktMDctMzEgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0 ZXJzV2l0aExhbmd1YWdlQW5kT3B0aW9uIGlmIGF2YWlsYWJsZSBpbnN0ZWFkIG9mIENURm9udENy ZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NTVjYTVmNWI4ODRj NWQ5OTY4M2UyMjU3ZmZlNDUyNDYzYTk0NDQwLi5kZDRlNzZhMGVkYjk2ZjQ0MmY4N2RiZjUwZjBm YWRjZGE4NWUyZDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDgtMDUgIFlv dWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgTG9nZ2VyOjps b2cgdGhyZWFkIHNhZmUgc28gdGhhdCBpdCBjYW4gYmUgdXNlZCBmcm9tIGJhY2tncm91bmQgdGhy ZWFkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAw NDQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8g Y2hhbmdlIG9mIGJlaGF2aW9yLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNyb3NzVGhyZWFkQ29weSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dDo6ZGlkTG9nTWVzc2FnZSk6CisgICAgICAgIE1ha2Ugc3VyZSB0byBob3AgdG8gdGhlIG1haW4g dGhyZWFkIGlmIG5lZWRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVh bHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVh bHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2E6Ok9uRGF0YSk6CisgICAgICAgIFJlbW92ZSBo b3BwaW5nIHRvIHRoZSBtYWluIHRocmVhZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVh bS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW06CisgICAgICAgIChXZWJD b3JlOjpSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYTo6T25GcmFtZSk6CisgICAgICAg IFJlbW92ZSBob3BwaW5nIHRvIHRoZSBtYWluIHRocmVhZC4KKwogMjAxOS0wOC0wMSAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gRGlyZWN0bHkgdXNl IFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXIgdG8gY29tcHV0ZSB0aGUgbWVkaWEgY2FwdHVyZSAg c3RhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xvZ2dlci5oIGIvU291cmNlL1dURi93 dGYvTG9nZ2VyLmgKaW5kZXggMDM2OGFiMDFjMDZlNTdhMTNkMjE1ZTcxNmUyZjVmNTU1MzdhNjc2 My4uYjgxYjBmOThjZjdkMmIwYjM1YmJkNjkxYzljYjgyZGE4ZDViYWM0ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvTG9nZ2VyLmgKKysrIGIvU291cmNlL1dURi93dGYvTG9nZ2VyLmgKQEAg LTI1LDYgKzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlIDx3dGYvTG9jay5oPgog I2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KIAogbmFtZXNwYWNlIFdURiB7CkBA IC0xMTIsNiArMTEzLDcgQEAgcHVibGljOgogICAgIGNsYXNzIE9ic2VydmVyIHsKICAgICBwdWJs aWM6CiAgICAgICAgIHZpcnR1YWwgfk9ic2VydmVyKCkgPSBkZWZhdWx0OworICAgICAgICAvLyBD YW4gYmUgY2FsbGVkIG9uIGFueSB0aHJlYWQuCiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRMb2dN ZXNzYWdlKGNvbnN0IFdURkxvZ0NoYW5uZWwmLCBXVEZMb2dMZXZlbCwgVmVjdG9yPEpTT05Mb2dW YWx1ZT4mJikgPSAwOwogICAgIH07CiAKQEAgLTIxNiwxMCArMjE4LDEyIEBAIHB1YmxpYzoKIAog ICAgIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRPYnNlcnZlcihPYnNlcnZlciYgb2JzZXJ2ZXIpCiAg ICAgeworICAgICAgICBhdXRvIGxvY2sgPSBob2xkTG9jayhvYnNlcnZlckxvY2soKSk7CiAgICAg ICAgIG9ic2VydmVycygpLmFwcGVuZChvYnNlcnZlcik7CiAgICAgfQogICAgIHN0YXRpYyBpbmxp bmUgdm9pZCByZW1vdmVPYnNlcnZlcihPYnNlcnZlciYgb2JzZXJ2ZXIpCiAgICAgeworICAgICAg ICBhdXRvIGxvY2sgPSBob2xkTG9jayhvYnNlcnZlckxvY2soKSk7CiAgICAgICAgIG9ic2VydmVy cygpLnJlbW92ZUZpcnN0TWF0Y2hpbmcoWyZvYnNlcnZlcl0oYXV0byBhbk9ic2VydmVyKSB7CiAg ICAgICAgICAgICByZXR1cm4gJmFuT2JzZXJ2ZXIuZ2V0KCkgPT0gJm9ic2VydmVyOwogICAgICAg ICB9KTsKQEAgLTI0Nyw2ICsyNTEsMTAgQEAgcHJpdmF0ZToKICAgICAgICAgaWYgKGNoYW5uZWwu c3RhdGUgPT0gV1RGTG9nQ2hhbm5lbFN0YXRlOjpPZmYgfHwgbGV2ZWwgPiBjaGFubmVsLmxldmVs KQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIGF1dG8gbG9jayA9IHRyeUhvbGRMb2Nr KG9ic2VydmVyTG9jaygpKTsKKyAgICAgICAgaWYgKCFsb2NrKQorICAgICAgICAgICAgcmV0dXJu OworCiAgICAgICAgIGZvciAoT2JzZXJ2ZXImIG9ic2VydmVyIDogb2JzZXJ2ZXJzKCkpCiAgICAg ICAgICAgICBvYnNlcnZlci5kaWRMb2dNZXNzYWdlKGNoYW5uZWwsIGxldmVsLCB7IENvbnNvbGVM b2dWYWx1ZTxBcmd1bWVudD46OnRvVmFsdWUoYXJndW1lbnRzKS4uLiB9KTsKICAgICB9CkBAIC0y NTcsNiArMjY1LDEzIEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiBvYnNlcnZlcnM7CiAgICAg fQogCisgICAgc3RhdGljIExvY2smIG9ic2VydmVyTG9jaygpCisgICAgeworICAgICAgICBzdGF0 aWMgTmV2ZXJEZXN0cm95ZWQ8TG9jaz4gb2JzZXJ2ZXJMb2NrOworICAgICAgICByZXR1cm4gb2Jz ZXJ2ZXJMb2NrOworICAgIH0KKworCiAgICAgYm9vbCBtX2VuYWJsZWQgeyB0cnVlIH07CiAgICAg Y29uc3Qgdm9pZCogbV9vd25lcjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAyZmQ1 MTZhMzEwMzdiYjE3OTczZWQ5ZGE5MTUyOGUxN2NkMjY1MWFhLi5kMTNlZTUyNmUxYzVlYjU0ZGMz ZjA0YzYxOGE4NmUwODgzZmM1Mzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTgwMjAs OCArODAyMCwyMiBAQCBzdGF0aWMgTWVzc2FnZUxldmVsIG1lc3NhZ2VMZXZlbEZyb21XVEZMb2dM ZXZlbChXVEZMb2dMZXZlbCBsZXZlbCkKICAgICByZXR1cm4gTWVzc2FnZUxldmVsOjpMb2c7CiB9 CiAKK3N0YXRpYyBpbmxpbmUgVmVjdG9yPEpTT05Mb2dWYWx1ZT4gY3Jvc3NUaHJlYWRDb3B5KFZl Y3RvcjxKU09OTG9nVmFsdWU+JiYgc291cmNlKQoreworICAgIGF1dG8gdmFsdWVzID0gV1RGTW92 ZShzb3VyY2UpOworICAgIGZvciAoYXV0byYgdmFsdWUgOiB2YWx1ZXMpCisgICAgICAgIHZhbHVl LnZhbHVlID0gY3Jvc3NUaHJlYWRDb3B5KFdURk1vdmUodmFsdWUudmFsdWUpKTsKKyAgICByZXR1 cm4gdmFsdWVzOworfQorCiB2b2lkIERvY3VtZW50OjpkaWRMb2dNZXNzYWdlKGNvbnN0IFdURkxv Z0NoYW5uZWwmIGNoYW5uZWwsIFdURkxvZ0xldmVsIGxldmVsLCBWZWN0b3I8SlNPTkxvZ1ZhbHVl PiYmIGxvZ01lc3NhZ2VzKQogeworICAgIGlmICghaXNNYWluVGhyZWFkKCkpIHsKKyAgICAgICAg cG9zdFRhc2soW3RoaXMsIGNoYW5uZWwsIGxldmVsLCBsb2dNZXNzYWdlcyA9IGNyb3NzVGhyZWFk Q29weShXVEZNb3ZlKGxvZ01lc3NhZ2VzKSldKGF1dG8mKSBtdXRhYmxlIHsKKyAgICAgICAgICAg IGRpZExvZ01lc3NhZ2UoY2hhbm5lbCwgbGV2ZWwsIFdURk1vdmUobG9nTWVzc2FnZXMpKTsKKyAg ICAgICAgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgaWYgKCFwYWdlKCkpCiAgICAg ICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29hLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3Vy Y2VDb2NvYS5jcHAKaW5kZXggMmRmOWM0ODJjMjJmZGE3ZGIxZTBlNGEzOTUxN2E4MzliZmRmZjQ1 Yi4uOGYxMmMxZDMzNTI4MjFjN2Q0NzMyZDA2MmFmNjI1ODFmNDVhYzYyNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdB dWRpb1NvdXJjZUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2EuY3BwCkBAIC04NywxMSAr ODcsNyBAQCB2b2lkIFJlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29hOjpPbkRhdGEoY29u c3Qgdm9pZCogYXVkaW9EYXRhLCBpbnQgYml0c1BlcgogICAgICAgICBtZW1jcHkoYXVkaW9CdWZm ZXJMaXN0LmJ1ZmZlcigwKS0+bURhdGEsIGF1ZGlvRGF0YSwgYXVkaW9CdWZmZXJMaXN0LmJ1ZmZl cigwKS0+bURhdGFCeXRlU2l6ZSk7CiAKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBp ZiAoISgrK21fY2h1bmtzUmVjZWl2ZWQgJSAyMDApKSB7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJl YWQoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0gewotICAgICAgICAgICAg QUxXQVlTX0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUiwgImNodW5rICIsIG1fY2h1 bmtzUmVjZWl2ZWQpOwotICAgICAgICB9KTsKLSAgICB9CisgICAgQUxXQVlTX0xPR19JRihsb2dn ZXJQdHIoKSAmJiAhKCsrbV9jaHVua3NSZWNlaXZlZCAlIDIwMCksIExPR0lERU5USUZJRVIsICJj aHVuayAiLCBtX2NodW5rc1JlY2VpdmVkKTsKICNlbmRpZgogCiAgICAgYXVkaW9TYW1wbGVzQXZh aWxhYmxlKG1lZGlhVGltZSwgYXVkaW9CdWZmZXJMaXN0LCBDQUF1ZGlvU3RyZWFtRGVzY3JpcHRp b24obmV3RGVzY3JpcHRpb24pLCBudW1iZXJPZkZyYW1lcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291 cmNlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVh bHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW0KaW5kZXggMTdlYmQ2NmQ4ZWI1NTA3Mjg4 ZWEwZDVhYzc5Nzc2YmUyZTFmYzJlNS4uNGNmMjE5MDdhMGRiYmUyYmRlOGU3Mjk5ZjBiZWQzNWRm OWYzZTFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v bWFjL1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VD b2NvYS5tbQpAQCAtMTU4LDE4ICsxNTgsMTIgQEAgdm9pZCBSZWFsdGltZUluY29taW5nVmlkZW9T b3VyY2VDb2NvYTo6T25GcmFtZShjb25zdCB3ZWJydGM6OlZpZGVvRnJhbWUmIGZyYW1lKQogICAg ICAgICByZXR1cm47CiAKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBpZiAoISgrK21f bnVtYmVyT2ZGcmFtZXMgJSA2MCkpIHsKLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBudW1iZXJPZkZyYW1lcyA9IG1fbnVtYmVy T2ZGcmFtZXNdIHsKLSAgICAgICAgICAgIEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lE RU5USUZJRVIsICJmcmFtZSAiLCBudW1iZXJPZkZyYW1lcyk7Ci0gICAgICAgIH0pOwotICAgIH0K KyAgICBBTFdBWVNfTE9HX0lGKGxvZ2dlclB0cigpICYmICEoKyttX251bWJlck9mRnJhbWVzICUg NjApLCBMT0dJREVOVElGSUVSLCAiZnJhbWUgIiwgbV9udW1iZXJPZkZyYW1lcyk7CiAjZW5kaWYK IAogICAgIGF1dG8gcGl4ZWxCdWZmZXIgPSBwaXhlbEJ1ZmZlckZyb21WaWRlb0ZyYW1lKGZyYW1l KTsKICAgICBpZiAoIXBpeGVsQnVmZmVyKSB7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0gewotICAgICAgICAgICAgRVJST1Jf TE9HX0lGKGxvZ2dlclB0cigpLCBMT0dJREVOVElGSUVSLCAiRmFpbGVkIHRvIGdldCBhIHBpeGVs IGJ1ZmZlciBmcm9tIGEgZnJhbWUiKTsKLSAgICAgICAgfSk7CisgICAgICAgIEVSUk9SX0xPR19J Rihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUiwgIkZhaWxlZCB0byBnZXQgYSBwaXhlbCBidWZm ZXIgZnJvbSBhIGZyYW1lIik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTE4Myw5ICsx NzcsNyBAQCB2b2lkIFJlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hOjpPbkZyYW1lKGNv bnN0IHdlYnJ0Yzo6VmlkZW9GcmFtZSYgZnJhbWUpCiAgICAgQ01WaWRlb0Zvcm1hdERlc2NyaXB0 aW9uUmVmIGZvcm1hdERlc2NyaXB0aW9uOwogICAgIE9TU3RhdHVzIG9zdGF0dXMgPSBDTVZpZGVv Rm9ybWF0RGVzY3JpcHRpb25DcmVhdGVGb3JJbWFnZUJ1ZmZlcihrQ0ZBbGxvY2F0b3JEZWZhdWx0 LCAoQ1ZJbWFnZUJ1ZmZlclJlZilwaXhlbEJ1ZmZlciwgJmZvcm1hdERlc2NyaXB0aW9uKTsKICAg ICBpZiAob3N0YXR1cyAhPSBub0VycikgewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlz LCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIG9zdGF0dXNdIHsKLSAgICAgICAgICAg IEVSUk9SX0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUiwgIkZhaWxlZCB0byBpbml0 aWFsaXplIENNVmlkZW9Gb3JtYXREZXNjcmlwdGlvbiB3aXRoIGVycm9yICIsIHN0YXRpY19jYXN0 PGludD4ob3N0YXR1cykpOwotICAgICAgICB9KTsKKyAgICAgICAgRVJST1JfTE9HX0lGKGxvZ2dl clB0cigpLCBMT0dJREVOVElGSUVSLCAiRmFpbGVkIHRvIGluaXRpYWxpemUgQ01WaWRlb0Zvcm1h dERlc2NyaXB0aW9uIHdpdGggZXJyb3IgIiwgc3RhdGljX2Nhc3Q8aW50Pihvc3RhdHVzKSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTE5Myw5ICsxODUsNyBAQCB2b2lkIFJlYWx0aW1l SW5jb21pbmdWaWRlb1NvdXJjZUNvY29hOjpPbkZyYW1lKGNvbnN0IHdlYnJ0Yzo6VmlkZW9GcmFt ZSYgZnJhbWUpCiAgICAgb3N0YXR1cyA9IENNU2FtcGxlQnVmZmVyQ3JlYXRlUmVhZHlXaXRoSW1h Z2VCdWZmZXIoa0NGQWxsb2NhdG9yRGVmYXVsdCwgKENWSW1hZ2VCdWZmZXJSZWYpcGl4ZWxCdWZm ZXIsIGZvcm1hdERlc2NyaXB0aW9uLCAmdGltaW5nSW5mbywgJnNhbXBsZUJ1ZmZlcik7CiAgICAg Q0ZSZWxlYXNlKGZvcm1hdERlc2NyaXB0aW9uKTsKICAgICBpZiAob3N0YXR1cyAhPSBub0Vycikg ewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyksIG9zdGF0dXNdIHsKLSAgICAgICAgICAgIEVSUk9SX0xPR19JRihsb2dnZXJQdHIo KSwgTE9HSURFTlRJRklFUiwgIkZhaWxlZCB0byBjcmVhdGUgdGhlIHNhbXBsZSBidWZmZXIgd2l0 aCBlcnJvciAiLCBzdGF0aWNfY2FzdDxpbnQ+KG9zdGF0dXMpKTsKLSAgICAgICAgfSk7CisgICAg ICAgIEVSUk9SX0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUiwgIkZhaWxlZCB0byBj cmVhdGUgdGhlIHNhbXBsZSBidWZmZXIgd2l0aCBlcnJvciAiLCBzdGF0aWNfY2FzdDxpbnQ+KG9z dGF0dXMpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAo=