237194 2022-02-25 02:59:48 -0800 Simplify CVPixelBuffer data copies in SharedVideoFrameInfo 2022-02-27 03:47:20 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1845949 0 youennf 2022-02-25 02:59:48 -0800 Simplify CVPixelBuffer data copies in SharedVideoFrameInfo 1845950 1 453187 youennf 2022-02-25 03:04:45 -0800 Created attachment 453187 Patch 1846022 2 453217 youennf 2022-02-25 08:27:54 -0800 Created attachment 453217 Patch 1846412 3 ews-feeder 2022-02-27 03:46:19 -0800 Committed r290557 (247835@main): <https://commits.webkit.org/247835@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453217. 1846414 4 webkit-bug-importer 2022-02-27 03:47:20 -0800 <rdar://problem/89526247> 453187 2022-02-25 03:04:45 -0800 2022-02-25 08:27:50 -0800 Patch bug-237194-20220225120443.patch text/plain 11168 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjk4MjE4NTU0MjkyNzIx ODM3YjZjNThmMWVhYTdkZGM4ZWY2ODFlYy4uMDk4ZjQ4YjFhOTQyNTA1OTFmZGMyMzIwMjAxYjkw ZWNhNDhmMGQyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAyLTI1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBDVlBpeGVs QnVmZmVyIGRhdGEgY29waWVzIGluIFNoYXJlZFZpZGVvRnJhbWVJbmZvCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzcxOTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdXNlIG9mIHZJbWFnZVVu cHJlbXVsdGlwbHlEYXRhX0JHUkE4ODg4IHdoaWNoIG1pZ2h0IG5vdCBiZSBjb3JyZWN0IGZvciBj YW52YXMgZGF0YS4KKyAgICAgICAgTWFrZSB1c2Ugb2YgQ1ZQaXhlbEJ1ZmZlckdldFBsYW5lQ291 bnQgdG8gc2hhcmUgbW9yZSBjb2RlIGJldHdlZW4gbW9ub3BsYW5hciBhbmQgYmlwbGFuYXIgZm9y bWF0cy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICog cGxhdGZvcm0vY29jb2EvQ29yZVZpZGVvU29mdExpbmsuY3BwOgorICAgICAgICAqIHBsYXRmb3Jt L2NvY29hL0NvcmVWaWRlb1NvZnRMaW5rLmg6CisgICAgICAgICogcGxhdGZvcm0vY29jb2EvU2hh cmVkVmlkZW9GcmFtZUluZm8ubW06CisgICAgICAgIChXZWJDb3JlOjpTaGFyZWRWaWRlb0ZyYW1l SW5mbzo6aXNSZWFkV3JpdGVTdXBwb3J0ZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y29w eVRvQ1ZQaXhlbEJ1ZmZlclBsYW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlNoYXJlZFZpZGVvRnJh bWVJbmZvOjpjcmVhdGVQaXhlbEJ1ZmZlckZyb21NZW1vcnkpOgorICAgICAgICAoV2ViQ29yZTo6 U2hhcmVkVmlkZW9GcmFtZUluZm86OndyaXRlUGl4ZWxCdWZmZXIpOgorCiAyMDIyLTAyLTI1ICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBBWDog TGlzdCBpdGVtIG1hcmtlciBub3QgZXhwb3NlZCB3aGVuIG5vdCBhIGRpcmVjdCBjaGlsZCBvZiBh IGxpc3QgaXRlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29y ZVZpZGVvU29mdExpbmsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29yZVZp ZGVvU29mdExpbmsuY3BwCmluZGV4IDQ1Y2RjN2E5YWNmYjA0ZDEzYzgyNDhkZTIxMWEyNGY3N2Uz NGM2ODEuLjZkZGIzYjhlYTU4NjIwZTg5MWQzN2MwMWY0OGExNDcxYTRmNDk1ODYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0NvcmVWaWRlb1NvZnRMaW5rLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Db3JlVmlkZW9Tb2Z0TGluay5jcHAK QEAgLTQ2LDYgKzQ2LDcgQEAgU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwg Q29yZVZpZGVvLCBDVlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3MsIHYKIFNPRlRfTElOS19GVU5D VElPTl9GT1JfU09VUkNFKFdlYkNvcmUsIENvcmVWaWRlbywgQ1ZQaXhlbEJ1ZmZlckdldEJ5dGVz UGVyUm93LCBzaXplX3QsIChDVlBpeGVsQnVmZmVyUmVmIHBpeGVsQnVmZmVyKSwgKHBpeGVsQnVm ZmVyKSkKIFNPRlRfTElOS19GVU5DVElPTl9GT1JfU09VUkNFKFdlYkNvcmUsIENvcmVWaWRlbywg Q1ZQaXhlbEJ1ZmZlckdldEJ5dGVzUGVyUm93T2ZQbGFuZSwgc2l6ZV90LCAoQ1ZQaXhlbEJ1ZmZl clJlZiBwaXhlbEJ1ZmZlciwgc2l6ZV90IHBsYW5lSW5kZXgpLCAocGl4ZWxCdWZmZXIsIHBsYW5l SW5kZXgpKQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZVZpZGVv LCBDVlBpeGVsQnVmZmVyR2V0UGl4ZWxGb3JtYXRUeXBlLCBPU1R5cGUsIChDVlBpeGVsQnVmZmVy UmVmIHBpeGVsQnVmZmVyKSwgKHBpeGVsQnVmZmVyKSkKK1NPRlRfTElOS19GVU5DVElPTl9GT1Jf U09VUkNFKFdlYkNvcmUsIENvcmVWaWRlbywgQ1ZQaXhlbEJ1ZmZlckdldFBsYW5lQ291bnQsIHNp emVfdCwgKENWUGl4ZWxCdWZmZXJSZWYgcGl4ZWxCdWZmZXIpLCAocGl4ZWxCdWZmZXIpKQogU09G VF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZVZpZGVvLCBDVlBpeGVsQnVm ZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5lLCB2b2lkICosIChDVlBpeGVsQnVmZmVyUmVmIHBpeGVs QnVmZmVyLCBzaXplX3QgcGxhbmVJbmRleCksIChwaXhlbEJ1ZmZlciwgcGxhbmVJbmRleCkpOwog U09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZVZpZGVvLCBDVlBpeGVs QnVmZmVyTG9ja0Jhc2VBZGRyZXNzLCBDVlJldHVybiwgKENWUGl4ZWxCdWZmZXJSZWYgcGl4ZWxC dWZmZXIsIENWT3B0aW9uRmxhZ3MgbG9ja0ZsYWdzKSwgKHBpeGVsQnVmZmVyLCBsb2NrRmxhZ3Mp KQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZVZpZGVvLCBDVlBp eGVsQnVmZmVyVW5sb2NrQmFzZUFkZHJlc3MsIENWUmV0dXJuLCAoQ1ZQaXhlbEJ1ZmZlclJlZiBw aXhlbEJ1ZmZlciwgQ1ZPcHRpb25GbGFncyBsb2NrRmxhZ3MpLCAocGl4ZWxCdWZmZXIsIGxvY2tG bGFncykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Db3JlVmlk ZW9Tb2Z0TGluay5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29yZVZpZGVvU29m dExpbmsuaAppbmRleCAwMzczMjA0OTY5NmVmZWU0MWZhOWNkMjU0ZDM5N2FjNTkyNTBhNjE2Li5k ZGQ2NzFjZmU1OWRiYzgwYzcxNzk0ZTQwYzI4Y2Y2NTRiNTE0Y2IzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Db3JlVmlkZW9Tb2Z0TGluay5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0NvcmVWaWRlb1NvZnRMaW5rLmgKQEAgLTU4LDYgKzU4 LDggQEAgU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29yZVZpZGVvLCBD VlBpeGVsQnVmZmVyR2V0Qnl0ZXNQZXJSb3dPZlAKICNkZWZpbmUgQ1ZQaXhlbEJ1ZmZlckdldEJ5 dGVzUGVyUm93T2ZQbGFuZSBzb2Z0TGlua19Db3JlVmlkZW9fQ1ZQaXhlbEJ1ZmZlckdldEJ5dGVz UGVyUm93T2ZQbGFuZQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29y ZVZpZGVvLCBDVlBpeGVsQnVmZmVyR2V0UGl4ZWxGb3JtYXRUeXBlLCBPU1R5cGUsIChDVlBpeGVs QnVmZmVyUmVmIHBpeGVsQnVmZmVyKSwgKHBpeGVsQnVmZmVyKSkKICNkZWZpbmUgQ1ZQaXhlbEJ1 ZmZlckdldFBpeGVsRm9ybWF0VHlwZSBzb2Z0TGlua19Db3JlVmlkZW9fQ1ZQaXhlbEJ1ZmZlckdl dFBpeGVsRm9ybWF0VHlwZQorU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwg Q29yZVZpZGVvLCBDVlBpeGVsQnVmZmVyR2V0UGxhbmVDb3VudCwgc2l6ZV90LCAoQ1ZQaXhlbEJ1 ZmZlclJlZiBwaXhlbEJ1ZmZlciksIChwaXhlbEJ1ZmZlcikpCisjZGVmaW5lIENWUGl4ZWxCdWZm ZXJHZXRQbGFuZUNvdW50IHNvZnRMaW5rX0NvcmVWaWRlb19DVlBpeGVsQnVmZmVyR2V0UGxhbmVD b3VudAogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29yZVZpZGVvLCBD VlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5lLCB2b2lkICosIChDVlBpeGVsQnVmZmVy UmVmIHBpeGVsQnVmZmVyLCBzaXplX3QgcGxhbmVJbmRleCksIChwaXhlbEJ1ZmZlciwgcGxhbmVJ bmRleCkpOwogI2RlZmluZSBDVlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5lIHNvZnRM aW5rX0NvcmVWaWRlb19DVlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5lCiBTT0ZUX0xJ TktfRlVOQ1RJT05fRk9SX0hFQURFUihXZWJDb3JlLCBDb3JlVmlkZW8sIENWUGl4ZWxCdWZmZXJM b2NrQmFzZUFkZHJlc3MsIENWUmV0dXJuLCAoQ1ZQaXhlbEJ1ZmZlclJlZiBwaXhlbEJ1ZmZlciwg Q1ZPcHRpb25GbGFncyBsb2NrRmxhZ3MpLCAocGl4ZWxCdWZmZXIsIGxvY2tGbGFncykpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9TaGFyZWRWaWRlb0ZyYW1lSW5m by5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1NoYXJlZFZpZGVvRnJhbWVJbmZv Lm1tCmluZGV4IDA4YzZjY2Q4ODUzNzFmYWYxZDExOGUzOWRhMjNhZTMyZDg0NTliZGUuLjMyNTk1 N2ViMTRjNmQ5NmEyZjhhNWJhNWY0MGI5Y2FkYjM4MjFlOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2NvY29hL1NoYXJlZFZpZGVvRnJhbWVJbmZvLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1NoYXJlZFZpZGVvRnJhbWVJbmZvLm1tCkBAIC0zNCwx MCArMzQsNiBAQAogI2luY2x1ZGUgPHd0Zi9TY29wZS5oPgogI2luY2x1ZGUgPHd0Zi9wZXJzaXN0 ZW5jZS9QZXJzaXN0ZW50Q29kZXJzLmg+CiAKLSNpZiBVU0UoQUNDRUxFUkFURSkKLSNpbmNsdWRl IDxBY2NlbGVyYXRlL0FjY2VsZXJhdGUuaD4KLSNlbmRpZgotCiAjaWYgVVNFKExJQldFQlJUQykK IAogQUxMT1dfVU5VU0VEX1BBUkFNRVRFUlNfQkVHSU4KQEAgLTYzLDExICs1OSw5IEBAIFNoYXJl ZFZpZGVvRnJhbWVJbmZvIFNoYXJlZFZpZGVvRnJhbWVJbmZvOjpmcm9tQ1ZQaXhlbEJ1ZmZlcihD VlBpeGVsQnVmZmVyUmVmIHBpCiBib29sIFNoYXJlZFZpZGVvRnJhbWVJbmZvOjppc1JlYWRXcml0 ZVN1cHBvcnRlZCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fYnVmZmVyVHlwZSA9PSBrQ1ZQaXhl bEZvcm1hdFR5cGVfNDIwWXBDYkNyOEJpUGxhbmFyVmlkZW9SYW5nZQotI2lmIFVTRShBQ0NFTEVS QVRFKQotICAgICAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9ybWF0VHlwZV8z MkJHUkEKLSNlbmRpZgotICAgICAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9y bWF0VHlwZV80MjBZcENiQ3I4QmlQbGFuYXJGdWxsUmFuZ2UKLSAgICAgICAgICAgIHx8IG1fYnVm ZmVyVHlwZSA9PSBrQ1ZQaXhlbEZvcm1hdFR5cGVfNDIwWXBDYkNyMTBCaVBsYW5hckZ1bGxSYW5n ZTsKKyAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9ybWF0VHlwZV8zMkJHUkEK KyAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9ybWF0VHlwZV80MjBZcENiQ3I4 QmlQbGFuYXJGdWxsUmFuZ2UKKyAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9y bWF0VHlwZV80MjBZcENiQ3IxMEJpUGxhbmFyRnVsbFJhbmdlOwogfQogCiBzaXplX3QgU2hhcmVk VmlkZW9GcmFtZUluZm86OnN0b3JhZ2VTaXplKCkgY29uc3QKQEAgLTEzMSwzOSArMTI1LDIxIEBA IHN0ZDo6b3B0aW9uYWw8U2hhcmVkVmlkZW9GcmFtZUluZm8+IFNoYXJlZFZpZGVvRnJhbWVJbmZv OjpkZWNvZGUoU3Bhbjxjb25zdCB1aW50CiAgICAgcmV0dXJuIFNoYXJlZFZpZGVvRnJhbWVJbmZv IHsgKmJ1ZmZlclR5cGUsICp3aWR0aCwgKmhlaWdodCwgKmJ5dGVzUGVyUm93ICwgKndpZHRoUGxh bmVCLCAqaGVpZ2h0UGxhbmVCLCAqYnl0ZXNQZXJSb3dQbGFuZUIgfTsKIH0KIAotUmV0YWluUHRy PENWUGl4ZWxCdWZmZXJSZWY+IFNoYXJlZFZpZGVvRnJhbWVJbmZvOjpjcmVhdGVQaXhlbEJ1ZmZl ckZyb21NZW1vcnkoY29uc3QgdWludDhfdCogZGF0YSwgQ1ZQaXhlbEJ1ZmZlclBvb2xSZWYgYnVm ZmVyUG9vbCkKK3N0YXRpYyBjb25zdCB1aW50OF90KiBjb3B5VG9DVlBpeGVsQnVmZmVyUGxhbmUo Q1ZQaXhlbEJ1ZmZlclJlZiBwaXhlbEJ1ZmZlciwgc2l6ZV90IHBsYW5lSW5kZXgsIGNvbnN0IHVp bnQ4X3QqIHNvdXJjZSwgc2l6ZV90IGhlaWdodCwgdWludDMyX3QgYnl0ZXNQZXJSb3dTb3VyY2Up CiB7Ci0gICAgQVNTRVJUKGlzUmVhZFdyaXRlU3VwcG9ydGVkKCkpOwotICAgIGlmIChtX2J1ZmZl clR5cGUgPT0ga0NWUGl4ZWxGb3JtYXRUeXBlXzMyQkdSQSkgewotI2lmIFVTRShBQ0NFTEVSQVRF KQotICAgICAgICBJbnRTaXplIHNpemUgeyBzdGF0aWNfY2FzdDxpbnQ+KG1fd2lkdGgpLCBzdGF0 aWNfY2FzdDxpbnQ+KG1faGVpZ2h0KSB9OwotICAgICAgICBhdXRvIGlvU3VyZmFjZSA9IElPU3Vy ZmFjZTo6Y3JlYXRlKHNpemUsIERlc3RpbmF0aW9uQ29sb3JTcGFjZTo6U1JHQigpLCBJT1N1cmZh Y2U6OkZvcm1hdDo6QkdSQSk7Ci0KLSAgICAgICAgSU9TdXJmYWNlOjpMb2NrZXIgbG9jaygqaW9T dXJmYWNlKTsKLSAgICAgICAgdkltYWdlX0J1ZmZlciBzcmM7Ci0gICAgICAgIHNyYy53aWR0aCA9 IG1fd2lkdGg7Ci0gICAgICAgIHNyYy5oZWlnaHQgPSBtX2hlaWdodDsKLSAgICAgICAgc3JjLnJv d0J5dGVzID0gbV9ieXRlc1BlclJvdzsKLSAgICAgICAgc3JjLmRhdGEgPSBjb25zdF9jYXN0PHVp bnQ4X3QqPihkYXRhKTsKLQotICAgICAgICB2SW1hZ2VfQnVmZmVyIGRlc3Q7Ci0gICAgICAgIGRl c3Qud2lkdGggPSBtX3dpZHRoOwotICAgICAgICBkZXN0LmhlaWdodCA9IG1faGVpZ2h0OwotICAg ICAgICBkZXN0LnJvd0J5dGVzID0gaW9TdXJmYWNlLT5ieXRlc1BlclJvdygpOwotICAgICAgICBk ZXN0LmRhdGEgPSBsb2NrLnN1cmZhY2VCYXNlQWRkcmVzcygpOwotCi0gICAgICAgIHZJbWFnZVVu cHJlbXVsdGlwbHlEYXRhX0JHUkE4ODg4KCZzcmMsICZkZXN0LCBrdkltYWdlTm9GbGFncyk7Ci0K LSAgICAgICAgYXV0byBwaXhlbEJ1ZmZlciA9IFdlYkNvcmU6OmNyZWF0ZUNWUGl4ZWxCdWZmZXIo aW9TdXJmYWNlLT5zdXJmYWNlKCkpOwotICAgICAgICBpZiAoIXBpeGVsQnVmZmVyKQotICAgICAg ICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgIHJldHVybiBXVEZNb3ZlKCpwaXhlbEJ1ZmZl cik7Ci0jZWxzZQotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgImNyZWF0ZUlPU3Vy ZmFjZUZyb21TaGFyZWRNZW1vcnkgY2Fubm90IGNvbnZlcnQgdG8gSU9TdXJmYWNlIik7Ci0gICAg ICAgIHJldHVybiBudWxscHRyOwotI2VuZGlmCisgICAgYXV0byogZGVzdGluYXRpb24gPSBzdGF0 aWNfY2FzdDx1aW50OF90Kj4oQ1ZQaXhlbEJ1ZmZlckdldEJhc2VBZGRyZXNzT2ZQbGFuZShwaXhl bEJ1ZmZlciwgcGxhbmVJbmRleCkpOworICAgIHVpbnQzMl90IGJ5dGVzUGVyUm93RGVzdGluYXRp b24gPSBDVlBpeGVsQnVmZmVyR2V0Qnl0ZXNQZXJSb3dPZlBsYW5lKHBpeGVsQnVmZmVyLCBwbGFu ZUluZGV4KTsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaGVpZ2h0OyArK2kpIHsKKyAg ICAgICAgc3RkOjptZW1jcHkoZGVzdGluYXRpb24sIHNvdXJjZSwgc3RkOjptaW4oYnl0ZXNQZXJS b3dTb3VyY2UsIGJ5dGVzUGVyUm93RGVzdGluYXRpb24pKTsKKyAgICAgICAgc291cmNlICs9IGJ5 dGVzUGVyUm93U291cmNlOworICAgICAgICBkZXN0aW5hdGlvbiArPSBieXRlc1BlclJvd0Rlc3Rp bmF0aW9uOwogICAgIH0KKyAgICByZXR1cm4gc291cmNlOworfQogCitSZXRhaW5QdHI8Q1ZQaXhl bEJ1ZmZlclJlZj4gU2hhcmVkVmlkZW9GcmFtZUluZm86OmNyZWF0ZVBpeGVsQnVmZmVyRnJvbU1l bW9yeShjb25zdCB1aW50OF90KiBkYXRhLCBDVlBpeGVsQnVmZmVyUG9vbFJlZiBidWZmZXJQb29s KQoreworICAgIEFTU0VSVChpc1JlYWRXcml0ZVN1cHBvcnRlZCgpKTsKICAgICBDVlBpeGVsQnVm ZmVyUmVmIHJhd1BpeGVsQnVmZmVyID0gbnVsbHB0cjsKICAgICBpZiAoYnVmZmVyUG9vbCkgewog ICAgICAgICBhdXRvIHN0YXR1cyA9IENWUGl4ZWxCdWZmZXJQb29sQ3JlYXRlUGl4ZWxCdWZmZXIo a0NGQWxsb2NhdG9yRGVmYXVsdCwgYnVmZmVyUG9vbCwgJnJhd1BpeGVsQnVmZmVyKTsKQEAgLTE4 OCwyNiArMTY0LDEzIEBAIFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVmPiBTaGFyZWRWaWRlb0Zy YW1lSW5mbzo6Y3JlYXRlUGl4ZWxCdWZmZXJGcm9tTWVtb3J5KGNvCiAgICAgICAgIENWUGl4ZWxC dWZmZXJVbmxvY2tCYXNlQWRkcmVzcyhyYXdQaXhlbEJ1ZmZlciwgMCk7CiAgICAgfSk7CiAKLSAg ICBpZiAoQ1ZQaXhlbEJ1ZmZlckdldFdpZHRoT2ZQbGFuZShyYXdQaXhlbEJ1ZmZlciwgMSkgIT0g bV93aWR0aFBsYW5lQiB8fCBDVlBpeGVsQnVmZmVyR2V0SGVpZ2h0T2ZQbGFuZShyYXdQaXhlbEJ1 ZmZlciwgMSkgIT0gbV9oZWlnaHRQbGFuZUIpCi0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0g ICAgYXV0byogcGxhbmVBID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+KENWUGl4ZWxCdWZmZXJHZXRC YXNlQWRkcmVzc09mUGxhbmUocmF3UGl4ZWxCdWZmZXIsIDApKTsKLSAgICB1aW50MzJfdCBieXRl c1BlclJvd1BsYW5lQSA9IENWUGl4ZWxCdWZmZXJHZXRCeXRlc1BlclJvd09mUGxhbmUocmF3UGl4 ZWxCdWZmZXIsIDApOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2hlaWdodDsgKytp KSB7Ci0gICAgICAgIHN0ZDo6bWVtY3B5KHBsYW5lQSwgZGF0YSwgc3RkOjptaW4oYnl0ZXNQZXJS b3dQbGFuZUEsIG1fYnl0ZXNQZXJSb3cpKTsKLSAgICAgICAgcGxhbmVBICs9IGJ5dGVzUGVyUm93 UGxhbmVBOwotICAgICAgICBkYXRhICs9IG1fYnl0ZXNQZXJSb3c7Ci0gICAgfQotCi0gICAgYXV0 byogcGxhbmVCID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+KENWUGl4ZWxCdWZmZXJHZXRCYXNlQWRk cmVzc09mUGxhbmUocmF3UGl4ZWxCdWZmZXIsIDEpKTsKLSAgICB1aW50MzJfdCBieXRlc1BlclJv d1BsYW5lQiA9IENWUGl4ZWxCdWZmZXJHZXRCeXRlc1BlclJvd09mUGxhbmUocmF3UGl4ZWxCdWZm ZXIsIDEpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2hlaWdodFBsYW5lQjsgKytp KSB7Ci0gICAgICAgIHN0ZDo6bWVtY3B5KHBsYW5lQiwgZGF0YSwgc3RkOjptaW4oYnl0ZXNQZXJS b3dQbGFuZUIsIG1fYnl0ZXNQZXJSb3dQbGFuZUIpKTsKLSAgICAgICAgcGxhbmVCICs9IGJ5dGVz UGVyUm93UGxhbmVCOwotICAgICAgICBkYXRhICs9IG1fYnl0ZXNQZXJSb3dQbGFuZUI7CisgICAg ZGF0YSA9IGNvcHlUb0NWUGl4ZWxCdWZmZXJQbGFuZShyYXdQaXhlbEJ1ZmZlciwgMCwgZGF0YSwg bV9oZWlnaHQsIG1fYnl0ZXNQZXJSb3cpOworICAgIGlmIChDVlBpeGVsQnVmZmVyR2V0UGxhbmVD b3VudChyYXdQaXhlbEJ1ZmZlcikgPT0gMikgeworICAgICAgICBpZiAoQ1ZQaXhlbEJ1ZmZlckdl dFdpZHRoT2ZQbGFuZShyYXdQaXhlbEJ1ZmZlciwgMSkgIT0gbV93aWR0aFBsYW5lQiB8fCBDVlBp eGVsQnVmZmVyR2V0SGVpZ2h0T2ZQbGFuZShyYXdQaXhlbEJ1ZmZlciwgMSkgIT0gbV9oZWlnaHRQ bGFuZUIpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgY29weVRvQ1ZQaXhl bEJ1ZmZlclBsYW5lKHJhd1BpeGVsQnVmZmVyLCAxLCBkYXRhLCBtX2hlaWdodFBsYW5lQiwgbV9i eXRlc1BlclJvd1BsYW5lQik7CiAgICAgfQogCi0gICAgQ1ZQaXhlbEJ1ZmZlclVubG9ja0Jhc2VB ZGRyZXNzKHJhd1BpeGVsQnVmZmVyLCAwKTsKICAgICByZXR1cm4gcGl4ZWxCdWZmZXI7CiB9CiAK QEAgLTIyNCwzMyArMTg3LDE0IEBAIGJvb2wgU2hhcmVkVmlkZW9GcmFtZUluZm86OndyaXRlUGl4 ZWxCdWZmZXIoQ1ZQaXhlbEJ1ZmZlclJlZiBwaXhlbEJ1ZmZlciwgdWludDhfCiAgICAgZW5jb2Rl KGRhdGEpOwogICAgIGRhdGEgKz0gc2l6ZW9mKFNoYXJlZFZpZGVvRnJhbWVJbmZvKTsKIAotICAg IGlmIChtX2J1ZmZlclR5cGUgPT0ga0NWUGl4ZWxGb3JtYXRUeXBlXzMyQkdSQSkgewotI2lmIFVT RShBQ0NFTEVSQVRFKQotICAgICAgICB2SW1hZ2VfQnVmZmVyIHNyYzsKLSAgICAgICAgc3JjLndp ZHRoID0gbV93aWR0aDsKLSAgICAgICAgc3JjLmhlaWdodCA9IG1faGVpZ2h0OwotICAgICAgICBz cmMucm93Qnl0ZXMgPSBtX2J5dGVzUGVyUm93OwotICAgICAgICBzcmMuZGF0YSA9IENWUGl4ZWxC dWZmZXJHZXRCYXNlQWRkcmVzcyhwaXhlbEJ1ZmZlcik7Ci0KLSAgICAgICAgdkltYWdlX0J1ZmZl ciBkZXN0OwotICAgICAgICBkZXN0LndpZHRoID0gbV93aWR0aDsKLSAgICAgICAgZGVzdC5oZWln aHQgPSBtX2hlaWdodDsKLSAgICAgICAgZGVzdC5yb3dCeXRlcyA9IG1fYnl0ZXNQZXJSb3c7Ci0g ICAgICAgIGRlc3QuZGF0YSA9IGRhdGE7Ci0KLSAgICAgICAgdkltYWdlVW5wcmVtdWx0aXBseURh dGFfQkdSQTg4ODgoJnNyYywgJmRlc3QsIGt2SW1hZ2VOb0ZsYWdzKTsKKyAgICBhdXRvKiBwbGFu ZUEgPSBzdGF0aWNfY2FzdDxjb25zdCB1aW50OF90ICo+KENWUGl4ZWxCdWZmZXJHZXRCYXNlQWRk cmVzc09mUGxhbmUocGl4ZWxCdWZmZXIsIDApKTsKKyAgICBzaXplX3QgcGxhbmVBU2l6ZSA9IG1f aGVpZ2h0ICogbV9ieXRlc1BlclJvdzsKKyAgICBzdGQ6Om1lbWNweShkYXRhLCBwbGFuZUEsIHBs YW5lQVNpemUpOwogCisgICAgaWYgKENWUGl4ZWxCdWZmZXJHZXRQbGFuZUNvdW50KHBpeGVsQnVm ZmVyKSA9PSAxKQogICAgICAgICByZXR1cm4gdHJ1ZTsKLSNlbHNlCi0gICAgICAgIHJldHVybiBm YWxzZTsKLSNlbmRpZgotICAgIH0KIAotICAgIGNvbnN0IHVpbnQ4X3QgKnBsYW5lQSA9IHN0YXRp Y19jYXN0PGNvbnN0IHVpbnQ4X3QgKj4oQ1ZQaXhlbEJ1ZmZlckdldEJhc2VBZGRyZXNzT2ZQbGFu ZShwaXhlbEJ1ZmZlciwgMCkpOwotICAgIGNvbnN0IHVpbnQ4X3QgKnBsYW5lQiA9IHN0YXRpY19j YXN0PGNvbnN0IHVpbnQ4X3QgKj4oQ1ZQaXhlbEJ1ZmZlckdldEJhc2VBZGRyZXNzT2ZQbGFuZShw aXhlbEJ1ZmZlciwgMSkpOwotCi0gICAgc2l6ZV90IHBsYW5lQVNpemUgPSBtX2hlaWdodCAqIG1f Ynl0ZXNQZXJSb3c7Ci0gICAgc3RkOjptZW1jcHkoZGF0YSwgcGxhbmVBLCBwbGFuZUFTaXplKTsK KyAgICBhdXRvKiBwbGFuZUIgPSBzdGF0aWNfY2FzdDxjb25zdCB1aW50OF90ICo+KENWUGl4ZWxC dWZmZXJHZXRCYXNlQWRkcmVzc09mUGxhbmUocGl4ZWxCdWZmZXIsIDEpKTsKICAgICBzaXplX3Qg cGxhbmVCU2l6ZSA9IG1faGVpZ2h0UGxhbmVCICogbV9ieXRlc1BlclJvd1BsYW5lQjsKICAgICBz dGQ6Om1lbWNweShkYXRhICsgcGxhbmVBU2l6ZSwgcGxhbmVCLCBwbGFuZUJTaXplKTsKIAo= 453217 2022-02-25 08:27:54 -0800 2022-02-27 03:46:20 -0800 Patch bug-237194-20220225172752.patch text/plain 11235 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjk4MjE4NTU0MjkyNzIx ODM3YjZjNThmMWVhYTdkZGM4ZWY2ODFlYy4uMDk4ZjQ4YjFhOTQyNTA1OTFmZGMyMzIwMjAxYjkw ZWNhNDhmMGQyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAyLTI1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBDVlBpeGVs QnVmZmVyIGRhdGEgY29waWVzIGluIFNoYXJlZFZpZGVvRnJhbWVJbmZvCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzcxOTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdXNlIG9mIHZJbWFnZVVu cHJlbXVsdGlwbHlEYXRhX0JHUkE4ODg4IHdoaWNoIG1pZ2h0IG5vdCBiZSBjb3JyZWN0IGZvciBj YW52YXMgZGF0YS4KKyAgICAgICAgTWFrZSB1c2Ugb2YgQ1ZQaXhlbEJ1ZmZlckdldFBsYW5lQ291 bnQgdG8gc2hhcmUgbW9yZSBjb2RlIGJldHdlZW4gbW9ub3BsYW5hciBhbmQgYmlwbGFuYXIgZm9y bWF0cy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICog cGxhdGZvcm0vY29jb2EvQ29yZVZpZGVvU29mdExpbmsuY3BwOgorICAgICAgICAqIHBsYXRmb3Jt L2NvY29hL0NvcmVWaWRlb1NvZnRMaW5rLmg6CisgICAgICAgICogcGxhdGZvcm0vY29jb2EvU2hh cmVkVmlkZW9GcmFtZUluZm8ubW06CisgICAgICAgIChXZWJDb3JlOjpTaGFyZWRWaWRlb0ZyYW1l SW5mbzo6aXNSZWFkV3JpdGVTdXBwb3J0ZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y29w eVRvQ1ZQaXhlbEJ1ZmZlclBsYW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlNoYXJlZFZpZGVvRnJh bWVJbmZvOjpjcmVhdGVQaXhlbEJ1ZmZlckZyb21NZW1vcnkpOgorICAgICAgICAoV2ViQ29yZTo6 U2hhcmVkVmlkZW9GcmFtZUluZm86OndyaXRlUGl4ZWxCdWZmZXIpOgorCiAyMDIyLTAyLTI1ICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBBWDog TGlzdCBpdGVtIG1hcmtlciBub3QgZXhwb3NlZCB3aGVuIG5vdCBhIGRpcmVjdCBjaGlsZCBvZiBh IGxpc3QgaXRlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29y ZVZpZGVvU29mdExpbmsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29yZVZp ZGVvU29mdExpbmsuY3BwCmluZGV4IDQ1Y2RjN2E5YWNmYjA0ZDEzYzgyNDhkZTIxMWEyNGY3N2Uz NGM2ODEuLjZkZGIzYjhlYTU4NjIwZTg5MWQzN2MwMWY0OGExNDcxYTRmNDk1ODYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0NvcmVWaWRlb1NvZnRMaW5rLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Db3JlVmlkZW9Tb2Z0TGluay5jcHAK QEAgLTQ2LDYgKzQ2LDcgQEAgU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwg Q29yZVZpZGVvLCBDVlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3MsIHYKIFNPRlRfTElOS19GVU5D VElPTl9GT1JfU09VUkNFKFdlYkNvcmUsIENvcmVWaWRlbywgQ1ZQaXhlbEJ1ZmZlckdldEJ5dGVz UGVyUm93LCBzaXplX3QsIChDVlBpeGVsQnVmZmVyUmVmIHBpeGVsQnVmZmVyKSwgKHBpeGVsQnVm ZmVyKSkKIFNPRlRfTElOS19GVU5DVElPTl9GT1JfU09VUkNFKFdlYkNvcmUsIENvcmVWaWRlbywg Q1ZQaXhlbEJ1ZmZlckdldEJ5dGVzUGVyUm93T2ZQbGFuZSwgc2l6ZV90LCAoQ1ZQaXhlbEJ1ZmZl clJlZiBwaXhlbEJ1ZmZlciwgc2l6ZV90IHBsYW5lSW5kZXgpLCAocGl4ZWxCdWZmZXIsIHBsYW5l SW5kZXgpKQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZVZpZGVv LCBDVlBpeGVsQnVmZmVyR2V0UGl4ZWxGb3JtYXRUeXBlLCBPU1R5cGUsIChDVlBpeGVsQnVmZmVy UmVmIHBpeGVsQnVmZmVyKSwgKHBpeGVsQnVmZmVyKSkKK1NPRlRfTElOS19GVU5DVElPTl9GT1Jf U09VUkNFKFdlYkNvcmUsIENvcmVWaWRlbywgQ1ZQaXhlbEJ1ZmZlckdldFBsYW5lQ291bnQsIHNp emVfdCwgKENWUGl4ZWxCdWZmZXJSZWYgcGl4ZWxCdWZmZXIpLCAocGl4ZWxCdWZmZXIpKQogU09G VF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZVZpZGVvLCBDVlBpeGVsQnVm ZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5lLCB2b2lkICosIChDVlBpeGVsQnVmZmVyUmVmIHBpeGVs QnVmZmVyLCBzaXplX3QgcGxhbmVJbmRleCksIChwaXhlbEJ1ZmZlciwgcGxhbmVJbmRleCkpOwog U09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZVZpZGVvLCBDVlBpeGVs QnVmZmVyTG9ja0Jhc2VBZGRyZXNzLCBDVlJldHVybiwgKENWUGl4ZWxCdWZmZXJSZWYgcGl4ZWxC dWZmZXIsIENWT3B0aW9uRmxhZ3MgbG9ja0ZsYWdzKSwgKHBpeGVsQnVmZmVyLCBsb2NrRmxhZ3Mp KQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZVZpZGVvLCBDVlBp eGVsQnVmZmVyVW5sb2NrQmFzZUFkZHJlc3MsIENWUmV0dXJuLCAoQ1ZQaXhlbEJ1ZmZlclJlZiBw aXhlbEJ1ZmZlciwgQ1ZPcHRpb25GbGFncyBsb2NrRmxhZ3MpLCAocGl4ZWxCdWZmZXIsIGxvY2tG bGFncykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Db3JlVmlk ZW9Tb2Z0TGluay5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvQ29yZVZpZGVvU29m dExpbmsuaAppbmRleCAwMzczMjA0OTY5NmVmZWU0MWZhOWNkMjU0ZDM5N2FjNTkyNTBhNjE2Li5k ZGQ2NzFjZmU1OWRiYzgwYzcxNzk0ZTQwYzI4Y2Y2NTRiNTE0Y2IzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9Db3JlVmlkZW9Tb2Z0TGluay5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0NvcmVWaWRlb1NvZnRMaW5rLmgKQEAgLTU4LDYgKzU4 LDggQEAgU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29yZVZpZGVvLCBD VlBpeGVsQnVmZmVyR2V0Qnl0ZXNQZXJSb3dPZlAKICNkZWZpbmUgQ1ZQaXhlbEJ1ZmZlckdldEJ5 dGVzUGVyUm93T2ZQbGFuZSBzb2Z0TGlua19Db3JlVmlkZW9fQ1ZQaXhlbEJ1ZmZlckdldEJ5dGVz UGVyUm93T2ZQbGFuZQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29y ZVZpZGVvLCBDVlBpeGVsQnVmZmVyR2V0UGl4ZWxGb3JtYXRUeXBlLCBPU1R5cGUsIChDVlBpeGVs QnVmZmVyUmVmIHBpeGVsQnVmZmVyKSwgKHBpeGVsQnVmZmVyKSkKICNkZWZpbmUgQ1ZQaXhlbEJ1 ZmZlckdldFBpeGVsRm9ybWF0VHlwZSBzb2Z0TGlua19Db3JlVmlkZW9fQ1ZQaXhlbEJ1ZmZlckdl dFBpeGVsRm9ybWF0VHlwZQorU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwg Q29yZVZpZGVvLCBDVlBpeGVsQnVmZmVyR2V0UGxhbmVDb3VudCwgc2l6ZV90LCAoQ1ZQaXhlbEJ1 ZmZlclJlZiBwaXhlbEJ1ZmZlciksIChwaXhlbEJ1ZmZlcikpCisjZGVmaW5lIENWUGl4ZWxCdWZm ZXJHZXRQbGFuZUNvdW50IHNvZnRMaW5rX0NvcmVWaWRlb19DVlBpeGVsQnVmZmVyR2V0UGxhbmVD b3VudAogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29yZVZpZGVvLCBD VlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5lLCB2b2lkICosIChDVlBpeGVsQnVmZmVy UmVmIHBpeGVsQnVmZmVyLCBzaXplX3QgcGxhbmVJbmRleCksIChwaXhlbEJ1ZmZlciwgcGxhbmVJ bmRleCkpOwogI2RlZmluZSBDVlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5lIHNvZnRM aW5rX0NvcmVWaWRlb19DVlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5lCiBTT0ZUX0xJ TktfRlVOQ1RJT05fRk9SX0hFQURFUihXZWJDb3JlLCBDb3JlVmlkZW8sIENWUGl4ZWxCdWZmZXJM b2NrQmFzZUFkZHJlc3MsIENWUmV0dXJuLCAoQ1ZQaXhlbEJ1ZmZlclJlZiBwaXhlbEJ1ZmZlciwg Q1ZPcHRpb25GbGFncyBsb2NrRmxhZ3MpLCAocGl4ZWxCdWZmZXIsIGxvY2tGbGFncykpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9TaGFyZWRWaWRlb0ZyYW1lSW5m by5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1NoYXJlZFZpZGVvRnJhbWVJbmZv Lm1tCmluZGV4IDA4YzZjY2Q4ODUzNzFmYWYxZDExOGUzOWRhMjNhZTMyZDg0NTliZGUuLmNlYWZi ZmQ3MWJiYzhkNThkYTNiNTE0MzEyNzA2ZjI1MGVjYWQyYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2NvY29hL1NoYXJlZFZpZGVvRnJhbWVJbmZvLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1NoYXJlZFZpZGVvRnJhbWVJbmZvLm1tCkBAIC0zNCwx MCArMzQsNiBAQAogI2luY2x1ZGUgPHd0Zi9TY29wZS5oPgogI2luY2x1ZGUgPHd0Zi9wZXJzaXN0 ZW5jZS9QZXJzaXN0ZW50Q29kZXJzLmg+CiAKLSNpZiBVU0UoQUNDRUxFUkFURSkKLSNpbmNsdWRl IDxBY2NlbGVyYXRlL0FjY2VsZXJhdGUuaD4KLSNlbmRpZgotCiAjaWYgVVNFKExJQldFQlJUQykK IAogQUxMT1dfVU5VU0VEX1BBUkFNRVRFUlNfQkVHSU4KQEAgLTYzLDExICs1OSw5IEBAIFNoYXJl ZFZpZGVvRnJhbWVJbmZvIFNoYXJlZFZpZGVvRnJhbWVJbmZvOjpmcm9tQ1ZQaXhlbEJ1ZmZlcihD VlBpeGVsQnVmZmVyUmVmIHBpCiBib29sIFNoYXJlZFZpZGVvRnJhbWVJbmZvOjppc1JlYWRXcml0 ZVN1cHBvcnRlZCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fYnVmZmVyVHlwZSA9PSBrQ1ZQaXhl bEZvcm1hdFR5cGVfNDIwWXBDYkNyOEJpUGxhbmFyVmlkZW9SYW5nZQotI2lmIFVTRShBQ0NFTEVS QVRFKQotICAgICAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9ybWF0VHlwZV8z MkJHUkEKLSNlbmRpZgotICAgICAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9y bWF0VHlwZV80MjBZcENiQ3I4QmlQbGFuYXJGdWxsUmFuZ2UKLSAgICAgICAgICAgIHx8IG1fYnVm ZmVyVHlwZSA9PSBrQ1ZQaXhlbEZvcm1hdFR5cGVfNDIwWXBDYkNyMTBCaVBsYW5hckZ1bGxSYW5n ZTsKKyAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9ybWF0VHlwZV8zMkJHUkEK KyAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9ybWF0VHlwZV80MjBZcENiQ3I4 QmlQbGFuYXJGdWxsUmFuZ2UKKyAgICAgICAgfHwgbV9idWZmZXJUeXBlID09IGtDVlBpeGVsRm9y bWF0VHlwZV80MjBZcENiQ3IxMEJpUGxhbmFyRnVsbFJhbmdlOwogfQogCiBzaXplX3QgU2hhcmVk VmlkZW9GcmFtZUluZm86OnN0b3JhZ2VTaXplKCkgY29uc3QKQEAgLTEzMSwzOSArMTI1LDIxIEBA IHN0ZDo6b3B0aW9uYWw8U2hhcmVkVmlkZW9GcmFtZUluZm8+IFNoYXJlZFZpZGVvRnJhbWVJbmZv OjpkZWNvZGUoU3Bhbjxjb25zdCB1aW50CiAgICAgcmV0dXJuIFNoYXJlZFZpZGVvRnJhbWVJbmZv IHsgKmJ1ZmZlclR5cGUsICp3aWR0aCwgKmhlaWdodCwgKmJ5dGVzUGVyUm93ICwgKndpZHRoUGxh bmVCLCAqaGVpZ2h0UGxhbmVCLCAqYnl0ZXNQZXJSb3dQbGFuZUIgfTsKIH0KIAotUmV0YWluUHRy PENWUGl4ZWxCdWZmZXJSZWY+IFNoYXJlZFZpZGVvRnJhbWVJbmZvOjpjcmVhdGVQaXhlbEJ1ZmZl ckZyb21NZW1vcnkoY29uc3QgdWludDhfdCogZGF0YSwgQ1ZQaXhlbEJ1ZmZlclBvb2xSZWYgYnVm ZmVyUG9vbCkKK3N0YXRpYyBjb25zdCB1aW50OF90KiBjb3B5VG9DVlBpeGVsQnVmZmVyUGxhbmUo Q1ZQaXhlbEJ1ZmZlclJlZiBwaXhlbEJ1ZmZlciwgc2l6ZV90IHBsYW5lSW5kZXgsIGNvbnN0IHVp bnQ4X3QqIHNvdXJjZSwgc2l6ZV90IGhlaWdodCwgdWludDMyX3QgYnl0ZXNQZXJSb3dTb3VyY2Up CiB7Ci0gICAgQVNTRVJUKGlzUmVhZFdyaXRlU3VwcG9ydGVkKCkpOwotICAgIGlmIChtX2J1ZmZl clR5cGUgPT0ga0NWUGl4ZWxGb3JtYXRUeXBlXzMyQkdSQSkgewotI2lmIFVTRShBQ0NFTEVSQVRF KQotICAgICAgICBJbnRTaXplIHNpemUgeyBzdGF0aWNfY2FzdDxpbnQ+KG1fd2lkdGgpLCBzdGF0 aWNfY2FzdDxpbnQ+KG1faGVpZ2h0KSB9OwotICAgICAgICBhdXRvIGlvU3VyZmFjZSA9IElPU3Vy ZmFjZTo6Y3JlYXRlKHNpemUsIERlc3RpbmF0aW9uQ29sb3JTcGFjZTo6U1JHQigpLCBJT1N1cmZh Y2U6OkZvcm1hdDo6QkdSQSk7Ci0KLSAgICAgICAgSU9TdXJmYWNlOjpMb2NrZXIgbG9jaygqaW9T dXJmYWNlKTsKLSAgICAgICAgdkltYWdlX0J1ZmZlciBzcmM7Ci0gICAgICAgIHNyYy53aWR0aCA9 IG1fd2lkdGg7Ci0gICAgICAgIHNyYy5oZWlnaHQgPSBtX2hlaWdodDsKLSAgICAgICAgc3JjLnJv d0J5dGVzID0gbV9ieXRlc1BlclJvdzsKLSAgICAgICAgc3JjLmRhdGEgPSBjb25zdF9jYXN0PHVp bnQ4X3QqPihkYXRhKTsKLQotICAgICAgICB2SW1hZ2VfQnVmZmVyIGRlc3Q7Ci0gICAgICAgIGRl c3Qud2lkdGggPSBtX3dpZHRoOwotICAgICAgICBkZXN0LmhlaWdodCA9IG1faGVpZ2h0OwotICAg ICAgICBkZXN0LnJvd0J5dGVzID0gaW9TdXJmYWNlLT5ieXRlc1BlclJvdygpOwotICAgICAgICBk ZXN0LmRhdGEgPSBsb2NrLnN1cmZhY2VCYXNlQWRkcmVzcygpOwotCi0gICAgICAgIHZJbWFnZVVu cHJlbXVsdGlwbHlEYXRhX0JHUkE4ODg4KCZzcmMsICZkZXN0LCBrdkltYWdlTm9GbGFncyk7Ci0K LSAgICAgICAgYXV0byBwaXhlbEJ1ZmZlciA9IFdlYkNvcmU6OmNyZWF0ZUNWUGl4ZWxCdWZmZXIo aW9TdXJmYWNlLT5zdXJmYWNlKCkpOwotICAgICAgICBpZiAoIXBpeGVsQnVmZmVyKQotICAgICAg ICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgIHJldHVybiBXVEZNb3ZlKCpwaXhlbEJ1ZmZl cik7Ci0jZWxzZQotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgImNyZWF0ZUlPU3Vy ZmFjZUZyb21TaGFyZWRNZW1vcnkgY2Fubm90IGNvbnZlcnQgdG8gSU9TdXJmYWNlIik7Ci0gICAg ICAgIHJldHVybiBudWxscHRyOwotI2VuZGlmCisgICAgYXV0byogZGVzdGluYXRpb24gPSBzdGF0 aWNfY2FzdDx1aW50OF90Kj4oQ1ZQaXhlbEJ1ZmZlckdldEJhc2VBZGRyZXNzT2ZQbGFuZShwaXhl bEJ1ZmZlciwgcGxhbmVJbmRleCkpOworICAgIHVpbnQzMl90IGJ5dGVzUGVyUm93RGVzdGluYXRp b24gPSBDVlBpeGVsQnVmZmVyR2V0Qnl0ZXNQZXJSb3dPZlBsYW5lKHBpeGVsQnVmZmVyLCBwbGFu ZUluZGV4KTsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaGVpZ2h0OyArK2kpIHsKKyAg ICAgICAgc3RkOjptZW1jcHkoZGVzdGluYXRpb24sIHNvdXJjZSwgc3RkOjptaW4oYnl0ZXNQZXJS b3dTb3VyY2UsIGJ5dGVzUGVyUm93RGVzdGluYXRpb24pKTsKKyAgICAgICAgc291cmNlICs9IGJ5 dGVzUGVyUm93U291cmNlOworICAgICAgICBkZXN0aW5hdGlvbiArPSBieXRlc1BlclJvd0Rlc3Rp bmF0aW9uOwogICAgIH0KKyAgICByZXR1cm4gc291cmNlOworfQogCitSZXRhaW5QdHI8Q1ZQaXhl bEJ1ZmZlclJlZj4gU2hhcmVkVmlkZW9GcmFtZUluZm86OmNyZWF0ZVBpeGVsQnVmZmVyRnJvbU1l bW9yeShjb25zdCB1aW50OF90KiBkYXRhLCBDVlBpeGVsQnVmZmVyUG9vbFJlZiBidWZmZXJQb29s KQoreworICAgIEFTU0VSVChpc1JlYWRXcml0ZVN1cHBvcnRlZCgpKTsKICAgICBDVlBpeGVsQnVm ZmVyUmVmIHJhd1BpeGVsQnVmZmVyID0gbnVsbHB0cjsKICAgICBpZiAoYnVmZmVyUG9vbCkgewog ICAgICAgICBhdXRvIHN0YXR1cyA9IENWUGl4ZWxCdWZmZXJQb29sQ3JlYXRlUGl4ZWxCdWZmZXIo a0NGQWxsb2NhdG9yRGVmYXVsdCwgYnVmZmVyUG9vbCwgJnJhd1BpeGVsQnVmZmVyKTsKQEAgLTE4 OCwyNiArMTY0LDEzIEBAIFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVmPiBTaGFyZWRWaWRlb0Zy YW1lSW5mbzo6Y3JlYXRlUGl4ZWxCdWZmZXJGcm9tTWVtb3J5KGNvCiAgICAgICAgIENWUGl4ZWxC dWZmZXJVbmxvY2tCYXNlQWRkcmVzcyhyYXdQaXhlbEJ1ZmZlciwgMCk7CiAgICAgfSk7CiAKLSAg ICBpZiAoQ1ZQaXhlbEJ1ZmZlckdldFdpZHRoT2ZQbGFuZShyYXdQaXhlbEJ1ZmZlciwgMSkgIT0g bV93aWR0aFBsYW5lQiB8fCBDVlBpeGVsQnVmZmVyR2V0SGVpZ2h0T2ZQbGFuZShyYXdQaXhlbEJ1 ZmZlciwgMSkgIT0gbV9oZWlnaHRQbGFuZUIpCi0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0g ICAgYXV0byogcGxhbmVBID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+KENWUGl4ZWxCdWZmZXJHZXRC YXNlQWRkcmVzc09mUGxhbmUocmF3UGl4ZWxCdWZmZXIsIDApKTsKLSAgICB1aW50MzJfdCBieXRl c1BlclJvd1BsYW5lQSA9IENWUGl4ZWxCdWZmZXJHZXRCeXRlc1BlclJvd09mUGxhbmUocmF3UGl4 ZWxCdWZmZXIsIDApOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2hlaWdodDsgKytp KSB7Ci0gICAgICAgIHN0ZDo6bWVtY3B5KHBsYW5lQSwgZGF0YSwgc3RkOjptaW4oYnl0ZXNQZXJS b3dQbGFuZUEsIG1fYnl0ZXNQZXJSb3cpKTsKLSAgICAgICAgcGxhbmVBICs9IGJ5dGVzUGVyUm93 UGxhbmVBOwotICAgICAgICBkYXRhICs9IG1fYnl0ZXNQZXJSb3c7Ci0gICAgfQotCi0gICAgYXV0 byogcGxhbmVCID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+KENWUGl4ZWxCdWZmZXJHZXRCYXNlQWRk cmVzc09mUGxhbmUocmF3UGl4ZWxCdWZmZXIsIDEpKTsKLSAgICB1aW50MzJfdCBieXRlc1BlclJv d1BsYW5lQiA9IENWUGl4ZWxCdWZmZXJHZXRCeXRlc1BlclJvd09mUGxhbmUocmF3UGl4ZWxCdWZm ZXIsIDEpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2hlaWdodFBsYW5lQjsgKytp KSB7Ci0gICAgICAgIHN0ZDo6bWVtY3B5KHBsYW5lQiwgZGF0YSwgc3RkOjptaW4oYnl0ZXNQZXJS b3dQbGFuZUIsIG1fYnl0ZXNQZXJSb3dQbGFuZUIpKTsKLSAgICAgICAgcGxhbmVCICs9IGJ5dGVz UGVyUm93UGxhbmVCOwotICAgICAgICBkYXRhICs9IG1fYnl0ZXNQZXJSb3dQbGFuZUI7CisgICAg ZGF0YSA9IGNvcHlUb0NWUGl4ZWxCdWZmZXJQbGFuZShyYXdQaXhlbEJ1ZmZlciwgMCwgZGF0YSwg bV9oZWlnaHQsIG1fYnl0ZXNQZXJSb3cpOworICAgIGlmIChDVlBpeGVsQnVmZmVyR2V0UGxhbmVD b3VudChyYXdQaXhlbEJ1ZmZlcikgPT0gMikgeworICAgICAgICBpZiAoQ1ZQaXhlbEJ1ZmZlckdl dFdpZHRoT2ZQbGFuZShyYXdQaXhlbEJ1ZmZlciwgMSkgIT0gbV93aWR0aFBsYW5lQiB8fCBDVlBp eGVsQnVmZmVyR2V0SGVpZ2h0T2ZQbGFuZShyYXdQaXhlbEJ1ZmZlciwgMSkgIT0gbV9oZWlnaHRQ bGFuZUIpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgY29weVRvQ1ZQaXhl bEJ1ZmZlclBsYW5lKHJhd1BpeGVsQnVmZmVyLCAxLCBkYXRhLCBtX2hlaWdodFBsYW5lQiwgbV9i eXRlc1BlclJvd1BsYW5lQik7CiAgICAgfQogCi0gICAgQ1ZQaXhlbEJ1ZmZlclVubG9ja0Jhc2VB ZGRyZXNzKHJhd1BpeGVsQnVmZmVyLCAwKTsKICAgICByZXR1cm4gcGl4ZWxCdWZmZXI7CiB9CiAK QEAgLTIyNCwzNSArMTg3LDE1IEBAIGJvb2wgU2hhcmVkVmlkZW9GcmFtZUluZm86OndyaXRlUGl4 ZWxCdWZmZXIoQ1ZQaXhlbEJ1ZmZlclJlZiBwaXhlbEJ1ZmZlciwgdWludDhfCiAgICAgZW5jb2Rl KGRhdGEpOwogICAgIGRhdGEgKz0gc2l6ZW9mKFNoYXJlZFZpZGVvRnJhbWVJbmZvKTsKIAotICAg IGlmIChtX2J1ZmZlclR5cGUgPT0ga0NWUGl4ZWxGb3JtYXRUeXBlXzMyQkdSQSkgewotI2lmIFVT RShBQ0NFTEVSQVRFKQotICAgICAgICB2SW1hZ2VfQnVmZmVyIHNyYzsKLSAgICAgICAgc3JjLndp ZHRoID0gbV93aWR0aDsKLSAgICAgICAgc3JjLmhlaWdodCA9IG1faGVpZ2h0OwotICAgICAgICBz cmMucm93Qnl0ZXMgPSBtX2J5dGVzUGVyUm93OwotICAgICAgICBzcmMuZGF0YSA9IENWUGl4ZWxC dWZmZXJHZXRCYXNlQWRkcmVzcyhwaXhlbEJ1ZmZlcik7Ci0KLSAgICAgICAgdkltYWdlX0J1ZmZl ciBkZXN0OwotICAgICAgICBkZXN0LndpZHRoID0gbV93aWR0aDsKLSAgICAgICAgZGVzdC5oZWln aHQgPSBtX2hlaWdodDsKLSAgICAgICAgZGVzdC5yb3dCeXRlcyA9IG1fYnl0ZXNQZXJSb3c7Ci0g ICAgICAgIGRlc3QuZGF0YSA9IGRhdGE7Ci0KLSAgICAgICAgdkltYWdlVW5wcmVtdWx0aXBseURh dGFfQkdSQTg4ODgoJnNyYywgJmRlc3QsIGt2SW1hZ2VOb0ZsYWdzKTsKLQotICAgICAgICByZXR1 cm4gdHJ1ZTsKLSNlbHNlCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSNlbmRpZgotICAgIH0KLQot ICAgIGNvbnN0IHVpbnQ4X3QgKnBsYW5lQSA9IHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QgKj4o Q1ZQaXhlbEJ1ZmZlckdldEJhc2VBZGRyZXNzT2ZQbGFuZShwaXhlbEJ1ZmZlciwgMCkpOwotICAg IGNvbnN0IHVpbnQ4X3QgKnBsYW5lQiA9IHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QgKj4oQ1ZQ aXhlbEJ1ZmZlckdldEJhc2VBZGRyZXNzT2ZQbGFuZShwaXhlbEJ1ZmZlciwgMSkpOwotCisgICAg YXV0byogcGxhbmVBID0gc3RhdGljX2Nhc3Q8Y29uc3QgdWludDhfdCo+KENWUGl4ZWxCdWZmZXJH ZXRCYXNlQWRkcmVzc09mUGxhbmUocGl4ZWxCdWZmZXIsIDApKTsKICAgICBzaXplX3QgcGxhbmVB U2l6ZSA9IG1faGVpZ2h0ICogbV9ieXRlc1BlclJvdzsKICAgICBzdGQ6Om1lbWNweShkYXRhLCBw bGFuZUEsIHBsYW5lQVNpemUpOwotICAgIHNpemVfdCBwbGFuZUJTaXplID0gbV9oZWlnaHRQbGFu ZUIgKiBtX2J5dGVzUGVyUm93UGxhbmVCOwotICAgIHN0ZDo6bWVtY3B5KGRhdGEgKyBwbGFuZUFT aXplLCBwbGFuZUIsIHBsYW5lQlNpemUpOworCisgICAgaWYgKENWUGl4ZWxCdWZmZXJHZXRQbGFu ZUNvdW50KHBpeGVsQnVmZmVyKSA9PSAyKSB7CisgICAgICAgIGF1dG8qIHBsYW5lQiA9IHN0YXRp Y19jYXN0PGNvbnN0IHVpbnQ4X3QqPihDVlBpeGVsQnVmZmVyR2V0QmFzZUFkZHJlc3NPZlBsYW5l KHBpeGVsQnVmZmVyLCAxKSk7CisgICAgICAgIHNpemVfdCBwbGFuZUJTaXplID0gbV9oZWlnaHRQ bGFuZUIgKiBtX2J5dGVzUGVyUm93UGxhbmVCOworICAgICAgICBzdGQ6Om1lbWNweShkYXRhICsg cGxhbmVBU2l6ZSwgcGxhbmVCLCBwbGFuZUJTaXplKTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1 ZTsKIH0K