224711 2021-04-16 20:39:31 -0700 [Cleanup] BreakingContext::handleText should consistently use the cached renderer 2021-04-24 15:07:49 -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 mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1751382 0 zalan 2021-04-16 20:39:31 -0700 and not the combination of renderer and m_current.renderer() 1751383 1 426319 zalan 2021-04-16 20:53:25 -0700 Created attachment 426319 Patch 1751417 2 426332 zalan 2021-04-17 06:50:27 -0700 Created attachment 426332 Patch 1751421 3 ews-feeder 2021-04-17 08:38:38 -0700 Committed r276201 (236683@main): <https://commits.webkit.org/236683@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426332. 1753932 4 webkit-bug-importer 2021-04-24 15:07:49 -0700 <rdar://problem/77110101> 426319 2021-04-16 20:53:25 -0700 2021-04-17 06:50:25 -0700 Patch bug-224711-20210416205324.patch text/plain 10390 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ2ZTA2ZmI1NjgyZGM4 MjczYzEzMzUxMDc0NmY4MmIwN2VlYTJkZS4uNGNkNTE3MzZmMmI2ZTEzZTEzOGZhYTRjYWJlNzFm Zjk3OWY2MjQwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NsZWFudXBdIEJyZWFraW5n Q29udGV4dDo6aGFuZGxlVGV4dCBzaG91bGQgY29uc2lzdGVudGx5IHVzZSB0aGUgY2FjaGVkIHJl bmRlcmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjQ3MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT aW5jZSB0aGlzIGZ1bmN0aW9uIGlzIG5vdCBzdXBwb3NlZCB0byBpbmNyZW1lbnQgdGhlIHJlbmRl cmVyLCBsZXQncyByZXBsYWNlIG1fY3VycmVudC5yZW5kZXJlcigpIHdpdGggInJlbmRlcmVyIi4K KworICAgICAgICAqIHJlbmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4dC5oOgorICAgICAgICAo V2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KToKKyAgICAgICAgKiByZW5kZXJp bmcvbGluZS9UcmFpbGluZ09iamVjdHMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRyYWlsaW5nT2Jq ZWN0czo6c2V0VHJhaWxpbmdXaGl0ZXNwYWNlKToKKwogMjAyMS0wNC0xNiAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtDbGVhbnVwXSBpbmxpbmVMb2dpY2FsV2lk dGggc2hvdWxkIHRha2UgY29uc3QgUmVuZGVyT2JqZWN0JgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAppbmRleCBjMGU4MzZlNTM4OGFkZjIxZmM3 YzE1NmRmZjY2ZTUyNDBlNTYzYjgwLi5lNjg3OWIxNGI5MGEzMDEyOTM3YTE0NjMzOGVmZDVhZmEz NGEzZGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2lu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0Nv bnRleHQuaApAQCAtNjc4LDggKzY3OCw4IEBAIGlubGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6 aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzLCBib29sCiAgICAg aWYgKG1fYXV0b1dyYXAgJiYgIVJlbmRlclN0eWxlOjphdXRvV3JhcChtX2xhc3RXUykgJiYgbV9p Z25vcmluZ1NwYWNlcykKICAgICAgICAgY29tbWl0TGluZUJyZWFrQXRDdXJyZW50V2lkdGgocmVu ZGVyZXIpOwogCi0gICAgaWYgKHJlbmRlcmVyLnN0eWxlKCkuaGFzVGV4dENvbWJpbmUoKSAmJiBp czxSZW5kZXJDb21iaW5lVGV4dD4oKm1fY3VycmVudC5yZW5kZXJlcigpKSkgewotICAgICAgICBh dXRvJiBjb21iaW5lUmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJDb21iaW5lVGV4dD4oKm1fY3Vy cmVudC5yZW5kZXJlcigpKTsKKyAgICBpZiAocmVuZGVyZXIuc3R5bGUoKS5oYXNUZXh0Q29tYmlu ZSgpICYmIGlzPFJlbmRlckNvbWJpbmVUZXh0PihyZW5kZXJlcikpIHsKKyAgICAgICAgYXV0byYg Y29tYmluZVJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVyQ29tYmluZVRleHQ+KHJlbmRlcmVyKTsK ICAgICAgICAgY29tYmluZVJlbmRlcmVyLmNvbWJpbmVUZXh0SWZOZWVkZWQoKTsKICAgICAgICAg Ly8gVGhlIGxlbmd0aCBvZiB0aGUgcmVuZGVyZXIncyB0ZXh0IG1heSBoYXZlIGNoYW5nZWQuIElu Y3JlbWVudCBzdGFsZSBpdGVyYXRvciBwb3NpdGlvbnMKICAgICAgICAgaWYgKGl0ZXJhdG9ySXNC ZXlvbmRFbmRPZlJlbmRlckNvbWJpbmVUZXh0KG1fbGluZUJyZWFrLCBjb21iaW5lUmVuZGVyZXIp KSB7CkBAIC03MDIsNyArNzAyLDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5k bGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICBmbG9h dCBsYXN0U3BhY2VXb3JkU3BhY2luZyA9IDA7CiAgICAgZmxvYXQgd29yZFNwYWNpbmdGb3JXb3Jk TWVhc3VyZW1lbnQgPSAwOwogCi0gICAgZmxvYXQgd3JhcFdpZHRoT2Zmc2V0ID0gbV93aWR0aC51 bmNvbW1pdHRlZFdpZHRoKCkgKyBpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJl cigpLCAhbV9hcHBsaWVkU3RhcnRXaWR0aCwgdHJ1ZSk7CisgICAgZmxvYXQgd3JhcFdpZHRoT2Zm c2V0ID0gbV93aWR0aC51bmNvbW1pdHRlZFdpZHRoKCkgKyBpbmxpbmVMb2dpY2FsV2lkdGgocmVu ZGVyZXIsICFtX2FwcGxpZWRTdGFydFdpZHRoLCB0cnVlKTsKICAgICBmbG9hdCB3cmFwVyA9IHdy YXBXaWR0aE9mZnNldDsKICAgICBmbG9hdCBjaGFyV2lkdGggPSAwOwogICAgIGJvb2wgYnJlYWtO QlNQID0gbV9hdXRvV3JhcCAmJiBtX2N1cnJlbnRTdHlsZS0+bmJzcE1vZGUoKSA9PSBOQlNQTW9k ZTo6U3BhY2U7CkBAIC03NDUsNiArNzQ1LDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0 OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAg ICBUZXh0TGF5b3V0KiB0ZXh0TGF5b3V0ID0gbV9yZW5kZXJUZXh0SW5mby5sYXlvdXQuZ2V0KCk7 CiAgICAgV29yZFRyYWlsaW5nU3BhY2Ugd29yZFRyYWlsaW5nU3BhY2Uoc3R5bGUsICF0ZXh0TGF5 b3V0KTsKICAgICBmb3IgKDsgbV9jdXJyZW50Lm9mZnNldCgpIDwgcmVuZGVyZXIudGV4dCgpLmxl bmd0aCgpOyBtX2N1cnJlbnQuZmFzdEluY3JlbWVudEluVGV4dE5vZGUoKSkgeworICAgICAgICBB U1NFUlQoJnJlbmRlcmVyID09IG1fY3VycmVudC5yZW5kZXJlcigpKTsKICAgICAgICAgYm9vbCBw cmV2aW91c0NoYXJhY3RlcklzU3BhY2UgPSBtX2N1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlOwogICAg ICAgICBib29sIHByZXZpb3VzQ2hhcmFjdGVySXNXUyA9IG1fY3VycmVudENoYXJhY3RlcklzV1M7 CiAgICAgICAgIFVDaGFyIGMgPSBtX2N1cnJlbnQuY3VycmVudCgpOwpAQCAtNzU4LDEyICs3NTks MTIgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJl bWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgICAgIGNhbkJyZWFrTWlkV29y ZCA9IGJyZWFrQWxsOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGNhbkhhbmdQdW5jdHVhdGlv bkF0U3RhcnQgJiYgbV93aWR0aC5pc0ZpcnN0TGluZSgpICYmICFtX3dpZHRoLmNvbW1pdHRlZFdp ZHRoKCkgJiYgIXdyYXBXICYmICFpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJl cigpLCB0cnVlLCBmYWxzZSkpIHsKKyAgICAgICAgaWYgKGNhbkhhbmdQdW5jdHVhdGlvbkF0U3Rh cnQgJiYgbV93aWR0aC5pc0ZpcnN0TGluZSgpICYmICFtX3dpZHRoLmNvbW1pdHRlZFdpZHRoKCkg JiYgIXdyYXBXICYmICFpbmxpbmVMb2dpY2FsV2lkdGgocmVuZGVyZXIsIHRydWUsIGZhbHNlKSkg ewogICAgICAgICAgICAgbV93aWR0aC5hZGRVbmNvbW1pdHRlZFdpZHRoKC1yZW5kZXJlci5oYW5n YWJsZVB1bmN0dWF0aW9uU3RhcnRXaWR0aChtX2N1cnJlbnQub2Zmc2V0KCkpKTsKICAgICAgICAg ICAgIGNhbkhhbmdQdW5jdHVhdGlvbkF0U3RhcnQgPSBmYWxzZTsKICAgICAgICAgfQogICAgICAg ICAKLSAgICAgICAgaWYgKGNhbkhhbmdQdW5jdHVhdGlvbkF0RW5kICYmICFtX25leHRPYmplY3Qg JiYgKGludCltX2N1cnJlbnQub2Zmc2V0KCkgPT0gZW5kUHVuY3R1YXRpb25JbmRleCAmJiAhaW5s aW5lTG9naWNhbFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgZmFsc2UsIHRydWUpKSB7Cisg ICAgICAgIGlmIChjYW5IYW5nUHVuY3R1YXRpb25BdEVuZCAmJiAhbV9uZXh0T2JqZWN0ICYmIChp bnQpbV9jdXJyZW50Lm9mZnNldCgpID09IGVuZFB1bmN0dWF0aW9uSW5kZXggJiYgIWlubGluZUxv Z2ljYWxXaWR0aChyZW5kZXJlciwgZmFsc2UsIHRydWUpKSB7CiAgICAgICAgICAgICBtX3dpZHRo LmFkZFVuY29tbWl0dGVkV2lkdGgoLXJlbmRlcmVyLmhhbmdhYmxlUHVuY3R1YXRpb25FbmRXaWR0 aChlbmRQdW5jdHVhdGlvbkluZGV4KSk7CiAgICAgICAgICAgICBjYW5IYW5nUHVuY3R1YXRpb25B dEVuZCA9IGZhbHNlOwogICAgICAgICB9CkBAIC03OTYsNyArNzk3LDcgQEAgaW5saW5lIGJvb2wg QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJl bWVudHMsIGJvb2wKICAgICAgICAgICAgIC8vIFdlIG5lZWQgdG8gc2VlIGlmIGEgbWVhc3VyZW1l bnQgdGhhdCBleGNsdWRlcyB0aGUgc3RvcCB3b3VsZCBmaXQuIElmIHNvLCB0aGVuIHdlIHNob3Vs ZCBoYW5nCiAgICAgICAgICAgICAvLyB0aGUgc3RvcC9jb21tYSBhdCB0aGUgZW5kLiBGaXJzdCBt ZWFzdXJlIGluY2x1ZGluZyB0aGUgY29tbWEuCiAgICAgICAgICAgICBtX2hhbmdzQXRFbmQgPSBm YWxzZTsKLSAgICAgICAgICAgIGZsb2F0IGlubGluZVN0YXJ0V2lkdGggPSAhbV9hcHBsaWVkU3Rh cnRXaWR0aCA/IGlubGluZUxvZ2ljYWxXaWR0aCgqbV9jdXJyZW50LnJlbmRlcmVyKCksIHRydWUs IGZhbHNlKSA6IDBfbHU7CisgICAgICAgICAgICBmbG9hdCBpbmxpbmVTdGFydFdpZHRoID0gIW1f YXBwbGllZFN0YXJ0V2lkdGggPyBpbmxpbmVMb2dpY2FsV2lkdGgocmVuZGVyZXIsIHRydWUsIGZh bHNlKSA6IDBfbHU7CiAgICAgICAgICAgICBmbG9hdCB3aWR0aEluY2x1ZGluZ0NvbW1hID0gY29t cHV0ZUFkZGl0aW9uYWxCZXR3ZWVuV29yZHNXaWR0aChyZW5kZXJlciwgdGV4dExheW91dCwgYywg d29yZFRyYWlsaW5nU3BhY2UsIGZhbGxiYWNrRm9udHMsIHdvcmRNZWFzdXJlbWVudHMsIGZvbnQs IGlzRml4ZWRQaXRjaCwgbGFzdFNwYWNlLCBsYXN0U3BhY2VXb3JkU3BhY2luZywgd29yZFNwYWNp bmdGb3JXb3JkTWVhc3VyZW1lbnQsIG1fY3VycmVudC5vZmZzZXQoKSArIDEpICsgaW5saW5lU3Rh cnRXaWR0aDsKICAgICAgICAgICAgIG1fd2lkdGguYWRkVW5jb21taXR0ZWRXaWR0aCh3aWR0aElu Y2x1ZGluZ0NvbW1hKTsKICAgICAgICAgICAgIGlmICghbV93aWR0aC5maXRzT25MaW5lKCkpIHsK QEAgLTgxOCw3ICs4MTksNyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRl eHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICAgICAg ICAgICAgICBtX2lnbm9yaW5nU3BhY2VzID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgICAgIHdv cmRTcGFjaW5nRm9yV29yZE1lYXN1cmVtZW50ID0gMDsKICAgICAgICAgICAgICAgICAgICAgbGFz dFNwYWNlID0gbV9jdXJyZW50Lm9mZnNldCgpOyAvLyBlLmcuLCAiRm9vICAgIGdvbyIsIGRvbid0 IGFkZCBpbiBhbnkgb2YgdGhlIGlnbm9yZWQgc3BhY2VzLgotICAgICAgICAgICAgICAgICAgICBt X2xpbmVXaGl0ZXNwYWNlQ29sbGFwc2luZ1N0YXRlLnN0b3BJZ25vcmluZ1NwYWNlcyhJbmxpbmVJ dGVyYXRvcigwLCBtX2N1cnJlbnQucmVuZGVyZXIoKSwgbV9jdXJyZW50Lm9mZnNldCgpKSk7Cisg ICAgICAgICAgICAgICAgICAgIG1fbGluZVdoaXRlc3BhY2VDb2xsYXBzaW5nU3RhdGUuc3RvcEln bm9yaW5nU3BhY2VzKElubGluZUl0ZXJhdG9yKDAsICZyZW5kZXJlciwgbV9jdXJyZW50Lm9mZnNl dCgpKSk7CiAgICAgICAgICAgICAgICAgICAgIHN0b3BwZWRJZ25vcmluZ1NwYWNlcyA9IHRydWU7 CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgLy8gSnVzdCBr ZWVwIGlnbm9yaW5nIHRoZXNlIHNwYWNlcy4KQEAgLTgzNiw3ICs4MzcsNyBAQCBpbmxpbmUgYm9v bCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1 cmVtZW50cywgYm9vbAogICAgICAgICAgICAgICAgIG1fd2lkdGguc2V0VHJhaWxpbmdXaGl0ZXNw YWNlV2lkdGgoYWRkaXRpb25hbFRlbXBXaWR0aCk7CiAKICAgICAgICAgICAgIGlmICghbV9hcHBs aWVkU3RhcnRXaWR0aCkgewotICAgICAgICAgICAgICAgIGZsb2F0IGlubGluZVN0YXJ0V2lkdGgg PSBpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJlcigpLCB0cnVlLCBmYWxzZSk7 CisgICAgICAgICAgICAgICAgZmxvYXQgaW5saW5lU3RhcnRXaWR0aCA9IGlubGluZUxvZ2ljYWxX aWR0aChyZW5kZXJlciwgdHJ1ZSwgZmFsc2UpOwogICAgICAgICAgICAgICAgIG1fd2lkdGguYWRk VW5jb21taXR0ZWRXaWR0aChpbmxpbmVTdGFydFdpZHRoKTsKICAgICAgICAgICAgICAgICBtX2Fw cGxpZWRTdGFydFdpZHRoID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBpZiAobV9oYW5nc0F0RW5k ICYmIGlubGluZVN0YXJ0V2lkdGgpCkBAIC04OTcsNyArODk4LDcgQEAgaW5saW5lIGJvb2wgQnJl YWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVu dHMsIGJvb2wKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobV9jdXJyZW50Lm5l eHRCcmVha2FibGVQb3NpdGlvbigpICYmIG1fY3VycmVudC5uZXh0QnJlYWthYmxlUG9zaXRpb24o KS52YWx1ZSgpIDw9IG1fY3VycmVudC5vZmZzZXQoKSkgewogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIFdlIG1pZ2h0IGp1c3QgYmUgcmlnaHQgYWZ0ZXIgdGhlIHNvZnQtaHlwaGVuCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdEJyZWFraW5nUG9zaXRpb24gPSBtX2N1cnJl bnQubmV4dEJyZWFrYWJsZVBvc2l0aW9uKCkudmFsdWUoKTsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZW5kZXJlckF0QnJlYWtpbmdQb3NpdGlvbiA9IG1fY3VycmVudC5yZW5kZXJlcigp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbmRlcmVyQXRCcmVha2luZ1Bvc2l0aW9u ID0gJnJlbmRlcmVyOwogICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKGxhc3RCcmVha2luZ1Bvc2l0aW9uKSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgT3B0aW9uYWw8VUNoYXI+IGNoYXJhY3RlckJlZm9yZUJyZWFraW5nUG9zaXRpb247 CkBAIC05OTYsNyArOTk3LDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVU ZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgICAg ICAgICBsYXN0U3BhY2VXb3JkU3BhY2luZyA9IGFwcGx5V29yZFNwYWNpbmcgPyB3b3JkU3BhY2lu ZyA6IDA7CiAgICAgICAgICAgICAgICAgd29yZFNwYWNpbmdGb3JXb3JkTWVhc3VyZW1lbnQgPSAo YXBwbHlXb3JkU3BhY2luZyAmJiB3b3JkTWVhc3VyZW1lbnRzLmxhc3QoKS53aWR0aCkgPyB3b3Jk U3BhY2luZyA6IDA7CiAgICAgICAgICAgICAgICAgbGFzdFNwYWNlID0gbV9jdXJyZW50Lm9mZnNl dCgpOyAvLyBlLmcuLCAiRm9vICAgIGdvbyIsIGRvbid0IGFkZCBpbiBhbnkgb2YgdGhlIGlnbm9y ZWQgc3BhY2VzLgotICAgICAgICAgICAgICAgIG1fbGluZVdoaXRlc3BhY2VDb2xsYXBzaW5nU3Rh dGUuc3RvcElnbm9yaW5nU3BhY2VzKElubGluZUl0ZXJhdG9yKG51bGxwdHIsIG1fY3VycmVudC5y ZW5kZXJlcigpLCBtX2N1cnJlbnQub2Zmc2V0KCkpKTsKKyAgICAgICAgICAgICAgICBtX2xpbmVX aGl0ZXNwYWNlQ29sbGFwc2luZ1N0YXRlLnN0b3BJZ25vcmluZ1NwYWNlcyhJbmxpbmVJdGVyYXRv cihudWxscHRyLCAmcmVuZGVyZXIsIG1fY3VycmVudC5vZmZzZXQoKSkpOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgaWYgKG1faGFuZ3NBdEVuZCAmJiAhcmVuZGVyZXIuaXNIYW5nYWJsZVN0 b3BPckNvbW1hKGMpKQogICAgICAgICAgICAgICAgIG1faGFuZ3NBdEVuZCA9IGZhbHNlOwpAQCAt MTAwOSw3ICsxMDEwLDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0 KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgfQogCiAg ICAgICAgIGlmIChtX2N1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlICYmICFwcmV2aW91c0NoYXJhY3Rl cklzU3BhY2UpIHsKLSAgICAgICAgICAgIG1fc3RhcnRPZklnbm9yZWRTcGFjZXMuc2V0UmVuZGVy ZXIobV9jdXJyZW50LnJlbmRlcmVyKCkpOworICAgICAgICAgICAgbV9zdGFydE9mSWdub3JlZFNw YWNlcy5zZXRSZW5kZXJlcigmcmVuZGVyZXIpOwogICAgICAgICAgICAgbV9zdGFydE9mSWdub3Jl ZFNwYWNlcy5zZXRPZmZzZXQobV9jdXJyZW50Lm9mZnNldCgpKTsKICAgICAgICAgICAgIC8vIFNw YWNlcyBhZnRlciByaWdodC1hbGlnbmVkIHRleHQgYW5kIGJlZm9yZSBhIGxpbmUtYnJlYWsgZ2V0 IGNvbGxhcHNlZCBhd2F5IGNvbXBsZXRlbHkgc28gdGhhdCB0aGUgdHJhaWxpbmcKICAgICAgICAg ICAgIC8vIHNwYWNlIGRvZXNuJ3Qgc2VlbSB0byBwdXNoIHRoZSB0ZXh0IG91dCBmcm9tIHRoZSBy aWdodC1oYW5kIGVkZ2UuCkBAIC0xMDI4LDcgKzEwMjksNyBAQCBpbmxpbmUgYm9vbCBCcmVha2lu Z0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywg Ym9vbAogICAgICAgICB9CiAKICAgICAgICAgaWYgKG1fY29sbGFwc2VXaGl0ZVNwYWNlICYmIG1f Y3VycmVudENoYXJhY3RlcklzU3BhY2UgJiYgIW1faWdub3JpbmdTcGFjZXMpCi0gICAgICAgICAg ICBtX3RyYWlsaW5nT2JqZWN0cy5zZXRUcmFpbGluZ1doaXRlc3BhY2UoZG93bmNhc3Q8UmVuZGVy VGV4dD4obV9jdXJyZW50LnJlbmRlcmVyKCkpKTsKKyAgICAgICAgICAgIG1fdHJhaWxpbmdPYmpl Y3RzLnNldFRyYWlsaW5nV2hpdGVzcGFjZShyZW5kZXJlcik7CiAgICAgICAgIGVsc2UgaWYgKCFt X2N1cnJlbnRTdHlsZS0+Y29sbGFwc2VXaGl0ZVNwYWNlKCkgfHwgIW1fY3VycmVudENoYXJhY3Rl cklzU3BhY2UpCiAgICAgICAgICAgICBtX3RyYWlsaW5nT2JqZWN0cy5jbGVhcigpOwogCkBAIC0x MDQ5LDcgKzEwNTAsNyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQo V29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgIHdvcmRNZWFzdXJl bWVudC53aWR0aCA9IG1faWdub3JpbmdTcGFjZXMgPyAwIDogYWRkaXRpb25hbFRlbXBXaWR0aCAr IHdvcmRTcGFjaW5nRm9yV29yZE1lYXN1cmVtZW50OwogICAgIGFkZGl0aW9uYWxUZW1wV2lkdGgg Kz0gbGFzdFNwYWNlV29yZFNwYWNpbmc7CiAKLSAgICBmbG9hdCBpbmxpbmVMb2dpY2FsVGVtcFdp ZHRoID0gaW5saW5lTG9naWNhbFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgIW1fYXBwbGll ZFN0YXJ0V2lkdGgsIG1faW5jbHVkZUVuZFdpZHRoKTsKKyAgICBmbG9hdCBpbmxpbmVMb2dpY2Fs VGVtcFdpZHRoID0gaW5saW5lTG9naWNhbFdpZHRoKHJlbmRlcmVyLCAhbV9hcHBsaWVkU3RhcnRX aWR0aCwgbV9pbmNsdWRlRW5kV2lkdGgpOwogICAgIG1fd2lkdGguYWRkVW5jb21taXR0ZWRXaWR0 aChhZGRpdGlvbmFsVGVtcFdpZHRoICsgaW5saW5lTG9naWNhbFRlbXBXaWR0aCk7CiAgICAgaWYg KG1faGFuZ3NBdEVuZCAmJiBpbmxpbmVMb2dpY2FsVGVtcFdpZHRoKQogICAgICAgICBtX2hhbmdz QXRFbmQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5l L1RyYWlsaW5nT2JqZWN0cy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvVHJhaWxp bmdPYmplY3RzLmgKaW5kZXggZGJkMmIwZDJiOTJlOTU5NjUyODUxZmVjMTg5MDRkYmM0OTI5MWMy NC4uYmNhYmVkY2JjMzdlY2VlMWVmMjQ5Yzc2MTc1MzE0YTYxOWFlYWY1NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvVHJhaWxpbmdPYmplY3RzLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvVHJhaWxpbmdPYmplY3RzLmgKQEAgLTQ3LDEwICs0 Nyw5IEBAIHB1YmxpYzoKICAgICAgICAgOiBtX3doaXRlc3BhY2UoMCkKICAgICB7IH0KIAotICAg IHZvaWQgc2V0VHJhaWxpbmdXaGl0ZXNwYWNlKFJlbmRlclRleHQqIHdoaXRlc3BhY2UpCisgICAg dm9pZCBzZXRUcmFpbGluZ1doaXRlc3BhY2UoUmVuZGVyVGV4dCYgd2hpdGVzcGFjZSkKICAgICB7 Ci0gICAgICAgIEFTU0VSVCh3aGl0ZXNwYWNlKTsKLSAgICAgICAgbV93aGl0ZXNwYWNlID0gd2hp dGVzcGFjZTsKKyAgICAgICAgbV93aGl0ZXNwYWNlID0gJndoaXRlc3BhY2U7CiAgICAgfQogCiAg ICAgdm9pZCBjbGVhcigpCg== 426332 2021-04-17 06:50:27 -0700 2021-04-17 08:38:40 -0700 Patch bug-224711-20210417065026.patch text/plain 10390 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQ3NzdhNmQ2NmYwMzQ0 YTRjOTc0NTRjNTdkMDhiZjJmMWFkNDM2ZC4uYjY0MTkwNmI2Yjc4YjJkNDMyZmM4Yjc0MTZiMThl NDc3NTg0YzNmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NsZWFudXBdIEJyZWFraW5n Q29udGV4dDo6aGFuZGxlVGV4dCBzaG91bGQgY29uc2lzdGVudGx5IHVzZSB0aGUgY2FjaGVkIHJl bmRlcmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjQ3MTEKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBT aW5jZSB0aGlzIGZ1bmN0aW9uIGlzIG5vdCBzdXBwb3NlZCB0byBpbmNyZW1lbnQgdGhlIHJlbmRl cmVyLCBsZXQncyByZXBsYWNlIG1fY3VycmVudC5yZW5kZXJlcigpIHdpdGggInJlbmRlcmVyIi4K KworICAgICAgICAqIHJlbmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4dC5oOgorICAgICAgICAo V2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KToKKyAgICAgICAgKiByZW5kZXJp bmcvbGluZS9UcmFpbGluZ09iamVjdHMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRyYWlsaW5nT2Jq ZWN0czo6c2V0VHJhaWxpbmdXaGl0ZXNwYWNlKToKKwogMjAyMS0wNC0xNyAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtDbGVhbnVwXSBpbmxpbmVMb2dpY2FsV2lk dGggc2hvdWxkIHRha2UgY29uc3QgUmVuZGVyT2JqZWN0JgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAppbmRleCBjMGU4MzZlNTM4OGFkZjIxZmM3 YzE1NmRmZjY2ZTUyNDBlNTYzYjgwLi5lNjg3OWIxNGI5MGEzMDEyOTM3YTE0NjMzOGVmZDVhZmEz NGEzZGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2lu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0Nv bnRleHQuaApAQCAtNjc4LDggKzY3OCw4IEBAIGlubGluZSBib29sIEJyZWFraW5nQ29udGV4dDo6 aGFuZGxlVGV4dChXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzLCBib29sCiAgICAg aWYgKG1fYXV0b1dyYXAgJiYgIVJlbmRlclN0eWxlOjphdXRvV3JhcChtX2xhc3RXUykgJiYgbV9p Z25vcmluZ1NwYWNlcykKICAgICAgICAgY29tbWl0TGluZUJyZWFrQXRDdXJyZW50V2lkdGgocmVu ZGVyZXIpOwogCi0gICAgaWYgKHJlbmRlcmVyLnN0eWxlKCkuaGFzVGV4dENvbWJpbmUoKSAmJiBp czxSZW5kZXJDb21iaW5lVGV4dD4oKm1fY3VycmVudC5yZW5kZXJlcigpKSkgewotICAgICAgICBh dXRvJiBjb21iaW5lUmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJDb21iaW5lVGV4dD4oKm1fY3Vy cmVudC5yZW5kZXJlcigpKTsKKyAgICBpZiAocmVuZGVyZXIuc3R5bGUoKS5oYXNUZXh0Q29tYmlu ZSgpICYmIGlzPFJlbmRlckNvbWJpbmVUZXh0PihyZW5kZXJlcikpIHsKKyAgICAgICAgYXV0byYg Y29tYmluZVJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVyQ29tYmluZVRleHQ+KHJlbmRlcmVyKTsK ICAgICAgICAgY29tYmluZVJlbmRlcmVyLmNvbWJpbmVUZXh0SWZOZWVkZWQoKTsKICAgICAgICAg Ly8gVGhlIGxlbmd0aCBvZiB0aGUgcmVuZGVyZXIncyB0ZXh0IG1heSBoYXZlIGNoYW5nZWQuIElu Y3JlbWVudCBzdGFsZSBpdGVyYXRvciBwb3NpdGlvbnMKICAgICAgICAgaWYgKGl0ZXJhdG9ySXNC ZXlvbmRFbmRPZlJlbmRlckNvbWJpbmVUZXh0KG1fbGluZUJyZWFrLCBjb21iaW5lUmVuZGVyZXIp KSB7CkBAIC03MDIsNyArNzAyLDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5k bGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICBmbG9h dCBsYXN0U3BhY2VXb3JkU3BhY2luZyA9IDA7CiAgICAgZmxvYXQgd29yZFNwYWNpbmdGb3JXb3Jk TWVhc3VyZW1lbnQgPSAwOwogCi0gICAgZmxvYXQgd3JhcFdpZHRoT2Zmc2V0ID0gbV93aWR0aC51 bmNvbW1pdHRlZFdpZHRoKCkgKyBpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJl cigpLCAhbV9hcHBsaWVkU3RhcnRXaWR0aCwgdHJ1ZSk7CisgICAgZmxvYXQgd3JhcFdpZHRoT2Zm c2V0ID0gbV93aWR0aC51bmNvbW1pdHRlZFdpZHRoKCkgKyBpbmxpbmVMb2dpY2FsV2lkdGgocmVu ZGVyZXIsICFtX2FwcGxpZWRTdGFydFdpZHRoLCB0cnVlKTsKICAgICBmbG9hdCB3cmFwVyA9IHdy YXBXaWR0aE9mZnNldDsKICAgICBmbG9hdCBjaGFyV2lkdGggPSAwOwogICAgIGJvb2wgYnJlYWtO QlNQID0gbV9hdXRvV3JhcCAmJiBtX2N1cnJlbnRTdHlsZS0+bmJzcE1vZGUoKSA9PSBOQlNQTW9k ZTo6U3BhY2U7CkBAIC03NDUsNiArNzQ1LDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0 OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAg ICBUZXh0TGF5b3V0KiB0ZXh0TGF5b3V0ID0gbV9yZW5kZXJUZXh0SW5mby5sYXlvdXQuZ2V0KCk7 CiAgICAgV29yZFRyYWlsaW5nU3BhY2Ugd29yZFRyYWlsaW5nU3BhY2Uoc3R5bGUsICF0ZXh0TGF5 b3V0KTsKICAgICBmb3IgKDsgbV9jdXJyZW50Lm9mZnNldCgpIDwgcmVuZGVyZXIudGV4dCgpLmxl bmd0aCgpOyBtX2N1cnJlbnQuZmFzdEluY3JlbWVudEluVGV4dE5vZGUoKSkgeworICAgICAgICBB U1NFUlQoJnJlbmRlcmVyID09IG1fY3VycmVudC5yZW5kZXJlcigpKTsKICAgICAgICAgYm9vbCBw cmV2aW91c0NoYXJhY3RlcklzU3BhY2UgPSBtX2N1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlOwogICAg ICAgICBib29sIHByZXZpb3VzQ2hhcmFjdGVySXNXUyA9IG1fY3VycmVudENoYXJhY3RlcklzV1M7 CiAgICAgICAgIFVDaGFyIGMgPSBtX2N1cnJlbnQuY3VycmVudCgpOwpAQCAtNzU4LDEyICs3NTks MTIgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJl bWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgICAgIGNhbkJyZWFrTWlkV29y ZCA9IGJyZWFrQWxsOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGNhbkhhbmdQdW5jdHVhdGlv bkF0U3RhcnQgJiYgbV93aWR0aC5pc0ZpcnN0TGluZSgpICYmICFtX3dpZHRoLmNvbW1pdHRlZFdp ZHRoKCkgJiYgIXdyYXBXICYmICFpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJl cigpLCB0cnVlLCBmYWxzZSkpIHsKKyAgICAgICAgaWYgKGNhbkhhbmdQdW5jdHVhdGlvbkF0U3Rh cnQgJiYgbV93aWR0aC5pc0ZpcnN0TGluZSgpICYmICFtX3dpZHRoLmNvbW1pdHRlZFdpZHRoKCkg JiYgIXdyYXBXICYmICFpbmxpbmVMb2dpY2FsV2lkdGgocmVuZGVyZXIsIHRydWUsIGZhbHNlKSkg ewogICAgICAgICAgICAgbV93aWR0aC5hZGRVbmNvbW1pdHRlZFdpZHRoKC1yZW5kZXJlci5oYW5n YWJsZVB1bmN0dWF0aW9uU3RhcnRXaWR0aChtX2N1cnJlbnQub2Zmc2V0KCkpKTsKICAgICAgICAg ICAgIGNhbkhhbmdQdW5jdHVhdGlvbkF0U3RhcnQgPSBmYWxzZTsKICAgICAgICAgfQogICAgICAg ICAKLSAgICAgICAgaWYgKGNhbkhhbmdQdW5jdHVhdGlvbkF0RW5kICYmICFtX25leHRPYmplY3Qg JiYgKGludCltX2N1cnJlbnQub2Zmc2V0KCkgPT0gZW5kUHVuY3R1YXRpb25JbmRleCAmJiAhaW5s aW5lTG9naWNhbFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgZmFsc2UsIHRydWUpKSB7Cisg ICAgICAgIGlmIChjYW5IYW5nUHVuY3R1YXRpb25BdEVuZCAmJiAhbV9uZXh0T2JqZWN0ICYmIChp bnQpbV9jdXJyZW50Lm9mZnNldCgpID09IGVuZFB1bmN0dWF0aW9uSW5kZXggJiYgIWlubGluZUxv Z2ljYWxXaWR0aChyZW5kZXJlciwgZmFsc2UsIHRydWUpKSB7CiAgICAgICAgICAgICBtX3dpZHRo LmFkZFVuY29tbWl0dGVkV2lkdGgoLXJlbmRlcmVyLmhhbmdhYmxlUHVuY3R1YXRpb25FbmRXaWR0 aChlbmRQdW5jdHVhdGlvbkluZGV4KSk7CiAgICAgICAgICAgICBjYW5IYW5nUHVuY3R1YXRpb25B dEVuZCA9IGZhbHNlOwogICAgICAgICB9CkBAIC03OTYsNyArNzk3LDcgQEAgaW5saW5lIGJvb2wg QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJl bWVudHMsIGJvb2wKICAgICAgICAgICAgIC8vIFdlIG5lZWQgdG8gc2VlIGlmIGEgbWVhc3VyZW1l bnQgdGhhdCBleGNsdWRlcyB0aGUgc3RvcCB3b3VsZCBmaXQuIElmIHNvLCB0aGVuIHdlIHNob3Vs ZCBoYW5nCiAgICAgICAgICAgICAvLyB0aGUgc3RvcC9jb21tYSBhdCB0aGUgZW5kLiBGaXJzdCBt ZWFzdXJlIGluY2x1ZGluZyB0aGUgY29tbWEuCiAgICAgICAgICAgICBtX2hhbmdzQXRFbmQgPSBm YWxzZTsKLSAgICAgICAgICAgIGZsb2F0IGlubGluZVN0YXJ0V2lkdGggPSAhbV9hcHBsaWVkU3Rh cnRXaWR0aCA/IGlubGluZUxvZ2ljYWxXaWR0aCgqbV9jdXJyZW50LnJlbmRlcmVyKCksIHRydWUs IGZhbHNlKSA6IDBfbHU7CisgICAgICAgICAgICBmbG9hdCBpbmxpbmVTdGFydFdpZHRoID0gIW1f YXBwbGllZFN0YXJ0V2lkdGggPyBpbmxpbmVMb2dpY2FsV2lkdGgocmVuZGVyZXIsIHRydWUsIGZh bHNlKSA6IDBfbHU7CiAgICAgICAgICAgICBmbG9hdCB3aWR0aEluY2x1ZGluZ0NvbW1hID0gY29t cHV0ZUFkZGl0aW9uYWxCZXR3ZWVuV29yZHNXaWR0aChyZW5kZXJlciwgdGV4dExheW91dCwgYywg d29yZFRyYWlsaW5nU3BhY2UsIGZhbGxiYWNrRm9udHMsIHdvcmRNZWFzdXJlbWVudHMsIGZvbnQs IGlzRml4ZWRQaXRjaCwgbGFzdFNwYWNlLCBsYXN0U3BhY2VXb3JkU3BhY2luZywgd29yZFNwYWNp bmdGb3JXb3JkTWVhc3VyZW1lbnQsIG1fY3VycmVudC5vZmZzZXQoKSArIDEpICsgaW5saW5lU3Rh cnRXaWR0aDsKICAgICAgICAgICAgIG1fd2lkdGguYWRkVW5jb21taXR0ZWRXaWR0aCh3aWR0aElu Y2x1ZGluZ0NvbW1hKTsKICAgICAgICAgICAgIGlmICghbV93aWR0aC5maXRzT25MaW5lKCkpIHsK QEAgLTgxOCw3ICs4MTksNyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRl eHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICAgICAg ICAgICAgICBtX2lnbm9yaW5nU3BhY2VzID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgICAgIHdv cmRTcGFjaW5nRm9yV29yZE1lYXN1cmVtZW50ID0gMDsKICAgICAgICAgICAgICAgICAgICAgbGFz dFNwYWNlID0gbV9jdXJyZW50Lm9mZnNldCgpOyAvLyBlLmcuLCAiRm9vICAgIGdvbyIsIGRvbid0 IGFkZCBpbiBhbnkgb2YgdGhlIGlnbm9yZWQgc3BhY2VzLgotICAgICAgICAgICAgICAgICAgICBt X2xpbmVXaGl0ZXNwYWNlQ29sbGFwc2luZ1N0YXRlLnN0b3BJZ25vcmluZ1NwYWNlcyhJbmxpbmVJ dGVyYXRvcigwLCBtX2N1cnJlbnQucmVuZGVyZXIoKSwgbV9jdXJyZW50Lm9mZnNldCgpKSk7Cisg ICAgICAgICAgICAgICAgICAgIG1fbGluZVdoaXRlc3BhY2VDb2xsYXBzaW5nU3RhdGUuc3RvcEln bm9yaW5nU3BhY2VzKElubGluZUl0ZXJhdG9yKDAsICZyZW5kZXJlciwgbV9jdXJyZW50Lm9mZnNl dCgpKSk7CiAgICAgICAgICAgICAgICAgICAgIHN0b3BwZWRJZ25vcmluZ1NwYWNlcyA9IHRydWU7 CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgLy8gSnVzdCBr ZWVwIGlnbm9yaW5nIHRoZXNlIHNwYWNlcy4KQEAgLTgzNiw3ICs4MzcsNyBAQCBpbmxpbmUgYm9v bCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1 cmVtZW50cywgYm9vbAogICAgICAgICAgICAgICAgIG1fd2lkdGguc2V0VHJhaWxpbmdXaGl0ZXNw YWNlV2lkdGgoYWRkaXRpb25hbFRlbXBXaWR0aCk7CiAKICAgICAgICAgICAgIGlmICghbV9hcHBs aWVkU3RhcnRXaWR0aCkgewotICAgICAgICAgICAgICAgIGZsb2F0IGlubGluZVN0YXJ0V2lkdGgg PSBpbmxpbmVMb2dpY2FsV2lkdGgoKm1fY3VycmVudC5yZW5kZXJlcigpLCB0cnVlLCBmYWxzZSk7 CisgICAgICAgICAgICAgICAgZmxvYXQgaW5saW5lU3RhcnRXaWR0aCA9IGlubGluZUxvZ2ljYWxX aWR0aChyZW5kZXJlciwgdHJ1ZSwgZmFsc2UpOwogICAgICAgICAgICAgICAgIG1fd2lkdGguYWRk VW5jb21taXR0ZWRXaWR0aChpbmxpbmVTdGFydFdpZHRoKTsKICAgICAgICAgICAgICAgICBtX2Fw cGxpZWRTdGFydFdpZHRoID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBpZiAobV9oYW5nc0F0RW5k ICYmIGlubGluZVN0YXJ0V2lkdGgpCkBAIC04OTcsNyArODk4LDcgQEAgaW5saW5lIGJvb2wgQnJl YWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVu dHMsIGJvb2wKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobV9jdXJyZW50Lm5l eHRCcmVha2FibGVQb3NpdGlvbigpICYmIG1fY3VycmVudC5uZXh0QnJlYWthYmxlUG9zaXRpb24o KS52YWx1ZSgpIDw9IG1fY3VycmVudC5vZmZzZXQoKSkgewogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIFdlIG1pZ2h0IGp1c3QgYmUgcmlnaHQgYWZ0ZXIgdGhlIHNvZnQtaHlwaGVuCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdEJyZWFraW5nUG9zaXRpb24gPSBtX2N1cnJl bnQubmV4dEJyZWFrYWJsZVBvc2l0aW9uKCkudmFsdWUoKTsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZW5kZXJlckF0QnJlYWtpbmdQb3NpdGlvbiA9IG1fY3VycmVudC5yZW5kZXJlcigp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbmRlcmVyQXRCcmVha2luZ1Bvc2l0aW9u ID0gJnJlbmRlcmVyOwogICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKGxhc3RCcmVha2luZ1Bvc2l0aW9uKSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgT3B0aW9uYWw8VUNoYXI+IGNoYXJhY3RlckJlZm9yZUJyZWFraW5nUG9zaXRpb247 CkBAIC05OTYsNyArOTk3LDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVU ZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgICAg ICAgICBsYXN0U3BhY2VXb3JkU3BhY2luZyA9IGFwcGx5V29yZFNwYWNpbmcgPyB3b3JkU3BhY2lu ZyA6IDA7CiAgICAgICAgICAgICAgICAgd29yZFNwYWNpbmdGb3JXb3JkTWVhc3VyZW1lbnQgPSAo YXBwbHlXb3JkU3BhY2luZyAmJiB3b3JkTWVhc3VyZW1lbnRzLmxhc3QoKS53aWR0aCkgPyB3b3Jk U3BhY2luZyA6IDA7CiAgICAgICAgICAgICAgICAgbGFzdFNwYWNlID0gbV9jdXJyZW50Lm9mZnNl dCgpOyAvLyBlLmcuLCAiRm9vICAgIGdvbyIsIGRvbid0IGFkZCBpbiBhbnkgb2YgdGhlIGlnbm9y ZWQgc3BhY2VzLgotICAgICAgICAgICAgICAgIG1fbGluZVdoaXRlc3BhY2VDb2xsYXBzaW5nU3Rh dGUuc3RvcElnbm9yaW5nU3BhY2VzKElubGluZUl0ZXJhdG9yKG51bGxwdHIsIG1fY3VycmVudC5y ZW5kZXJlcigpLCBtX2N1cnJlbnQub2Zmc2V0KCkpKTsKKyAgICAgICAgICAgICAgICBtX2xpbmVX aGl0ZXNwYWNlQ29sbGFwc2luZ1N0YXRlLnN0b3BJZ25vcmluZ1NwYWNlcyhJbmxpbmVJdGVyYXRv cihudWxscHRyLCAmcmVuZGVyZXIsIG1fY3VycmVudC5vZmZzZXQoKSkpOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgaWYgKG1faGFuZ3NBdEVuZCAmJiAhcmVuZGVyZXIuaXNIYW5nYWJsZVN0 b3BPckNvbW1hKGMpKQogICAgICAgICAgICAgICAgIG1faGFuZ3NBdEVuZCA9IGZhbHNlOwpAQCAt MTAwOSw3ICsxMDEwLDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0 KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgfQogCiAg ICAgICAgIGlmIChtX2N1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlICYmICFwcmV2aW91c0NoYXJhY3Rl cklzU3BhY2UpIHsKLSAgICAgICAgICAgIG1fc3RhcnRPZklnbm9yZWRTcGFjZXMuc2V0UmVuZGVy ZXIobV9jdXJyZW50LnJlbmRlcmVyKCkpOworICAgICAgICAgICAgbV9zdGFydE9mSWdub3JlZFNw YWNlcy5zZXRSZW5kZXJlcigmcmVuZGVyZXIpOwogICAgICAgICAgICAgbV9zdGFydE9mSWdub3Jl ZFNwYWNlcy5zZXRPZmZzZXQobV9jdXJyZW50Lm9mZnNldCgpKTsKICAgICAgICAgICAgIC8vIFNw YWNlcyBhZnRlciByaWdodC1hbGlnbmVkIHRleHQgYW5kIGJlZm9yZSBhIGxpbmUtYnJlYWsgZ2V0 IGNvbGxhcHNlZCBhd2F5IGNvbXBsZXRlbHkgc28gdGhhdCB0aGUgdHJhaWxpbmcKICAgICAgICAg ICAgIC8vIHNwYWNlIGRvZXNuJ3Qgc2VlbSB0byBwdXNoIHRoZSB0ZXh0IG91dCBmcm9tIHRoZSBy aWdodC1oYW5kIGVkZ2UuCkBAIC0xMDI4LDcgKzEwMjksNyBAQCBpbmxpbmUgYm9vbCBCcmVha2lu Z0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywg Ym9vbAogICAgICAgICB9CiAKICAgICAgICAgaWYgKG1fY29sbGFwc2VXaGl0ZVNwYWNlICYmIG1f Y3VycmVudENoYXJhY3RlcklzU3BhY2UgJiYgIW1faWdub3JpbmdTcGFjZXMpCi0gICAgICAgICAg ICBtX3RyYWlsaW5nT2JqZWN0cy5zZXRUcmFpbGluZ1doaXRlc3BhY2UoZG93bmNhc3Q8UmVuZGVy VGV4dD4obV9jdXJyZW50LnJlbmRlcmVyKCkpKTsKKyAgICAgICAgICAgIG1fdHJhaWxpbmdPYmpl Y3RzLnNldFRyYWlsaW5nV2hpdGVzcGFjZShyZW5kZXJlcik7CiAgICAgICAgIGVsc2UgaWYgKCFt X2N1cnJlbnRTdHlsZS0+Y29sbGFwc2VXaGl0ZVNwYWNlKCkgfHwgIW1fY3VycmVudENoYXJhY3Rl cklzU3BhY2UpCiAgICAgICAgICAgICBtX3RyYWlsaW5nT2JqZWN0cy5jbGVhcigpOwogCkBAIC0x MDQ5LDcgKzEwNTAsNyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQo V29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgIHdvcmRNZWFzdXJl bWVudC53aWR0aCA9IG1faWdub3JpbmdTcGFjZXMgPyAwIDogYWRkaXRpb25hbFRlbXBXaWR0aCAr IHdvcmRTcGFjaW5nRm9yV29yZE1lYXN1cmVtZW50OwogICAgIGFkZGl0aW9uYWxUZW1wV2lkdGgg Kz0gbGFzdFNwYWNlV29yZFNwYWNpbmc7CiAKLSAgICBmbG9hdCBpbmxpbmVMb2dpY2FsVGVtcFdp ZHRoID0gaW5saW5lTG9naWNhbFdpZHRoKCptX2N1cnJlbnQucmVuZGVyZXIoKSwgIW1fYXBwbGll ZFN0YXJ0V2lkdGgsIG1faW5jbHVkZUVuZFdpZHRoKTsKKyAgICBmbG9hdCBpbmxpbmVMb2dpY2Fs VGVtcFdpZHRoID0gaW5saW5lTG9naWNhbFdpZHRoKHJlbmRlcmVyLCAhbV9hcHBsaWVkU3RhcnRX aWR0aCwgbV9pbmNsdWRlRW5kV2lkdGgpOwogICAgIG1fd2lkdGguYWRkVW5jb21taXR0ZWRXaWR0 aChhZGRpdGlvbmFsVGVtcFdpZHRoICsgaW5saW5lTG9naWNhbFRlbXBXaWR0aCk7CiAgICAgaWYg KG1faGFuZ3NBdEVuZCAmJiBpbmxpbmVMb2dpY2FsVGVtcFdpZHRoKQogICAgICAgICBtX2hhbmdz QXRFbmQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5l L1RyYWlsaW5nT2JqZWN0cy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvVHJhaWxp bmdPYmplY3RzLmgKaW5kZXggZGJkMmIwZDJiOTJlOTU5NjUyODUxZmVjMTg5MDRkYmM0OTI5MWMy NC4uYmNhYmVkY2JjMzdlY2VlMWVmMjQ5Yzc2MTc1MzE0YTYxOWFlYWY1NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvVHJhaWxpbmdPYmplY3RzLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvVHJhaWxpbmdPYmplY3RzLmgKQEAgLTQ3LDEwICs0 Nyw5IEBAIHB1YmxpYzoKICAgICAgICAgOiBtX3doaXRlc3BhY2UoMCkKICAgICB7IH0KIAotICAg IHZvaWQgc2V0VHJhaWxpbmdXaGl0ZXNwYWNlKFJlbmRlclRleHQqIHdoaXRlc3BhY2UpCisgICAg dm9pZCBzZXRUcmFpbGluZ1doaXRlc3BhY2UoUmVuZGVyVGV4dCYgd2hpdGVzcGFjZSkKICAgICB7 Ci0gICAgICAgIEFTU0VSVCh3aGl0ZXNwYWNlKTsKLSAgICAgICAgbV93aGl0ZXNwYWNlID0gd2hp dGVzcGFjZTsKKyAgICAgICAgbV93aGl0ZXNwYWNlID0gJndoaXRlc3BhY2U7CiAgICAgfQogCiAg ICAgdm9pZCBjbGVhcigpCg==