224700 2021-04-16 15:46:19 -0700 [Cleanup] inlineLogicalWidth should take const RenderObject& 2021-04-24 15:07:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1751293 0 zalan 2021-04-16 15:46:19 -0700 and not RenderObject* 1751368 1 426311 zalan 2021-04-16 19:21:53 -0700 Created attachment 426311 Patch 1751376 2 426315 zalan 2021-04-16 20:29:07 -0700 Created attachment 426315 Patch 1751416 3 ews-feeder 2021-04-17 06:48:07 -0700 Committed r276200 (236682@main): <https://commits.webkit.org/236682@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426315. 1753933 4 webkit-bug-importer 2021-04-24 15:07:55 -0700 <rdar://problem/77110103> 426311 2021-04-16 19:21:53 -0700 2021-04-16 19:48:27 -0700 Patch bug-224700-20210416192152.patch text/plain 10688 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjUyZGUzNGJmY2ZkNDNm MTI3YjFjNDNlY2E1MGJjZmUwOTRhMjVlMC4uZDQ2ZTA2ZmI1NjgyZGM4MjczYzEzMzUxMDc0NmY4 MmIwN2VlYTJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA0LTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NsZWFudXBdIGlubGluZUxv Z2ljYWxXaWR0aCBzaG91bGQgdGFrZSBjb25zdCBSZW5kZXJPYmplY3QmCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ3MDAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBpbmxpbmVMb2dpY2FsV2lkdGgg dGFrZXMgY29uc3QgUmVuZGVyT2JqZWN0JiBub3cuCisgICAgICAgIDIuIEJvdGggcHJldmlvdXNJ bkZsb3dTaWJsaW5nIGFuZCBzaG91bGRBZGRCb3JkZXJQYWRkaW5nTWFyZ2luIG1vdmVkIHRvIGlu bGluZUxvZ2ljYWxXaWR0aAorCisgICAgICAgICogcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250 ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjppbmxpbmVMb2dpY2FsV2lkdGgpOgorICAgICAgICAo V2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVPdXRPZkZsb3dQb3NpdGlvbmVkKToKKyAg ICAgICAgKFdlYkNvcmU6OkJyZWFraW5nQ29udGV4dDo6aGFuZGxlRW1wdHlJbmxpbmUpOgorICAg ICAgICAoV2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVSZXBsYWNlZCk6CisgICAgICAg IChXZWJDb3JlOjpCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6c2hvdWxkQWRkQm9yZGVyUGFkZGluZ01hcmdpbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpwcmV2aW91c0luRmxvd1NpYmxpbmcpOiBEZWxldGVkLgorCiAyMDIxLTA0LTE2ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVVBdIFdlYkNvbnRlbnQg cHJvY2VzcyBzaG91bGQgbm90IGNyZWF0ZSBBVk91dHB1dENvbnRleHQgaW5zdGFuY2VzIHdoZW4g bWVkaWEgaW4gR1BVIFByb2Nlc3MgaXMgZW5hYmxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAppbmRleCA2MDY0YzczZDc4NTY4ZmM4Y2UwYTE1 ZjIxMTU0OTEyNTgwMWE5ODIwLi5jNzIzY2I2MzgxNzc4MDU3YmZmMzI3NDBlMjlhNDAxYTY0ZDE0 NTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0Nv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRl eHQuaApAQCAtMzE3LDQwICszMTcsMzggQEAgaW5saW5lIExheW91dFVuaXQgYm9yZGVyUGFkZGlu Z01hcmdpbkVuZChjb25zdCBSZW5kZXJJbmxpbmUmIGNoaWxkKQogICAgIHJldHVybiBjaGlsZC5t YXJnaW5FbmQoKSArIGNoaWxkLnBhZGRpbmdFbmQoKSArIGNoaWxkLmJvcmRlckVuZCgpOwogfQog Ci1pbmxpbmUgYm9vbCBzaG91bGRBZGRCb3JkZXJQYWRkaW5nTWFyZ2luKFJlbmRlck9iamVjdCog Y2hpbGQpCitpbmxpbmUgTGF5b3V0VW5pdCBpbmxpbmVMb2dpY2FsV2lkdGgoY29uc3QgUmVuZGVy T2JqZWN0JiByZW5kZXJlciwgYm9vbCBjaGVja1N0YXJ0RWRnZSA9IHRydWUsIGJvb2wgY2hlY2tF bmRFZGdlID0gdHJ1ZSkKIHsKLSAgICBpZiAoIWNoaWxkKQotICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICAvLyBXaGVuIGRlY2lkaW5nIHdoZXRoZXIgd2UncmUgYXQgdGhlIGVkZ2Ugb2YgYW4gaW5s aW5lLCBhZGphY2VudCBjb2xsYXBzZWQgd2hpdGVzcGFjZSBpcyB0aGUgc2FtZSBhcyBubyBzaWJs aW5nIGF0IGFsbC4KLSAgICBpZiAoaXM8UmVuZGVyVGV4dD4oKmNoaWxkKSAmJiAhZG93bmNhc3Q8 UmVuZGVyVGV4dD4oKmNoaWxkKS50ZXh0KCkubGVuZ3RoKCkpCi0gICAgICAgIHJldHVybiB0cnVl OworICAgIGF1dG8gcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gW10oY29uc3QgYXV0byYgcmVuZGVy ZXIpIHsKKyAgICAgICAgYXV0byogcHJldmlvdXNTaWJsaW5nID0gcmVuZGVyZXIucHJldmlvdXNT aWJsaW5nKCk7CisgICAgICAgIGZvciAoOyBwcmV2aW91c1NpYmxpbmcgJiYgcHJldmlvdXNTaWJs aW5nLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKTsgcHJldmlvdXNTaWJsaW5nID0gcHJldmlvdXNT aWJsaW5nLT5wcmV2aW91c1NpYmxpbmcoKSkgeyB9CisgICAgICAgIHJldHVybiBwcmV2aW91c1Np Ymxpbmc7CisgICAgfTsKKworICAgIGF1dG8gc2hvdWxkQWRkQm9yZGVyUGFkZGluZ01hcmdpbiA9 IFtdKGNvbnN0IGF1dG8mIHJlbmRlcmVyKSB7CisgICAgICAgIC8vIFdoZW4gZGVjaWRpbmcgd2hl dGhlciB3ZSdyZSBhdCB0aGUgZWRnZSBvZiBhbiBpbmxpbmUsIGFkamFjZW50IGNvbGxhcHNlZCB3 aGl0ZXNwYWNlIGlzIHRoZSBzYW1lIGFzIG5vIHNpYmxpbmcgYXQgYWxsLgorICAgICAgICBpZiAo aXM8UmVuZGVyVGV4dD4ocmVuZGVyZXIpICYmICFkb3duY2FzdDxSZW5kZXJUZXh0PihyZW5kZXJl cikudGV4dCgpLmxlbmd0aCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAjaWYgRU5BQkxF KENTU19CT1hfREVDT1JBVElPTl9CUkVBSykKLSAgICBpZiAoaXM8UmVuZGVyTGluZUJyZWFrPigq Y2hpbGQpICYmIGNoaWxkLT5wYXJlbnQoKS0+c3R5bGUoKS5ib3hEZWNvcmF0aW9uQnJlYWsoKSA9 PSBCb3hEZWNvcmF0aW9uQnJlYWs6OkNsb25lKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgaWYgKGlzPFJlbmRlckxpbmVCcmVhaz4ocmVuZGVyZXIpICYmIHJlbmRlcmVyLnBhcmVudCgp LT5zdHlsZSgpLmJveERlY29yYXRpb25CcmVhaygpID09IEJveERlY29yYXRpb25CcmVhazo6Q2xv bmUpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZgotICAgIHJldHVybiBmYWxzZTsK LX0KLQotaW5saW5lIFJlbmRlck9iamVjdCogcHJldmlvdXNJbkZsb3dTaWJsaW5nKFJlbmRlck9i amVjdCogY2hpbGQpCi17Ci0gICAgZG8gewotICAgICAgICBjaGlsZCA9IGNoaWxkLT5wcmV2aW91 c1NpYmxpbmcoKTsKLSAgICB9IHdoaWxlIChjaGlsZCAmJiBjaGlsZC0+aXNPdXRPZkZsb3dQb3Np dGlvbmVkKCkpOwotICAgIHJldHVybiBjaGlsZDsKLX0KKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH07CiAKLWlubGluZSBMYXlvdXRVbml0IGlubGluZUxvZ2ljYWxXaWR0aChSZW5kZXJPYmpl Y3QqIGNoaWxkLCBib29sIGNoZWNrU3RhcnRFZGdlID0gdHJ1ZSwgYm9vbCBjaGVja0VuZEVkZ2Ug PSB0cnVlKQotewotICAgIHVuc2lnbmVkIGxpbmVEZXB0aCA9IDE7Ci0gICAgTGF5b3V0VW5pdCBl eHRyYVdpZHRoOwotICAgIFJlbmRlckVsZW1lbnQqIHBhcmVudCA9IGNoaWxkLT5wYXJlbnQoKTsK KyAgICBzaXplX3QgbGluZURlcHRoID0gMTsKKyAgICBhdXRvIGV4dHJhV2lkdGggPSBMYXlvdXRV bml0IHsgfTsKKyAgICBhdXRvKiBwYXJlbnQgPSByZW5kZXJlci5wYXJlbnQoKTsKKyAgICBhdXRv KiBjaGlsZCA9ICZyZW5kZXJlcjsKICAgICB3aGlsZSAoaXM8UmVuZGVySW5saW5lPigqcGFyZW50 KSAmJiBsaW5lRGVwdGgrKyA8IGNNYXhMaW5lRGVwdGgpIHsKICAgICAgICAgY29uc3QgYXV0byYg cGFyZW50QXNSZW5kZXJJbmxpbmUgPSBkb3duY2FzdDxSZW5kZXJJbmxpbmU+KCpwYXJlbnQpOwog ICAgICAgICBpZiAoIWlzRW1wdHlJbmxpbmUocGFyZW50QXNSZW5kZXJJbmxpbmUpKSB7Ci0gICAg ICAgICAgICBjaGVja1N0YXJ0RWRnZSA9IGNoZWNrU3RhcnRFZGdlICYmIHNob3VsZEFkZEJvcmRl clBhZGRpbmdNYXJnaW4ocHJldmlvdXNJbkZsb3dTaWJsaW5nKGNoaWxkKSk7CisgICAgICAgICAg ICBhdXRvKiBwcmV2aW91c1NpYmxpbmcgPSBwcmV2aW91c0luRmxvd1NpYmxpbmcoKmNoaWxkKTsK KyAgICAgICAgICAgIGNoZWNrU3RhcnRFZGdlID0gY2hlY2tTdGFydEVkZ2UgJiYgcHJldmlvdXNT aWJsaW5nICYmIHNob3VsZEFkZEJvcmRlclBhZGRpbmdNYXJnaW4oKnByZXZpb3VzU2libGluZyk7 CiAgICAgICAgICAgICBpZiAoY2hlY2tTdGFydEVkZ2UpCiAgICAgICAgICAgICAgICAgZXh0cmFX aWR0aCArPSBib3JkZXJQYWRkaW5nTWFyZ2luU3RhcnQocGFyZW50QXNSZW5kZXJJbmxpbmUpOwot ICAgICAgICAgICAgY2hlY2tFbmRFZGdlID0gY2hlY2tFbmRFZGdlICYmIHNob3VsZEFkZEJvcmRl clBhZGRpbmdNYXJnaW4oY2hpbGQtPm5leHRTaWJsaW5nKCkpOworICAgICAgICAgICAgYXV0byog bmV4dFNpYmxpbmcgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKTsKKyAgICAgICAgICAgIGNoZWNrRW5k RWRnZSA9IGNoZWNrRW5kRWRnZSAmJiBuZXh0U2libGluZyAmJiBzaG91bGRBZGRCb3JkZXJQYWRk aW5nTWFyZ2luKCpuZXh0U2libGluZyk7CiAgICAgICAgICAgICBpZiAoY2hlY2tFbmRFZGdlKQog ICAgICAgICAgICAgICAgIGV4dHJhV2lkdGggKz0gYm9yZGVyUGFkZGluZ01hcmdpbkVuZChwYXJl bnRBc1JlbmRlcklubGluZSk7CiAgICAgICAgICAgICBpZiAoIWNoZWNrU3RhcnRFZGdlICYmICFj aGVja0VuZEVkZ2UpCkBAIC0zNTgsNiArMzU2LDcgQEAgaW5saW5lIExheW91dFVuaXQgaW5saW5l TG9naWNhbFdpZHRoKFJlbmRlck9iamVjdCogY2hpbGQsIGJvb2wgY2hlY2tTdGFydEVkZ2UgPQog ICAgICAgICB9CiAgICAgICAgIGNoaWxkID0gcGFyZW50OwogICAgICAgICBwYXJlbnQgPSBjaGls ZC0+cGFyZW50KCk7CisgICAgICAgIEFTU0VSVChwYXJlbnQpOwogICAgIH0KICAgICByZXR1cm4g ZXh0cmFXaWR0aDsKIH0KQEAgLTM4Myw3ICszODIsNyBAQCBpbmxpbmUgdm9pZCBCcmVha2luZ0Nv bnRleHQ6OmhhbmRsZU91dE9mRmxvd1Bvc2l0aW9uZWQoVmVjdG9yPFJlbmRlckJveCo+JiBwb3Np dAogICAgIH0gZWxzZQogICAgICAgICBwb3NpdGlvbmVkT2JqZWN0cy5hcHBlbmQoJmJveCk7CiAK LSAgICBtX3dpZHRoLmFkZFVuY29tbWl0dGVkV2lkdGgoaW5saW5lTG9naWNhbFdpZHRoKCZib3gp KTsKKyAgICBtX3dpZHRoLmFkZFVuY29tbWl0dGVkV2lkdGgoaW5saW5lTG9naWNhbFdpZHRoKGJv eCkpOwogICAgIC8vIFJlc2V0IHByaW9yIGxpbmUgYnJlYWsgY29udGV4dCBjaGFyYWN0ZXJzLgog ICAgIG1fcmVuZGVyVGV4dEluZm8ubGluZUJyZWFrSXRlcmF0b3IucmVzZXRQcmlvckNvbnRleHQo KTsKIH0KQEAgLTQ1OCw3ICs0NTcsNyBAQCBpbmxpbmUgdm9pZCBCcmVha2luZ0NvbnRleHQ6Omhh bmRsZUVtcHR5SW5saW5lKCkKICAgICAgICAgICAgIG1fdHJhaWxpbmdPYmplY3RzLmFwcGVuZEJv eElmTmVlZGVkKGZsb3dCb3gpOwogICAgIH0KICAgICAKLSAgICBmbG9hdCBpbmxpbmVXaWR0aCA9 IGlubGluZUxvZ2ljYWxXaWR0aChtX2N1cnJlbnQucmVuZGVyZXIoKSkgKyBib3JkZXJQYWRkaW5n TWFyZ2luU3RhcnQoZmxvd0JveCkgKyBib3JkZXJQYWRkaW5nTWFyZ2luRW5kKGZsb3dCb3gpOwor ICAgIGZsb2F0IGlubGluZVdpZHRoID0gaW5saW5lTG9naWNhbFdpZHRoKCptX2N1cnJlbnQucmVu ZGVyZXIoKSkgKyBib3JkZXJQYWRkaW5nTWFyZ2luU3RhcnQoZmxvd0JveCkgKyBib3JkZXJQYWRk aW5nTWFyZ2luRW5kKGZsb3dCb3gpOwogICAgIG1fd2lkdGguYWRkVW5jb21taXR0ZWRXaWR0aChp bmxpbmVXaWR0aCk7CiAgICAgaWYgKG1faGFuZ3NBdEVuZCAmJiBpbmxpbmVXaWR0aCkKICAgICAg ICAgbV9oYW5nc0F0RW5kID0gZmFsc2U7CkBAIC00OTIsNyArNDkxLDcgQEAgaW5saW5lIHZvaWQg QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVSZXBsYWNlZCgpCiAKICAgICAvLyBPcHRpbWl6ZSBmb3Ig YSBjb21tb24gY2FzZS4gSWYgd2UgY2FuJ3QgZmluZCB3aGl0ZXNwYWNlIGFmdGVyIHRoZSBsaXN0 CiAgICAgLy8gaXRlbSwgdGhlbiB0aGlzIGlzIGFsbCBtb290LgotICAgIExheW91dFVuaXQgcmVw bGFjZWRMb2dpY2FsV2lkdGggPSBtX2Jsb2NrLmxvZ2ljYWxXaWR0aEZvckNoaWxkKHJlcGxhY2Vk Qm94KSArIG1fYmxvY2subWFyZ2luU3RhcnRGb3JDaGlsZChyZXBsYWNlZEJveCkgKyBtX2Jsb2Nr Lm1hcmdpbkVuZEZvckNoaWxkKHJlcGxhY2VkQm94KSArIGlubGluZUxvZ2ljYWxXaWR0aCgmcmVw bGFjZWRCb3gpOworICAgIExheW91dFVuaXQgcmVwbGFjZWRMb2dpY2FsV2lkdGggPSBtX2Jsb2Nr LmxvZ2ljYWxXaWR0aEZvckNoaWxkKHJlcGxhY2VkQm94KSArIG1fYmxvY2subWFyZ2luU3RhcnRG b3JDaGlsZChyZXBsYWNlZEJveCkgKyBtX2Jsb2NrLm1hcmdpbkVuZEZvckNoaWxkKHJlcGxhY2Vk Qm94KSArIGlubGluZUxvZ2ljYWxXaWR0aChyZXBsYWNlZEJveCk7CiAgICAgaWYgKGlzPFJlbmRl ckxpc3RNYXJrZXI+KHJlcGxhY2VkQm94KSkgewogICAgICAgICBpZiAobV9ibG9ja1N0eWxlLmNv bGxhcHNlV2hpdGVTcGFjZSgpICYmIHNob3VsZFNraXBXaGl0ZXNwYWNlQWZ0ZXJTdGFydE9iamVj dChtX2Jsb2NrLCAmcmVwbGFjZWRCb3gsIG1fbGluZVdoaXRlc3BhY2VDb2xsYXBzaW5nU3RhdGUp KSB7CiAgICAgICAgICAgICAvLyBMaWtlIHdpdGggaW5saW5lIGZsb3dzLCB3ZSBzdGFydCBpZ25v cmluZyBzcGFjZXMgdG8gbWFrZSBzdXJlIHRoYXQgYW55CkBAIC03MDMsNyArNzAyLDcgQEAgaW5s aW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdv cmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICBmbG9hdCBsYXN0U3BhY2VXb3JkU3BhY2luZyA9IDA7 CiAgICAgZmxvYXQgd29yZFNwYWNpbmdGb3JXb3JkTWVhc3VyZW1lbnQgPSAwOwogCi0gICAgZmxv YXQgd3JhcFdpZHRoT2Zmc2V0ID0gbV93aWR0aC51bmNvbW1pdHRlZFdpZHRoKCkgKyBpbmxpbmVM b2dpY2FsV2lkdGgobV9jdXJyZW50LnJlbmRlcmVyKCksICFtX2FwcGxpZWRTdGFydFdpZHRoLCB0 cnVlKTsKKyAgICBmbG9hdCB3cmFwV2lkdGhPZmZzZXQgPSBtX3dpZHRoLnVuY29tbWl0dGVkV2lk dGgoKSArIGlubGluZUxvZ2ljYWxXaWR0aCgqbV9jdXJyZW50LnJlbmRlcmVyKCksICFtX2FwcGxp ZWRTdGFydFdpZHRoLCB0cnVlKTsKICAgICBmbG9hdCB3cmFwVyA9IHdyYXBXaWR0aE9mZnNldDsK ICAgICBmbG9hdCBjaGFyV2lkdGggPSAwOwogICAgIGJvb2wgYnJlYWtOQlNQID0gbV9hdXRvV3Jh cCAmJiBtX2N1cnJlbnRTdHlsZS0+bmJzcE1vZGUoKSA9PSBOQlNQTW9kZTo6U3BhY2U7CkBAIC03 NTksMTIgKzc1OCwxMiBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQo V29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICAgICAgY2Fu QnJlYWtNaWRXb3JkID0gYnJlYWtBbGw7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoY2FuSGFu Z1B1bmN0dWF0aW9uQXRTdGFydCAmJiBtX3dpZHRoLmlzRmlyc3RMaW5lKCkgJiYgIW1fd2lkdGgu Y29tbWl0dGVkV2lkdGgoKSAmJiAhd3JhcFcgJiYgIWlubGluZUxvZ2ljYWxXaWR0aChtX2N1cnJl bnQucmVuZGVyZXIoKSwgdHJ1ZSwgZmFsc2UpKSB7CisgICAgICAgIGlmIChjYW5IYW5nUHVuY3R1 YXRpb25BdFN0YXJ0ICYmIG1fd2lkdGguaXNGaXJzdExpbmUoKSAmJiAhbV93aWR0aC5jb21taXR0 ZWRXaWR0aCgpICYmICF3cmFwVyAmJiAhaW5saW5lTG9naWNhbFdpZHRoKCptX2N1cnJlbnQucmVu ZGVyZXIoKSwgdHJ1ZSwgZmFsc2UpKSB7CiAgICAgICAgICAgICBtX3dpZHRoLmFkZFVuY29tbWl0 dGVkV2lkdGgoLXJlbmRlcmVyLmhhbmdhYmxlUHVuY3R1YXRpb25TdGFydFdpZHRoKG1fY3VycmVu dC5vZmZzZXQoKSkpOwogICAgICAgICAgICAgY2FuSGFuZ1B1bmN0dWF0aW9uQXRTdGFydCA9IGZh bHNlOwogICAgICAgICB9CiAgICAgICAgIAotICAgICAgICBpZiAoY2FuSGFuZ1B1bmN0dWF0aW9u QXRFbmQgJiYgIW1fbmV4dE9iamVjdCAmJiAoaW50KW1fY3VycmVudC5vZmZzZXQoKSA9PSBlbmRQ dW5jdHVhdGlvbkluZGV4ICYmICFpbmxpbmVMb2dpY2FsV2lkdGgobV9jdXJyZW50LnJlbmRlcmVy KCksIGZhbHNlLCB0cnVlKSkgeworICAgICAgICBpZiAoY2FuSGFuZ1B1bmN0dWF0aW9uQXRFbmQg JiYgIW1fbmV4dE9iamVjdCAmJiAoaW50KW1fY3VycmVudC5vZmZzZXQoKSA9PSBlbmRQdW5jdHVh dGlvbkluZGV4ICYmICFpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJlcigpLCBm YWxzZSwgdHJ1ZSkpIHsKICAgICAgICAgICAgIG1fd2lkdGguYWRkVW5jb21taXR0ZWRXaWR0aCgt cmVuZGVyZXIuaGFuZ2FibGVQdW5jdHVhdGlvbkVuZFdpZHRoKGVuZFB1bmN0dWF0aW9uSW5kZXgp KTsKICAgICAgICAgICAgIGNhbkhhbmdQdW5jdHVhdGlvbkF0RW5kID0gZmFsc2U7CiAgICAgICAg IH0KQEAgLTc5Nyw3ICs3OTYsNyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRs ZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICAg ICAgLy8gV2UgbmVlZCB0byBzZWUgaWYgYSBtZWFzdXJlbWVudCB0aGF0IGV4Y2x1ZGVzIHRoZSBz dG9wIHdvdWxkIGZpdC4gSWYgc28sIHRoZW4gd2Ugc2hvdWxkIGhhbmcKICAgICAgICAgICAgIC8v IHRoZSBzdG9wL2NvbW1hIGF0IHRoZSBlbmQuIEZpcnN0IG1lYXN1cmUgaW5jbHVkaW5nIHRoZSBj b21tYS4KICAgICAgICAgICAgIG1faGFuZ3NBdEVuZCA9IGZhbHNlOwotICAgICAgICAgICAgZmxv YXQgaW5saW5lU3RhcnRXaWR0aCA9ICFtX2FwcGxpZWRTdGFydFdpZHRoID8gaW5saW5lTG9naWNh bFdpZHRoKG1fY3VycmVudC5yZW5kZXJlcigpLCB0cnVlLCBmYWxzZSkgOiAwX2x1OworICAgICAg ICAgICAgZmxvYXQgaW5saW5lU3RhcnRXaWR0aCA9ICFtX2FwcGxpZWRTdGFydFdpZHRoID8gaW5s aW5lTG9naWNhbFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgdHJ1ZSwgZmFsc2UpIDogMF9s dTsKICAgICAgICAgICAgIGZsb2F0IHdpZHRoSW5jbHVkaW5nQ29tbWEgPSBjb21wdXRlQWRkaXRp b25hbEJldHdlZW5Xb3Jkc1dpZHRoKHJlbmRlcmVyLCB0ZXh0TGF5b3V0LCBjLCB3b3JkVHJhaWxp bmdTcGFjZSwgZmFsbGJhY2tGb250cywgd29yZE1lYXN1cmVtZW50cywgZm9udCwgaXNGaXhlZFBp dGNoLCBsYXN0U3BhY2UsIGxhc3RTcGFjZVdvcmRTcGFjaW5nLCB3b3JkU3BhY2luZ0ZvcldvcmRN ZWFzdXJlbWVudCwgbV9jdXJyZW50Lm9mZnNldCgpICsgMSkgKyBpbmxpbmVTdGFydFdpZHRoOwog ICAgICAgICAgICAgbV93aWR0aC5hZGRVbmNvbW1pdHRlZFdpZHRoKHdpZHRoSW5jbHVkaW5nQ29t bWEpOwogICAgICAgICAgICAgaWYgKCFtX3dpZHRoLmZpdHNPbkxpbmUoKSkgewpAQCAtODM3LDcg KzgzNiw3IEBAIGlubGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4dChXb3JkTWVh c3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzLCBib29sCiAgICAgICAgICAgICAgICAgbV93aWR0 aC5zZXRUcmFpbGluZ1doaXRlc3BhY2VXaWR0aChhZGRpdGlvbmFsVGVtcFdpZHRoKTsKIAogICAg ICAgICAgICAgaWYgKCFtX2FwcGxpZWRTdGFydFdpZHRoKSB7Ci0gICAgICAgICAgICAgICAgZmxv YXQgaW5saW5lU3RhcnRXaWR0aCA9IGlubGluZUxvZ2ljYWxXaWR0aChtX2N1cnJlbnQucmVuZGVy ZXIoKSwgdHJ1ZSwgZmFsc2UpOworICAgICAgICAgICAgICAgIGZsb2F0IGlubGluZVN0YXJ0V2lk dGggPSBpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJlcigpLCB0cnVlLCBmYWxz ZSk7CiAgICAgICAgICAgICAgICAgbV93aWR0aC5hZGRVbmNvbW1pdHRlZFdpZHRoKGlubGluZVN0 YXJ0V2lkdGgpOwogICAgICAgICAgICAgICAgIG1fYXBwbGllZFN0YXJ0V2lkdGggPSB0cnVlOwog ICAgICAgICAgICAgICAgIGlmIChtX2hhbmdzQXRFbmQgJiYgaW5saW5lU3RhcnRXaWR0aCkKQEAg LTEwNTAsNyArMTA0OSw3IEBAIGlubGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4 dChXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzLCBib29sCiAgICAgd29yZE1lYXN1 cmVtZW50LndpZHRoID0gbV9pZ25vcmluZ1NwYWNlcyA/IDAgOiBhZGRpdGlvbmFsVGVtcFdpZHRo ICsgd29yZFNwYWNpbmdGb3JXb3JkTWVhc3VyZW1lbnQ7CiAgICAgYWRkaXRpb25hbFRlbXBXaWR0 aCArPSBsYXN0U3BhY2VXb3JkU3BhY2luZzsKIAotICAgIGZsb2F0IGlubGluZUxvZ2ljYWxUZW1w V2lkdGggPSBpbmxpbmVMb2dpY2FsV2lkdGgobV9jdXJyZW50LnJlbmRlcmVyKCksICFtX2FwcGxp ZWRTdGFydFdpZHRoLCBtX2luY2x1ZGVFbmRXaWR0aCk7CisgICAgZmxvYXQgaW5saW5lTG9naWNh bFRlbXBXaWR0aCA9IGlubGluZUxvZ2ljYWxXaWR0aCgqbV9jdXJyZW50LnJlbmRlcmVyKCksICFt X2FwcGxpZWRTdGFydFdpZHRoLCBtX2luY2x1ZGVFbmRXaWR0aCk7CiAgICAgbV93aWR0aC5hZGRV bmNvbW1pdHRlZFdpZHRoKGFkZGl0aW9uYWxUZW1wV2lkdGggKyBpbmxpbmVMb2dpY2FsVGVtcFdp ZHRoKTsKICAgICBpZiAobV9oYW5nc0F0RW5kICYmIGlubGluZUxvZ2ljYWxUZW1wV2lkdGgpCiAg ICAgICAgIG1faGFuZ3NBdEVuZCA9IGZhbHNlOwo= 426315 2021-04-16 20:29:07 -0700 2021-04-17 06:48:08 -0700 Patch bug-224700-20210416202906.patch text/plain 10669 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjUyZGUzNGJmY2ZkNDNm MTI3YjFjNDNlY2E1MGJjZmUwOTRhMjVlMC4uZDQ2ZTA2ZmI1NjgyZGM4MjczYzEzMzUxMDc0NmY4 MmIwN2VlYTJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA0LTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NsZWFudXBdIGlubGluZUxv Z2ljYWxXaWR0aCBzaG91bGQgdGFrZSBjb25zdCBSZW5kZXJPYmplY3QmCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ3MDAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBpbmxpbmVMb2dpY2FsV2lkdGgg dGFrZXMgY29uc3QgUmVuZGVyT2JqZWN0JiBub3cuCisgICAgICAgIDIuIEJvdGggcHJldmlvdXNJ bkZsb3dTaWJsaW5nIGFuZCBzaG91bGRBZGRCb3JkZXJQYWRkaW5nTWFyZ2luIG1vdmVkIHRvIGlu bGluZUxvZ2ljYWxXaWR0aAorCisgICAgICAgICogcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250 ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjppbmxpbmVMb2dpY2FsV2lkdGgpOgorICAgICAgICAo V2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVPdXRPZkZsb3dQb3NpdGlvbmVkKToKKyAg ICAgICAgKFdlYkNvcmU6OkJyZWFraW5nQ29udGV4dDo6aGFuZGxlRW1wdHlJbmxpbmUpOgorICAg ICAgICAoV2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVSZXBsYWNlZCk6CisgICAgICAg IChXZWJDb3JlOjpCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6c2hvdWxkQWRkQm9yZGVyUGFkZGluZ01hcmdpbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpwcmV2aW91c0luRmxvd1NpYmxpbmcpOiBEZWxldGVkLgorCiAyMDIxLTA0LTE2ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVVBdIFdlYkNvbnRlbnQg cHJvY2VzcyBzaG91bGQgbm90IGNyZWF0ZSBBVk91dHB1dENvbnRleHQgaW5zdGFuY2VzIHdoZW4g bWVkaWEgaW4gR1BVIFByb2Nlc3MgaXMgZW5hYmxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAppbmRleCA2MDY0YzczZDc4NTY4ZmM4Y2UwYTE1 ZjIxMTU0OTEyNTgwMWE5ODIwLi5jMGU4MzZlNTM4OGFkZjIxZmM3YzE1NmRmZjY2ZTUyNDBlNTYz YjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0Nv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRl eHQuaApAQCAtMzE3LDQwICszMTcsMzggQEAgaW5saW5lIExheW91dFVuaXQgYm9yZGVyUGFkZGlu Z01hcmdpbkVuZChjb25zdCBSZW5kZXJJbmxpbmUmIGNoaWxkKQogICAgIHJldHVybiBjaGlsZC5t YXJnaW5FbmQoKSArIGNoaWxkLnBhZGRpbmdFbmQoKSArIGNoaWxkLmJvcmRlckVuZCgpOwogfQog Ci1pbmxpbmUgYm9vbCBzaG91bGRBZGRCb3JkZXJQYWRkaW5nTWFyZ2luKFJlbmRlck9iamVjdCog Y2hpbGQpCitpbmxpbmUgTGF5b3V0VW5pdCBpbmxpbmVMb2dpY2FsV2lkdGgoY29uc3QgUmVuZGVy T2JqZWN0JiByZW5kZXJlciwgYm9vbCBjaGVja1N0YXJ0RWRnZSA9IHRydWUsIGJvb2wgY2hlY2tF bmRFZGdlID0gdHJ1ZSkKIHsKLSAgICBpZiAoIWNoaWxkKQotICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICAvLyBXaGVuIGRlY2lkaW5nIHdoZXRoZXIgd2UncmUgYXQgdGhlIGVkZ2Ugb2YgYW4gaW5s aW5lLCBhZGphY2VudCBjb2xsYXBzZWQgd2hpdGVzcGFjZSBpcyB0aGUgc2FtZSBhcyBubyBzaWJs aW5nIGF0IGFsbC4KLSAgICBpZiAoaXM8UmVuZGVyVGV4dD4oKmNoaWxkKSAmJiAhZG93bmNhc3Q8 UmVuZGVyVGV4dD4oKmNoaWxkKS50ZXh0KCkubGVuZ3RoKCkpCi0gICAgICAgIHJldHVybiB0cnVl OworICAgIGF1dG8gcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gW10gKGNvbnN0IGF1dG8mIHJlbmRl cmVyKSB7CisgICAgICAgIGF1dG8qIHByZXZpb3VzU2libGluZyA9IHJlbmRlcmVyLnByZXZpb3Vz U2libGluZygpOworICAgICAgICBmb3IgKDsgcHJldmlvdXNTaWJsaW5nICYmIHByZXZpb3VzU2li bGluZy0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCk7IHByZXZpb3VzU2libGluZyA9IHByZXZpb3Vz U2libGluZy0+cHJldmlvdXNTaWJsaW5nKCkpIHsgfQorICAgICAgICByZXR1cm4gcHJldmlvdXNT aWJsaW5nOworICAgIH07CisKKyAgICBhdXRvIHNob3VsZEFkZEJvcmRlclBhZGRpbmdNYXJnaW4g PSBbXSAoY29uc3QgYXV0byYgcmVuZGVyZXIpIHsKKyAgICAgICAgLy8gV2hlbiBkZWNpZGluZyB3 aGV0aGVyIHdlJ3JlIGF0IHRoZSBlZGdlIG9mIGFuIGlubGluZSwgYWRqYWNlbnQgY29sbGFwc2Vk IHdoaXRlc3BhY2UgaXMgdGhlIHNhbWUgYXMgbm8gc2libGluZyBhdCBhbGwuCisgICAgICAgIGlm IChpczxSZW5kZXJUZXh0PihyZW5kZXJlcikgJiYgIWRvd25jYXN0PFJlbmRlclRleHQ+KHJlbmRl cmVyKS50ZXh0KCkubGVuZ3RoKCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICNpZiBFTkFC TEUoQ1NTX0JPWF9ERUNPUkFUSU9OX0JSRUFLKQotICAgIGlmIChpczxSZW5kZXJMaW5lQnJlYWs+ KCpjaGlsZCkgJiYgY2hpbGQtPnBhcmVudCgpLT5zdHlsZSgpLmJveERlY29yYXRpb25CcmVhaygp ID09IEJveERlY29yYXRpb25CcmVhazo6Q2xvbmUpCi0gICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICBpZiAoaXM8UmVuZGVyTGluZUJyZWFrPihyZW5kZXJlcikgJiYgcmVuZGVyZXIucGFyZW50 KCktPnN0eWxlKCkuYm94RGVjb3JhdGlvbkJyZWFrKCkgPT0gQm94RGVjb3JhdGlvbkJyZWFrOjpD bG9uZSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOwogI2VuZGlmCi0gICAgcmV0dXJuIGZhbHNl OwotfQotCi1pbmxpbmUgUmVuZGVyT2JqZWN0KiBwcmV2aW91c0luRmxvd1NpYmxpbmcoUmVuZGVy T2JqZWN0KiBjaGlsZCkKLXsKLSAgICBkbyB7Ci0gICAgICAgIGNoaWxkID0gY2hpbGQtPnByZXZp b3VzU2libGluZygpOwotICAgIH0gd2hpbGUgKGNoaWxkICYmIGNoaWxkLT5pc091dE9mRmxvd1Bv c2l0aW9uZWQoKSk7Ci0gICAgcmV0dXJuIGNoaWxkOwotfQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgfTsKIAotaW5saW5lIExheW91dFVuaXQgaW5saW5lTG9naWNhbFdpZHRoKFJlbmRlck9i amVjdCogY2hpbGQsIGJvb2wgY2hlY2tTdGFydEVkZ2UgPSB0cnVlLCBib29sIGNoZWNrRW5kRWRn ZSA9IHRydWUpCi17CiAgICAgdW5zaWduZWQgbGluZURlcHRoID0gMTsKLSAgICBMYXlvdXRVbml0 IGV4dHJhV2lkdGg7Ci0gICAgUmVuZGVyRWxlbWVudCogcGFyZW50ID0gY2hpbGQtPnBhcmVudCgp OworICAgIGF1dG8gZXh0cmFXaWR0aCA9IExheW91dFVuaXQgeyB9OworICAgIGF1dG8qIHBhcmVu dCA9IHJlbmRlcmVyLnBhcmVudCgpOworICAgIGF1dG8qIGNoaWxkID0gJnJlbmRlcmVyOwogICAg IHdoaWxlIChpczxSZW5kZXJJbmxpbmU+KCpwYXJlbnQpICYmIGxpbmVEZXB0aCsrIDwgY01heExp bmVEZXB0aCkgewogICAgICAgICBjb25zdCBhdXRvJiBwYXJlbnRBc1JlbmRlcklubGluZSA9IGRv d25jYXN0PFJlbmRlcklubGluZT4oKnBhcmVudCk7CiAgICAgICAgIGlmICghaXNFbXB0eUlubGlu ZShwYXJlbnRBc1JlbmRlcklubGluZSkpIHsKLSAgICAgICAgICAgIGNoZWNrU3RhcnRFZGdlID0g Y2hlY2tTdGFydEVkZ2UgJiYgc2hvdWxkQWRkQm9yZGVyUGFkZGluZ01hcmdpbihwcmV2aW91c0lu Rmxvd1NpYmxpbmcoY2hpbGQpKTsKKyAgICAgICAgICAgIGF1dG8qIHByZXZpb3VzU2libGluZyA9 IHByZXZpb3VzSW5GbG93U2libGluZygqY2hpbGQpOworICAgICAgICAgICAgY2hlY2tTdGFydEVk Z2UgPSBjaGVja1N0YXJ0RWRnZSAmJiAoIXByZXZpb3VzU2libGluZyB8fCBzaG91bGRBZGRCb3Jk ZXJQYWRkaW5nTWFyZ2luKCpwcmV2aW91c1NpYmxpbmcpKTsKICAgICAgICAgICAgIGlmIChjaGVj a1N0YXJ0RWRnZSkKICAgICAgICAgICAgICAgICBleHRyYVdpZHRoICs9IGJvcmRlclBhZGRpbmdN YXJnaW5TdGFydChwYXJlbnRBc1JlbmRlcklubGluZSk7Ci0gICAgICAgICAgICBjaGVja0VuZEVk Z2UgPSBjaGVja0VuZEVkZ2UgJiYgc2hvdWxkQWRkQm9yZGVyUGFkZGluZ01hcmdpbihjaGlsZC0+ bmV4dFNpYmxpbmcoKSk7CisgICAgICAgICAgICBhdXRvKiBuZXh0U2libGluZyA9IGNoaWxkLT5u ZXh0U2libGluZygpOworICAgICAgICAgICAgY2hlY2tFbmRFZGdlID0gY2hlY2tFbmRFZGdlICYm ICghbmV4dFNpYmxpbmcgfHwgc2hvdWxkQWRkQm9yZGVyUGFkZGluZ01hcmdpbigqbmV4dFNpYmxp bmcpKTsKICAgICAgICAgICAgIGlmIChjaGVja0VuZEVkZ2UpCiAgICAgICAgICAgICAgICAgZXh0 cmFXaWR0aCArPSBib3JkZXJQYWRkaW5nTWFyZ2luRW5kKHBhcmVudEFzUmVuZGVySW5saW5lKTsK ICAgICAgICAgICAgIGlmICghY2hlY2tTdGFydEVkZ2UgJiYgIWNoZWNrRW5kRWRnZSkKQEAgLTM1 OCw2ICszNTYsNyBAQCBpbmxpbmUgTGF5b3V0VW5pdCBpbmxpbmVMb2dpY2FsV2lkdGgoUmVuZGVy T2JqZWN0KiBjaGlsZCwgYm9vbCBjaGVja1N0YXJ0RWRnZSA9CiAgICAgICAgIH0KICAgICAgICAg Y2hpbGQgPSBwYXJlbnQ7CiAgICAgICAgIHBhcmVudCA9IGNoaWxkLT5wYXJlbnQoKTsKKyAgICAg ICAgQVNTRVJUKHBhcmVudCk7CiAgICAgfQogICAgIHJldHVybiBleHRyYVdpZHRoOwogfQpAQCAt MzgzLDcgKzM4Miw3IEBAIGlubGluZSB2b2lkIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlT3V0T2ZG bG93UG9zaXRpb25lZChWZWN0b3I8UmVuZGVyQm94Kj4mIHBvc2l0CiAgICAgfSBlbHNlCiAgICAg ICAgIHBvc2l0aW9uZWRPYmplY3RzLmFwcGVuZCgmYm94KTsKIAotICAgIG1fd2lkdGguYWRkVW5j b21taXR0ZWRXaWR0aChpbmxpbmVMb2dpY2FsV2lkdGgoJmJveCkpOworICAgIG1fd2lkdGguYWRk VW5jb21taXR0ZWRXaWR0aChpbmxpbmVMb2dpY2FsV2lkdGgoYm94KSk7CiAgICAgLy8gUmVzZXQg cHJpb3IgbGluZSBicmVhayBjb250ZXh0IGNoYXJhY3RlcnMuCiAgICAgbV9yZW5kZXJUZXh0SW5m by5saW5lQnJlYWtJdGVyYXRvci5yZXNldFByaW9yQ29udGV4dCgpOwogfQpAQCAtNDU4LDcgKzQ1 Nyw3IEBAIGlubGluZSB2b2lkIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlRW1wdHlJbmxpbmUoKQog ICAgICAgICAgICAgbV90cmFpbGluZ09iamVjdHMuYXBwZW5kQm94SWZOZWVkZWQoZmxvd0JveCk7 CiAgICAgfQogICAgIAotICAgIGZsb2F0IGlubGluZVdpZHRoID0gaW5saW5lTG9naWNhbFdpZHRo KG1fY3VycmVudC5yZW5kZXJlcigpKSArIGJvcmRlclBhZGRpbmdNYXJnaW5TdGFydChmbG93Qm94 KSArIGJvcmRlclBhZGRpbmdNYXJnaW5FbmQoZmxvd0JveCk7CisgICAgZmxvYXQgaW5saW5lV2lk dGggPSBpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJlcigpKSArIGJvcmRlclBh ZGRpbmdNYXJnaW5TdGFydChmbG93Qm94KSArIGJvcmRlclBhZGRpbmdNYXJnaW5FbmQoZmxvd0Jv eCk7CiAgICAgbV93aWR0aC5hZGRVbmNvbW1pdHRlZFdpZHRoKGlubGluZVdpZHRoKTsKICAgICBp ZiAobV9oYW5nc0F0RW5kICYmIGlubGluZVdpZHRoKQogICAgICAgICBtX2hhbmdzQXRFbmQgPSBm YWxzZTsKQEAgLTQ5Miw3ICs0OTEsNyBAQCBpbmxpbmUgdm9pZCBCcmVha2luZ0NvbnRleHQ6Omhh bmRsZVJlcGxhY2VkKCkKIAogICAgIC8vIE9wdGltaXplIGZvciBhIGNvbW1vbiBjYXNlLiBJZiB3 ZSBjYW4ndCBmaW5kIHdoaXRlc3BhY2UgYWZ0ZXIgdGhlIGxpc3QKICAgICAvLyBpdGVtLCB0aGVu IHRoaXMgaXMgYWxsIG1vb3QuCi0gICAgTGF5b3V0VW5pdCByZXBsYWNlZExvZ2ljYWxXaWR0aCA9 IG1fYmxvY2subG9naWNhbFdpZHRoRm9yQ2hpbGQocmVwbGFjZWRCb3gpICsgbV9ibG9jay5tYXJn aW5TdGFydEZvckNoaWxkKHJlcGxhY2VkQm94KSArIG1fYmxvY2subWFyZ2luRW5kRm9yQ2hpbGQo cmVwbGFjZWRCb3gpICsgaW5saW5lTG9naWNhbFdpZHRoKCZyZXBsYWNlZEJveCk7CisgICAgTGF5 b3V0VW5pdCByZXBsYWNlZExvZ2ljYWxXaWR0aCA9IG1fYmxvY2subG9naWNhbFdpZHRoRm9yQ2hp bGQocmVwbGFjZWRCb3gpICsgbV9ibG9jay5tYXJnaW5TdGFydEZvckNoaWxkKHJlcGxhY2VkQm94 KSArIG1fYmxvY2subWFyZ2luRW5kRm9yQ2hpbGQocmVwbGFjZWRCb3gpICsgaW5saW5lTG9naWNh bFdpZHRoKHJlcGxhY2VkQm94KTsKICAgICBpZiAoaXM8UmVuZGVyTGlzdE1hcmtlcj4ocmVwbGFj ZWRCb3gpKSB7CiAgICAgICAgIGlmIChtX2Jsb2NrU3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkg JiYgc2hvdWxkU2tpcFdoaXRlc3BhY2VBZnRlclN0YXJ0T2JqZWN0KG1fYmxvY2ssICZyZXBsYWNl ZEJveCwgbV9saW5lV2hpdGVzcGFjZUNvbGxhcHNpbmdTdGF0ZSkpIHsKICAgICAgICAgICAgIC8v IExpa2Ugd2l0aCBpbmxpbmUgZmxvd3MsIHdlIHN0YXJ0IGlnbm9yaW5nIHNwYWNlcyB0byBtYWtl IHN1cmUgdGhhdCBhbnkKQEAgLTcwMyw3ICs3MDIsNyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0Nv bnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9v bAogICAgIGZsb2F0IGxhc3RTcGFjZVdvcmRTcGFjaW5nID0gMDsKICAgICBmbG9hdCB3b3JkU3Bh Y2luZ0ZvcldvcmRNZWFzdXJlbWVudCA9IDA7CiAKLSAgICBmbG9hdCB3cmFwV2lkdGhPZmZzZXQg PSBtX3dpZHRoLnVuY29tbWl0dGVkV2lkdGgoKSArIGlubGluZUxvZ2ljYWxXaWR0aChtX2N1cnJl bnQucmVuZGVyZXIoKSwgIW1fYXBwbGllZFN0YXJ0V2lkdGgsIHRydWUpOworICAgIGZsb2F0IHdy YXBXaWR0aE9mZnNldCA9IG1fd2lkdGgudW5jb21taXR0ZWRXaWR0aCgpICsgaW5saW5lTG9naWNh bFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgIW1fYXBwbGllZFN0YXJ0V2lkdGgsIHRydWUp OwogICAgIGZsb2F0IHdyYXBXID0gd3JhcFdpZHRoT2Zmc2V0OwogICAgIGZsb2F0IGNoYXJXaWR0 aCA9IDA7CiAgICAgYm9vbCBicmVha05CU1AgPSBtX2F1dG9XcmFwICYmIG1fY3VycmVudFN0eWxl LT5uYnNwTW9kZSgpID09IE5CU1BNb2RlOjpTcGFjZTsKQEAgLTc1OSwxMiArNzU4LDEyIEBAIGlu bGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3 b3JkTWVhc3VyZW1lbnRzLCBib29sCiAgICAgICAgICAgICBjYW5CcmVha01pZFdvcmQgPSBicmVh a0FsbDsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChjYW5IYW5nUHVuY3R1YXRpb25BdFN0YXJ0 ICYmIG1fd2lkdGguaXNGaXJzdExpbmUoKSAmJiAhbV93aWR0aC5jb21taXR0ZWRXaWR0aCgpICYm ICF3cmFwVyAmJiAhaW5saW5lTG9naWNhbFdpZHRoKG1fY3VycmVudC5yZW5kZXJlcigpLCB0cnVl LCBmYWxzZSkpIHsKKyAgICAgICAgaWYgKGNhbkhhbmdQdW5jdHVhdGlvbkF0U3RhcnQgJiYgbV93 aWR0aC5pc0ZpcnN0TGluZSgpICYmICFtX3dpZHRoLmNvbW1pdHRlZFdpZHRoKCkgJiYgIXdyYXBX ICYmICFpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJlcigpLCB0cnVlLCBmYWxz ZSkpIHsKICAgICAgICAgICAgIG1fd2lkdGguYWRkVW5jb21taXR0ZWRXaWR0aCgtcmVuZGVyZXIu aGFuZ2FibGVQdW5jdHVhdGlvblN0YXJ0V2lkdGgobV9jdXJyZW50Lm9mZnNldCgpKSk7CiAgICAg ICAgICAgICBjYW5IYW5nUHVuY3R1YXRpb25BdFN0YXJ0ID0gZmFsc2U7CiAgICAgICAgIH0KICAg ICAgICAgCi0gICAgICAgIGlmIChjYW5IYW5nUHVuY3R1YXRpb25BdEVuZCAmJiAhbV9uZXh0T2Jq ZWN0ICYmIChpbnQpbV9jdXJyZW50Lm9mZnNldCgpID09IGVuZFB1bmN0dWF0aW9uSW5kZXggJiYg IWlubGluZUxvZ2ljYWxXaWR0aChtX2N1cnJlbnQucmVuZGVyZXIoKSwgZmFsc2UsIHRydWUpKSB7 CisgICAgICAgIGlmIChjYW5IYW5nUHVuY3R1YXRpb25BdEVuZCAmJiAhbV9uZXh0T2JqZWN0ICYm IChpbnQpbV9jdXJyZW50Lm9mZnNldCgpID09IGVuZFB1bmN0dWF0aW9uSW5kZXggJiYgIWlubGlu ZUxvZ2ljYWxXaWR0aCgqbV9jdXJyZW50LnJlbmRlcmVyKCksIGZhbHNlLCB0cnVlKSkgewogICAg ICAgICAgICAgbV93aWR0aC5hZGRVbmNvbW1pdHRlZFdpZHRoKC1yZW5kZXJlci5oYW5nYWJsZVB1 bmN0dWF0aW9uRW5kV2lkdGgoZW5kUHVuY3R1YXRpb25JbmRleCkpOwogICAgICAgICAgICAgY2Fu SGFuZ1B1bmN0dWF0aW9uQXRFbmQgPSBmYWxzZTsKICAgICAgICAgfQpAQCAtNzk3LDcgKzc5Niw3 IEBAIGlubGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1l bnRzJiB3b3JkTWVhc3VyZW1lbnRzLCBib29sCiAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIHNl ZSBpZiBhIG1lYXN1cmVtZW50IHRoYXQgZXhjbHVkZXMgdGhlIHN0b3Agd291bGQgZml0LiBJZiBz bywgdGhlbiB3ZSBzaG91bGQgaGFuZwogICAgICAgICAgICAgLy8gdGhlIHN0b3AvY29tbWEgYXQg dGhlIGVuZC4gRmlyc3QgbWVhc3VyZSBpbmNsdWRpbmcgdGhlIGNvbW1hLgogICAgICAgICAgICAg bV9oYW5nc0F0RW5kID0gZmFsc2U7Ci0gICAgICAgICAgICBmbG9hdCBpbmxpbmVTdGFydFdpZHRo ID0gIW1fYXBwbGllZFN0YXJ0V2lkdGggPyBpbmxpbmVMb2dpY2FsV2lkdGgobV9jdXJyZW50LnJl bmRlcmVyKCksIHRydWUsIGZhbHNlKSA6IDBfbHU7CisgICAgICAgICAgICBmbG9hdCBpbmxpbmVT dGFydFdpZHRoID0gIW1fYXBwbGllZFN0YXJ0V2lkdGggPyBpbmxpbmVMb2dpY2FsV2lkdGgoKm1f Y3VycmVudC5yZW5kZXJlcigpLCB0cnVlLCBmYWxzZSkgOiAwX2x1OwogICAgICAgICAgICAgZmxv YXQgd2lkdGhJbmNsdWRpbmdDb21tYSA9IGNvbXB1dGVBZGRpdGlvbmFsQmV0d2VlbldvcmRzV2lk dGgocmVuZGVyZXIsIHRleHRMYXlvdXQsIGMsIHdvcmRUcmFpbGluZ1NwYWNlLCBmYWxsYmFja0Zv bnRzLCB3b3JkTWVhc3VyZW1lbnRzLCBmb250LCBpc0ZpeGVkUGl0Y2gsIGxhc3RTcGFjZSwgbGFz dFNwYWNlV29yZFNwYWNpbmcsIHdvcmRTcGFjaW5nRm9yV29yZE1lYXN1cmVtZW50LCBtX2N1cnJl bnQub2Zmc2V0KCkgKyAxKSArIGlubGluZVN0YXJ0V2lkdGg7CiAgICAgICAgICAgICBtX3dpZHRo LmFkZFVuY29tbWl0dGVkV2lkdGgod2lkdGhJbmNsdWRpbmdDb21tYSk7CiAgICAgICAgICAgICBp ZiAoIW1fd2lkdGguZml0c09uTGluZSgpKSB7CkBAIC04MzcsNyArODM2LDcgQEAgaW5saW5lIGJv b2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFz dXJlbWVudHMsIGJvb2wKICAgICAgICAgICAgICAgICBtX3dpZHRoLnNldFRyYWlsaW5nV2hpdGVz cGFjZVdpZHRoKGFkZGl0aW9uYWxUZW1wV2lkdGgpOwogCiAgICAgICAgICAgICBpZiAoIW1fYXBw bGllZFN0YXJ0V2lkdGgpIHsKLSAgICAgICAgICAgICAgICBmbG9hdCBpbmxpbmVTdGFydFdpZHRo ID0gaW5saW5lTG9naWNhbFdpZHRoKG1fY3VycmVudC5yZW5kZXJlcigpLCB0cnVlLCBmYWxzZSk7 CisgICAgICAgICAgICAgICAgZmxvYXQgaW5saW5lU3RhcnRXaWR0aCA9IGlubGluZUxvZ2ljYWxX aWR0aCgqbV9jdXJyZW50LnJlbmRlcmVyKCksIHRydWUsIGZhbHNlKTsKICAgICAgICAgICAgICAg ICBtX3dpZHRoLmFkZFVuY29tbWl0dGVkV2lkdGgoaW5saW5lU3RhcnRXaWR0aCk7CiAgICAgICAg ICAgICAgICAgbV9hcHBsaWVkU3RhcnRXaWR0aCA9IHRydWU7CiAgICAgICAgICAgICAgICAgaWYg KG1faGFuZ3NBdEVuZCAmJiBpbmxpbmVTdGFydFdpZHRoKQpAQCAtMTA1MCw3ICsxMDQ5LDcgQEAg aW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMm IHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICB3b3JkTWVhc3VyZW1lbnQud2lkdGggPSBtX2ln bm9yaW5nU3BhY2VzID8gMCA6IGFkZGl0aW9uYWxUZW1wV2lkdGggKyB3b3JkU3BhY2luZ0Zvcldv cmRNZWFzdXJlbWVudDsKICAgICBhZGRpdGlvbmFsVGVtcFdpZHRoICs9IGxhc3RTcGFjZVdvcmRT cGFjaW5nOwogCi0gICAgZmxvYXQgaW5saW5lTG9naWNhbFRlbXBXaWR0aCA9IGlubGluZUxvZ2lj YWxXaWR0aChtX2N1cnJlbnQucmVuZGVyZXIoKSwgIW1fYXBwbGllZFN0YXJ0V2lkdGgsIG1faW5j bHVkZUVuZFdpZHRoKTsKKyAgICBmbG9hdCBpbmxpbmVMb2dpY2FsVGVtcFdpZHRoID0gaW5saW5l TG9naWNhbFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgIW1fYXBwbGllZFN0YXJ0V2lkdGgs IG1faW5jbHVkZUVuZFdpZHRoKTsKICAgICBtX3dpZHRoLmFkZFVuY29tbWl0dGVkV2lkdGgoYWRk aXRpb25hbFRlbXBXaWR0aCArIGlubGluZUxvZ2ljYWxUZW1wV2lkdGgpOwogICAgIGlmIChtX2hh bmdzQXRFbmQgJiYgaW5saW5lTG9naWNhbFRlbXBXaWR0aCkKICAgICAgICAgbV9oYW5nc0F0RW5k ID0gZmFsc2U7Cg==