232621 2021-11-02 07:01:34 -0700 [LFC][Integration] Add support for IFC preferred width computation 2021-11-02 09:02:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232616 232620 1 koivisto koivisto bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1811095 0 koivisto 2021-11-02 07:01:34 -0700 But don't enable it yet. 1811096 1 443083 koivisto 2021-11-02 07:06:21 -0700 Created attachment 443083 Patch 1811097 2 443084 koivisto 2021-11-02 07:08:02 -0700 Created attachment 443084 Patch 1811119 3 443084 zalan 2021-11-02 08:25:33 -0700 Comment on attachment 443084 Patch a+ 1811139 4 ews-feeder 2021-11-02 09:01:36 -0700 Committed r285162 (243798@main): <https://commits.webkit.org/243798@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443084. 1811140 5 webkit-bug-importer 2021-11-02 09:02:18 -0700 <rdar://problem/84932794> 443083 2021-11-02 07:06:21 -0700 2021-11-02 07:07:58 -0700 Patch bug-232621-20211102160620.patch text/plain 10473 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjE1YmQzZDdiZmNmZTRj MGFjZGQ5ZGY2ZjFiZjZiZjEzZTQ3ZmQzYi4uYjY2YzFiNDc1ZmZlNmYzMzk4MjkyNjA1MjkyYzcw OTRmNDEyYmFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTExLTAyICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv bl0gQWRkIHN1cHBvcnQgZm9yIElGQyBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjYyMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBmdW5jdGlvbmFs aXR5IGlzIGJlaGluZCBhICNkZWZpbmUgYW5kIG5vdCBlbmFibGVkIHlldC4KKworICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk6CisKKyAgICAgICAgUmV0dXJuIHRo ZSBjYWNoZWQgdmFsdWUgaWYgaXQgZXhpc3RzLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBs YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojpjb21wdXRlSW50cmlu c2ljV2lkdGhDb25zdHJhaW50cyk6CisKKyAgICAgICAgSW50ZXJmYWNlIHdpdGggSUZDLgorCisg ICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2tGbG93Ojpjb21wdXRlQW5kU2V0TGluZUxheW91dFBhdGgpOgorCisg ICAgICAgIEZhY3RvciBpbnRvIGEgZnVuY3Rpb24uCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrRmxvdzo6bGF5b3V0SW5saW5lQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdpZHRocyBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OnRyeUNvbXB1dGVQcmVmZXJyZWRX aWR0aHNVc2luZ01vZGVyblBhdGgpOgorCisgICAgICAgIFRlc3QgaWYgd2UgdGhlIGNvbnRlbnQg Y2FuIHVzZSB0aGUgSUZDIHByZWZlcnJlZCB3aWR0aCBjb21wdXRhdGlvbi4gVGhpcyB3YXkgdGhl CisgICAgICAgIGZlYXR1cmUgY2FuIGJlIGVuYWJsZWQgaW5jcmVtZW50YWxseS4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaDoKKwogMjAyMS0xMS0wMSAgRGFuaWVsIEtv bGVzYSAgPGRrb2xlc2FAaWdhbGlhLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQgd2l0aCBHQ0Mg OC40IG9uIFVidW50dSAxOC4wNApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuY3BwCmluZGV4IDc1YzMwYTI3YjU5MzIwZTYzZDY4NTZjZTAxNTU5MTdhMjA3 ZDI2YTguLjBhZDdlODlkNWUyNTk0NjBjYjUyM2IxMTlhMjZmNTBkMmIwNGNjNzEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTM1OSw3 ICszNTksOCBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9z aXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KGNvbnN0IEZvcgogSW50cmluc2ljV2lkdGhDb25zdHJh aW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0 cmFpbnRzKCkKIHsKICAgICBhdXRvJiBsYXlvdXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7 Ci0gICAgQVNTRVJUKCFmb3JtYXR0aW5nU3RhdGUoKS5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KCkpOworICAgIGlmIChmb3JtYXR0aW5nU3RhdGUoKS5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KCkpCisgICAgICAgIHJldHVybiAqZm9ybWF0dGluZ1N0YXRlKCkuaW50cmluc2ljV2lkdGhDb25z dHJhaW50cygpOwogCiAgICAgaWYgKCFyb290KCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkp IHsKICAgICAgICAgYXV0byBjb25zdHJhaW50cyA9IGZvcm1hdHRpbmdHZW9tZXRyeSgpLmNvbnN0 cmFpbkJ5TWluTWF4V2lkdGgocm9vdCgpLCB7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNTY4MmI4Nzg3YTEzZGI5YWZiZTZiZDdlOWE4 NjQ5ZjJjNmNiMTEzZi4uY2U4MDVjMDA5NDYyNmVmMGRlNWFhZGI2ZDc2OWNiOGQ4MjAyMGNiYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01 OCw5ICs1OCw5IEBAIHB1YmxpYzoKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkm IGZvcm1hdHRpbmdHZW9tZXRyeSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1faW5saW5lRm9ybWF0 dGluZ0dlb21ldHJ5OyB9CiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ1F1aXJrcyYgZm9ybWF0 dGluZ1F1aXJrcygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ1F1aXJr czsgfQogCi1wcml2YXRlOgogICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29tcHV0ZWRJ bnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJpZGU7CiAKK3ByaXZhdGU6CiAgICAgdm9p ZCBsaW5lTGF5b3V0KElubGluZUl0ZW1zJiwgTGluZUJ1aWxkZXI6OklubGluZUl0ZW1SYW5nZSwg Y29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7CiAgICAgdm9pZCBjb21wdXRlU3Rh dGljUG9zaXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KGNvbnN0IEZvcm1hdHRpbmdTdGF0ZTo6T3V0 T2ZGbG93Qm94TGlzdCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4 IDQ0Yzg1ZjgzZDNkMjE0MGEwYjI4ZGVjMjNlMjFkN2IzYjk1MjI4OTcuLjhkNDQ0NmIzZTQxMmUx MzlkZTY1MTVhODNjZWJkMWMzZWRlMGIzYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwCkBAIC0yMTcsNiArMjE3LDE0IEBAIHZvaWQgTGluZUxheW91dDo6dXBkYXRlU3R5bGUo Y29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIHJlbmRlcmVyLCBjb25zdCBSZW5kZXJTCiAgICAg bV9ib3hUcmVlLnVwZGF0ZVN0eWxlKHJlbmRlcmVyKTsKIH0KIAorc3RkOjpwYWlyPExheW91dFVu aXQsIExheW91dFVuaXQ+IExpbmVMYXlvdXQ6OmNvbXB1dGVJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzKCkKK3sKKyAgICBhdXRvIGlubGluZUZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dCB7IHJvb3RMYXlvdXRCb3goKSwgbV9pbmxpbmVGb3JtYXR0aW5n U3RhdGUsIG51bGxwdHIgfTsKKyAgICBhdXRvIGNvbnN0cmFpbnRzID0gaW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCk7CisKKyAgICByZXR1 cm4geyBjb25zdHJhaW50cy5taW5pbXVtLCBjb25zdHJhaW50cy5tYXhpbXVtIH07Cit9CisKIHZv aWQgTGluZUxheW91dDo6bGF5b3V0KCkKIHsKICAgICBhdXRvJiByb290TGF5b3V0Qm94ID0gdGhp cy0+cm9vdExheW91dEJveCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oCmluZGV4IDkz ZjExYTJlYTIwOWUzYzUyMjg2NDUyMjI5OGQ2N2QzZTNkYTFiMzcuLjkwZTM4YTQ1NDJmYmFhNDll MWVjNGM1OGM5ZTM3YmMyYTA5YTg2MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmgK QEAgLTc5LDYgKzc5LDkgQEAgcHVibGljOgogICAgIHZvaWQgdXBkYXRlTGluZUJyZWFrQm94RGlt ZW5zaW9ucyhjb25zdCBSZW5kZXJMaW5lQnJlYWsmKTsKICAgICB2b2lkIHVwZGF0ZUlubGluZUJv eERpbWVuc2lvbnMoY29uc3QgUmVuZGVySW5saW5lJik7CiAgICAgdm9pZCB1cGRhdGVTdHlsZShj b25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYsIGNvbnN0IFJlbmRlclN0eWxlJiBvbGRTdHlsZSk7 CisKKyAgICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gY29tcHV0ZUludHJpbnNp Y1dpZHRoQ29uc3RyYWludHMoKTsKKwogICAgIHZvaWQgbGF5b3V0KCk7CiAKICAgICBMYXlvdXRV bml0IGNvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IGYyYzYyOGY2NzFiYmZlNWNiODhlNTg1Y2Nh ZGZhMmYyY2U3NTE2ZmQuLjY1ZWViMTZlMDI5MDMyYjY2Yjk4MzE3OGViZWU0NjI3MTcyZDYzMzgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC02 OSw2ICs2OSw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorI2RlZmluZSBFTkFCTEVfTU9E RVJOX1BSRUZFUlJFRF9XSURUSF9DT01QVVRBVElPTiAwCisjZGVmaW5lIEVOQUJMRV9NT0RFUk5f UFJFRkVSUkVEX1dJRFRIX0NPTVBVVEFUSU9OX0ZPUl9JTkxJTkVfQk9YRVMgMAorCiBXVEZfTUFL RV9JU09fQUxMT0NBVEVEX0lNUEwoUmVuZGVyQmxvY2tGbG93KTsKIAogYm9vbCBSZW5kZXJCbG9j azo6c19jYW5Qcm9wYWdhdGVGbG9hdEludG9TaWJsaW5nID0gZmFsc2U7CkBAIC02ODMsOSArNjg2 LDEyIEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRCbG9ja0NoaWxkcmVuKGJvb2wgcmVs YXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgbWF4CiAgICAgaGFuZGxlQWZ0ZXJTaWRlT2ZCbG9j ayhiZWZvcmVFZGdlLCBhZnRlckVkZ2UsIG1hcmdpbkluZm8pOwogfQogCi12b2lkIFJlbmRlckJs b2NrRmxvdzo6bGF5b3V0SW5saW5lQ2hpbGRyZW4oYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlv dXRVbml0JiByZXBhaW50TG9naWNhbFRvcCwgTGF5b3V0VW5pdCYgcmVwYWludExvZ2ljYWxCb3R0 b20pCit2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUFuZFNldExpbmVMYXlvdXRQYXRoKCkK IHsKLSAgICBhdXRvIGNvbXB1dGVMaW5lTGF5b3V0UGF0aCA9IFsmXSB7CisgICAgaWYgKGxpbmVM YXlvdXRQYXRoKCkgIT0gVW5kZXRlcm1pbmVkUGF0aCkKKyAgICAgICAgcmV0dXJuOworCisgICAg YXV0byBjb21wdXRlID0gWyZdIHsKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVY VCkKICAgICAgICAgaWYgKExheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpjYW5Vc2VGb3Io KnRoaXMpKQogICAgICAgICAgICAgcmV0dXJuIE1vZGVyblBhdGg7CkBAIC02OTMsOCArNjk5LDEy IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRJbmxpbmVDaGlsZHJlbihib29sIHJlbGF5 b3V0Q2hpbGRyZW4sIExheW91dFVuaXQmIHJlCiAgICAgICAgIHJldHVybiBMZWdhY3lQYXRoOwog ICAgIH07CiAKLSAgICBpZiAobGluZUxheW91dFBhdGgoKSA9PSBVbmRldGVybWluZWRQYXRoKQot ICAgICAgICBzZXRMaW5lTGF5b3V0UGF0aChjb21wdXRlTGluZUxheW91dFBhdGgoKSk7CisgICAg c2V0TGluZUxheW91dFBhdGgoY29tcHV0ZSgpKTsKK30KKwordm9pZCBSZW5kZXJCbG9ja0Zsb3c6 OmxheW91dElubGluZUNoaWxkcmVuKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYg cmVwYWludExvZ2ljYWxUb3AsIExheW91dFVuaXQmIHJlcGFpbnRMb2dpY2FsQm90dG9tKQorewor ICAgIGNvbXB1dGVBbmRTZXRMaW5lTGF5b3V0UGF0aCgpOwogCiAjaWYgRU5BQkxFKExBWU9VVF9G T1JNQVRUSU5HX0NPTlRFWFQpCiAgICAgaWYgKGxpbmVMYXlvdXRQYXRoKCkgPT0gTW9kZXJuUGF0 aCkgewpAQCAtNDI2MSw2ICs0MjcxLDExIEBAIHN0YXRpYyBpbmxpbmUgTGF5b3V0VW5pdCBwcmVm ZXJyZWRXaWR0aChMYXlvdXRVbml0IHByZWZlcnJlZFdpZHRoLCBmbG9hdCByZXN1bHQpCiAKIHZv aWQgUmVuZGVyQmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdpZHRocyhM YXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkg Y29uc3QKIHsKKyNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKKyAgICBpZiAo Y29uc3RfY2FzdDxSZW5kZXJCbG9ja0Zsb3cmPigqdGhpcykudHJ5Q29tcHV0ZVByZWZlcnJlZFdp ZHRoc1VzaW5nTW9kZXJuUGF0aChtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCkpCisg ICAgICAgIHJldHVybjsKKyNlbmRpZgorCiAgICAgZmxvYXQgaW5saW5lTWF4ID0gMDsKICAgICBm bG9hdCBpbmxpbmVNaW4gPSAwOwogCkBAIC00NTk5LDUgKzQ2MTQsNDYgQEAgdm9pZCBSZW5kZXJC bG9ja0Zsb3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKExheW91dFVuaXQm IG1pbkxvZ2ljYWwKICAgICBtYXhMb2dpY2FsV2lkdGggPSBwcmVmZXJyZWRXaWR0aChtYXhMb2dp Y2FsV2lkdGgsIGlubGluZU1heCk7CiB9CiAKKyNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdf Q09OVEVYVCkKK2Jvb2wgUmVuZGVyQmxvY2tGbG93Ojp0cnlDb21wdXRlUHJlZmVycmVkV2lkdGhz VXNpbmdNb2Rlcm5QYXRoKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYg bWF4TG9naWNhbFdpZHRoKQoreworI2lmIEVOQUJMRV9NT0RFUk5fUFJFRkVSUkVEX1dJRFRIX0NP TVBVVEFUSU9OCisgICAgY29tcHV0ZUFuZFNldExpbmVMYXlvdXRQYXRoKCk7CisKKyAgICAvLyBG SVhNRTogUGFzcyB0aGUgcmVwbGFjZWQgYW5kIGlubGluZSBibG9jayBjb25zdHJhaW5zdCB0byBJ RkMuCisgICAgYXV0byBjYW5Vc2VNb2Rlcm5QYXRoRm9yUHJlZmVycmVkV2lkdGhDb21wdXRhdGlv biA9IFsmXSB7CisgICAgICAgIGlmIChsaW5lTGF5b3V0UGF0aCgpICE9IE1vZGVyblBhdGgpCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGZvciAoYXV0byB3YWxrZXIgPSBJbmxp bmVXYWxrZXIoKnRoaXMpOyAhd2Fsa2VyLmF0RW5kKCk7IHdhbGtlci5hZHZhbmNlKCkpIHsKKyAg ICAgICAgICAgIGF1dG8mIHJlbmRlcmVyID0gKndhbGtlci5jdXJyZW50KCk7CisgICAgICAgICAg ICBpZiAocmVuZGVyZXIuaXNUZXh0KCkpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgICAgICBpZiAoaXM8UmVuZGVyTGluZUJyZWFrPihyZW5kZXJlcikpCisgICAgICAgICAgICAg ICAgY29udGludWU7CisjaWYgRU5BQkxFX01PREVSTl9QUkVGRVJSRURfV0lEVEhfQ09NUFVUQVRJ T05fRk9SX0lOTElORV9CT1hFUworICAgICAgICAgICAgaWYgKGlzPFJlbmRlcklubGluZT4ocmVu ZGVyZXIpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworI2VuZGlmCisgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfTsKKwor ICAgIGlmICghY2FuVXNlTW9kZXJuUGF0aEZvclByZWZlcnJlZFdpZHRoQ29tcHV0YXRpb24oKSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFtb2Rlcm5MaW5lTGF5b3V0KCkpCisg ICAgICAgIG1fbGluZUxheW91dCA9IG1ha2VVbmlxdWU8TGF5b3V0SW50ZWdyYXRpb246OkxpbmVM YXlvdXQ+KCp0aGlzKTsKKworICAgIHN0ZDo6dGllKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNh bFdpZHRoKSA9IG1vZGVybkxpbmVMYXlvdXQoKS0+Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3Ry YWludHMoKTsKKyAgICByZXR1cm4gdHJ1ZTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKG1pbkxv Z2ljYWxXaWR0aCk7CisgICAgVU5VU0VEX1BBUkFNKG1heExvZ2ljYWxXaWR0aCk7CisgICAgcmV0 dXJuIGZhbHNlOworI2VuZGlmCit9CisjZW5kaWYKKwogfQogLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaAppbmRleCBlMGM3OTcz MDkzODc5ZGVmNGZkYmE2ZDJiZGFmNDc0MmMxOTFlMWM1Li42MWE0NjQ1ODE4YzVlOWZmNDdhMmQx NTYyNDA3ZjFlMjE4ZmUzYWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5oCkBAIC0zNDQsMTAgKzM0NCwxMiBAQCBwdWJsaWM6CiAKICAgICBib29sIGhhc0xp bmVzKCkgY29uc3Q7CiAgICAgdm9pZCBpbnZhbGlkYXRlTGluZUxheW91dFBhdGgoKSBmaW5hbDsK KyAgICB2b2lkIGNvbXB1dGVBbmRTZXRMaW5lTGF5b3V0UGF0aCgpOwogCiAgICAgZW51bSBMaW5l TGF5b3V0UGF0aCB7IFVuZGV0ZXJtaW5lZFBhdGggPSAwLCBNb2Rlcm5QYXRoLCBMZWdhY3lQYXRo LCBGb3JjZWRMZWdhY3lQYXRoIH07CiAgICAgTGluZUxheW91dFBhdGggbGluZUxheW91dFBhdGgo KSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxMaW5lTGF5b3V0UGF0aD4ocmVuZGVyQmxvY2tG bG93TGluZUxheW91dFBhdGgoKSk7IH0KICAgICB2b2lkIHNldExpbmVMYXlvdXRQYXRoKExpbmVM YXlvdXRQYXRoIHBhdGgpIHsgc2V0UmVuZGVyQmxvY2tGbG93TGluZUxheW91dFBhdGgocGF0aCk7 IH0KKyAgICB2b2lkIGNvbXB1dGVMaW5lTGF5b3V0UGF0aCgpOwogCiAgICAgaW50IGxpbmVDb3Vu dCgpIGNvbnN0OwogICAgIHZvaWQgY2xlYXJUcnVuY2F0aW9uKCk7CkBAIC01NDUsNiArNTQ3LDcg QEAgcHJpdmF0ZToKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKICAgICBi b29sIGhhc01vZGVybkxpbmVMYXlvdXQoKSBjb25zdDsKICAgICB2b2lkIGxheW91dE1vZGVybkxp bmVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgcmVwYWludExvZ2ljYWxUb3As IExheW91dFVuaXQmIHJlcGFpbnRMb2dpY2FsQm90dG9tKTsKKyAgICBib29sIHRyeUNvbXB1dGVQ cmVmZXJyZWRXaWR0aHNVc2luZ01vZGVyblBhdGgoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRo LCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpOwogI2VuZGlmCiAKICAgICB2b2lkIGFkanVz dEludHJpbnNpY0xvZ2ljYWxXaWR0aHNGb3JDb2x1bW5zKExheW91dFVuaXQmIG1pbkxvZ2ljYWxX aWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdDsK 443084 2021-11-02 07:08:02 -0700 2021-11-02 09:01:37 -0700 Patch bug-232621-20211102160801.patch text/plain 10284 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjE1YmQzZDdiZmNmZTRj MGFjZGQ5ZGY2ZjFiZjZiZjEzZTQ3ZmQzYi4uYjY2YzFiNDc1ZmZlNmYzMzk4MjkyNjA1MjkyYzcw OTRmNDEyYmFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTExLTAyICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv bl0gQWRkIHN1cHBvcnQgZm9yIElGQyBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjYyMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBmdW5jdGlvbmFs aXR5IGlzIGJlaGluZCBhICNkZWZpbmUgYW5kIG5vdCBlbmFibGVkIHlldC4KKworICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk6CisKKyAgICAgICAgUmV0dXJuIHRo ZSBjYWNoZWQgdmFsdWUgaWYgaXQgZXhpc3RzLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBs YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojpjb21wdXRlSW50cmlu c2ljV2lkdGhDb25zdHJhaW50cyk6CisKKyAgICAgICAgSW50ZXJmYWNlIHdpdGggSUZDLgorCisg ICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2tGbG93Ojpjb21wdXRlQW5kU2V0TGluZUxheW91dFBhdGgpOgorCisg ICAgICAgIEZhY3RvciBpbnRvIGEgZnVuY3Rpb24uCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrRmxvdzo6bGF5b3V0SW5saW5lQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdpZHRocyBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OnRyeUNvbXB1dGVQcmVmZXJyZWRX aWR0aHNVc2luZ01vZGVyblBhdGgpOgorCisgICAgICAgIFRlc3QgaWYgd2UgdGhlIGNvbnRlbnQg Y2FuIHVzZSB0aGUgSUZDIHByZWZlcnJlZCB3aWR0aCBjb21wdXRhdGlvbi4gVGhpcyB3YXkgdGhl CisgICAgICAgIGZlYXR1cmUgY2FuIGJlIGVuYWJsZWQgaW5jcmVtZW50YWxseS4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaDoKKwogMjAyMS0xMS0wMSAgRGFuaWVsIEtv bGVzYSAgPGRrb2xlc2FAaWdhbGlhLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQgd2l0aCBHQ0Mg OC40IG9uIFVidW50dSAxOC4wNApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuY3BwCmluZGV4IDc1YzMwYTI3YjU5MzIwZTYzZDY4NTZjZTAxNTU5MTdhMjA3 ZDI2YTguLjBhZDdlODlkNWUyNTk0NjBjYjUyM2IxMTlhMjZmNTBkMmIwNGNjNzEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTM1OSw3 ICszNTksOCBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9z aXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KGNvbnN0IEZvcgogSW50cmluc2ljV2lkdGhDb25zdHJh aW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0 cmFpbnRzKCkKIHsKICAgICBhdXRvJiBsYXlvdXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7 Ci0gICAgQVNTRVJUKCFmb3JtYXR0aW5nU3RhdGUoKS5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KCkpOworICAgIGlmIChmb3JtYXR0aW5nU3RhdGUoKS5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KCkpCisgICAgICAgIHJldHVybiAqZm9ybWF0dGluZ1N0YXRlKCkuaW50cmluc2ljV2lkdGhDb25z dHJhaW50cygpOwogCiAgICAgaWYgKCFyb290KCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkp IHsKICAgICAgICAgYXV0byBjb25zdHJhaW50cyA9IGZvcm1hdHRpbmdHZW9tZXRyeSgpLmNvbnN0 cmFpbkJ5TWluTWF4V2lkdGgocm9vdCgpLCB7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNTY4MmI4Nzg3YTEzZGI5YWZiZTZiZDdlOWE4 NjQ5ZjJjNmNiMTEzZi4uY2U4MDVjMDA5NDYyNmVmMGRlNWFhZGI2ZDc2OWNiOGQ4MjAyMGNiYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01 OCw5ICs1OCw5IEBAIHB1YmxpYzoKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkm IGZvcm1hdHRpbmdHZW9tZXRyeSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1faW5saW5lRm9ybWF0 dGluZ0dlb21ldHJ5OyB9CiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ1F1aXJrcyYgZm9ybWF0 dGluZ1F1aXJrcygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ1F1aXJr czsgfQogCi1wcml2YXRlOgogICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29tcHV0ZWRJ bnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJpZGU7CiAKK3ByaXZhdGU6CiAgICAgdm9p ZCBsaW5lTGF5b3V0KElubGluZUl0ZW1zJiwgTGluZUJ1aWxkZXI6OklubGluZUl0ZW1SYW5nZSwg Y29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7CiAgICAgdm9pZCBjb21wdXRlU3Rh dGljUG9zaXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KGNvbnN0IEZvcm1hdHRpbmdTdGF0ZTo6T3V0 T2ZGbG93Qm94TGlzdCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4 IDQ0Yzg1ZjgzZDNkMjE0MGEwYjI4ZGVjMjNlMjFkN2IzYjk1MjI4OTcuLjhkNDQ0NmIzZTQxMmUx MzlkZTY1MTVhODNjZWJkMWMzZWRlMGIzYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwCkBAIC0yMTcsNiArMjE3LDE0IEBAIHZvaWQgTGluZUxheW91dDo6dXBkYXRlU3R5bGUo Y29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIHJlbmRlcmVyLCBjb25zdCBSZW5kZXJTCiAgICAg bV9ib3hUcmVlLnVwZGF0ZVN0eWxlKHJlbmRlcmVyKTsKIH0KIAorc3RkOjpwYWlyPExheW91dFVu aXQsIExheW91dFVuaXQ+IExpbmVMYXlvdXQ6OmNvbXB1dGVJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzKCkKK3sKKyAgICBhdXRvIGlubGluZUZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dCB7IHJvb3RMYXlvdXRCb3goKSwgbV9pbmxpbmVGb3JtYXR0aW5n U3RhdGUsIG51bGxwdHIgfTsKKyAgICBhdXRvIGNvbnN0cmFpbnRzID0gaW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuY29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCk7CisKKyAgICByZXR1 cm4geyBjb25zdHJhaW50cy5taW5pbXVtLCBjb25zdHJhaW50cy5tYXhpbXVtIH07Cit9CisKIHZv aWQgTGluZUxheW91dDo6bGF5b3V0KCkKIHsKICAgICBhdXRvJiByb290TGF5b3V0Qm94ID0gdGhp cy0+cm9vdExheW91dEJveCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oCmluZGV4IDkz ZjExYTJlYTIwOWUzYzUyMjg2NDUyMjI5OGQ2N2QzZTNkYTFiMzcuLjkwZTM4YTQ1NDJmYmFhNDll MWVjNGM1OGM5ZTM3YmMyYTA5YTg2MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmgK QEAgLTc5LDYgKzc5LDkgQEAgcHVibGljOgogICAgIHZvaWQgdXBkYXRlTGluZUJyZWFrQm94RGlt ZW5zaW9ucyhjb25zdCBSZW5kZXJMaW5lQnJlYWsmKTsKICAgICB2b2lkIHVwZGF0ZUlubGluZUJv eERpbWVuc2lvbnMoY29uc3QgUmVuZGVySW5saW5lJik7CiAgICAgdm9pZCB1cGRhdGVTdHlsZShj b25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYsIGNvbnN0IFJlbmRlclN0eWxlJiBvbGRTdHlsZSk7 CisKKyAgICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gY29tcHV0ZUludHJpbnNp Y1dpZHRoQ29uc3RyYWludHMoKTsKKwogICAgIHZvaWQgbGF5b3V0KCk7CiAKICAgICBMYXlvdXRV bml0IGNvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IGYyYzYyOGY2NzFiYmZlNWNiODhlNTg1Y2Nh ZGZhMmYyY2U3NTE2ZmQuLjY1ZWViMTZlMDI5MDMyYjY2Yjk4MzE3OGViZWU0NjI3MTcyZDYzMzgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC02 OSw2ICs2OSw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorI2RlZmluZSBFTkFCTEVfTU9E RVJOX1BSRUZFUlJFRF9XSURUSF9DT01QVVRBVElPTiAwCisjZGVmaW5lIEVOQUJMRV9NT0RFUk5f UFJFRkVSUkVEX1dJRFRIX0NPTVBVVEFUSU9OX0ZPUl9JTkxJTkVfQk9YRVMgMAorCiBXVEZfTUFL RV9JU09fQUxMT0NBVEVEX0lNUEwoUmVuZGVyQmxvY2tGbG93KTsKIAogYm9vbCBSZW5kZXJCbG9j azo6c19jYW5Qcm9wYWdhdGVGbG9hdEludG9TaWJsaW5nID0gZmFsc2U7CkBAIC02ODMsOSArNjg2 LDEyIEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRCbG9ja0NoaWxkcmVuKGJvb2wgcmVs YXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgbWF4CiAgICAgaGFuZGxlQWZ0ZXJTaWRlT2ZCbG9j ayhiZWZvcmVFZGdlLCBhZnRlckVkZ2UsIG1hcmdpbkluZm8pOwogfQogCi12b2lkIFJlbmRlckJs b2NrRmxvdzo6bGF5b3V0SW5saW5lQ2hpbGRyZW4oYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlv dXRVbml0JiByZXBhaW50TG9naWNhbFRvcCwgTGF5b3V0VW5pdCYgcmVwYWludExvZ2ljYWxCb3R0 b20pCit2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUFuZFNldExpbmVMYXlvdXRQYXRoKCkK IHsKLSAgICBhdXRvIGNvbXB1dGVMaW5lTGF5b3V0UGF0aCA9IFsmXSB7CisgICAgaWYgKGxpbmVM YXlvdXRQYXRoKCkgIT0gVW5kZXRlcm1pbmVkUGF0aCkKKyAgICAgICAgcmV0dXJuOworCisgICAg YXV0byBjb21wdXRlID0gWyZdIHsKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVY VCkKICAgICAgICAgaWYgKExheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpjYW5Vc2VGb3Io KnRoaXMpKQogICAgICAgICAgICAgcmV0dXJuIE1vZGVyblBhdGg7CkBAIC02OTMsOCArNjk5LDEy IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRJbmxpbmVDaGlsZHJlbihib29sIHJlbGF5 b3V0Q2hpbGRyZW4sIExheW91dFVuaXQmIHJlCiAgICAgICAgIHJldHVybiBMZWdhY3lQYXRoOwog ICAgIH07CiAKLSAgICBpZiAobGluZUxheW91dFBhdGgoKSA9PSBVbmRldGVybWluZWRQYXRoKQot ICAgICAgICBzZXRMaW5lTGF5b3V0UGF0aChjb21wdXRlTGluZUxheW91dFBhdGgoKSk7CisgICAg c2V0TGluZUxheW91dFBhdGgoY29tcHV0ZSgpKTsKK30KKwordm9pZCBSZW5kZXJCbG9ja0Zsb3c6 OmxheW91dElubGluZUNoaWxkcmVuKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYg cmVwYWludExvZ2ljYWxUb3AsIExheW91dFVuaXQmIHJlcGFpbnRMb2dpY2FsQm90dG9tKQorewor ICAgIGNvbXB1dGVBbmRTZXRMaW5lTGF5b3V0UGF0aCgpOwogCiAjaWYgRU5BQkxFKExBWU9VVF9G T1JNQVRUSU5HX0NPTlRFWFQpCiAgICAgaWYgKGxpbmVMYXlvdXRQYXRoKCkgPT0gTW9kZXJuUGF0 aCkgewpAQCAtNDI2MSw2ICs0MjcxLDExIEBAIHN0YXRpYyBpbmxpbmUgTGF5b3V0VW5pdCBwcmVm ZXJyZWRXaWR0aChMYXlvdXRVbml0IHByZWZlcnJlZFdpZHRoLCBmbG9hdCByZXN1bHQpCiAKIHZv aWQgUmVuZGVyQmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdpZHRocyhM YXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkg Y29uc3QKIHsKKyNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKKyAgICBpZiAo Y29uc3RfY2FzdDxSZW5kZXJCbG9ja0Zsb3cmPigqdGhpcykudHJ5Q29tcHV0ZVByZWZlcnJlZFdp ZHRoc1VzaW5nTW9kZXJuUGF0aChtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCkpCisg ICAgICAgIHJldHVybjsKKyNlbmRpZgorCiAgICAgZmxvYXQgaW5saW5lTWF4ID0gMDsKICAgICBm bG9hdCBpbmxpbmVNaW4gPSAwOwogCkBAIC00NTk5LDUgKzQ2MTQsNDYgQEAgdm9pZCBSZW5kZXJC bG9ja0Zsb3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKExheW91dFVuaXQm IG1pbkxvZ2ljYWwKICAgICBtYXhMb2dpY2FsV2lkdGggPSBwcmVmZXJyZWRXaWR0aChtYXhMb2dp Y2FsV2lkdGgsIGlubGluZU1heCk7CiB9CiAKKyNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdf Q09OVEVYVCkKK2Jvb2wgUmVuZGVyQmxvY2tGbG93Ojp0cnlDb21wdXRlUHJlZmVycmVkV2lkdGhz VXNpbmdNb2Rlcm5QYXRoKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYg bWF4TG9naWNhbFdpZHRoKQoreworI2lmIEVOQUJMRV9NT0RFUk5fUFJFRkVSUkVEX1dJRFRIX0NP TVBVVEFUSU9OCisgICAgY29tcHV0ZUFuZFNldExpbmVMYXlvdXRQYXRoKCk7CisKKyAgICAvLyBG SVhNRTogUGFzcyB0aGUgcmVwbGFjZWQgYW5kIGlubGluZSBibG9jayBjb25zdHJhaW5zdCB0byBJ RkMuCisgICAgYXV0byBjYW5Vc2VNb2Rlcm5QYXRoRm9yUHJlZmVycmVkV2lkdGhDb21wdXRhdGlv biA9IFsmXSB7CisgICAgICAgIGlmIChsaW5lTGF5b3V0UGF0aCgpICE9IE1vZGVyblBhdGgpCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGZvciAoYXV0byB3YWxrZXIgPSBJbmxp bmVXYWxrZXIoKnRoaXMpOyAhd2Fsa2VyLmF0RW5kKCk7IHdhbGtlci5hZHZhbmNlKCkpIHsKKyAg ICAgICAgICAgIGF1dG8mIHJlbmRlcmVyID0gKndhbGtlci5jdXJyZW50KCk7CisgICAgICAgICAg ICBpZiAocmVuZGVyZXIuaXNUZXh0KCkpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgICAgICBpZiAoaXM8UmVuZGVyTGluZUJyZWFrPihyZW5kZXJlcikpCisgICAgICAgICAgICAg ICAgY29udGludWU7CisjaWYgRU5BQkxFX01PREVSTl9QUkVGRVJSRURfV0lEVEhfQ09NUFVUQVRJ T05fRk9SX0lOTElORV9CT1hFUworICAgICAgICAgICAgaWYgKGlzPFJlbmRlcklubGluZT4ocmVu ZGVyZXIpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworI2VuZGlmCisgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfTsKKwor ICAgIGlmICghY2FuVXNlTW9kZXJuUGF0aEZvclByZWZlcnJlZFdpZHRoQ29tcHV0YXRpb24oKSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFtb2Rlcm5MaW5lTGF5b3V0KCkpCisg ICAgICAgIG1fbGluZUxheW91dCA9IG1ha2VVbmlxdWU8TGF5b3V0SW50ZWdyYXRpb246OkxpbmVM YXlvdXQ+KCp0aGlzKTsKKworICAgIHN0ZDo6dGllKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNh bFdpZHRoKSA9IG1vZGVybkxpbmVMYXlvdXQoKS0+Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3Ry YWludHMoKTsKKyAgICByZXR1cm4gdHJ1ZTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKG1pbkxv Z2ljYWxXaWR0aCk7CisgICAgVU5VU0VEX1BBUkFNKG1heExvZ2ljYWxXaWR0aCk7CisgICAgcmV0 dXJuIGZhbHNlOworI2VuZGlmCit9CisjZW5kaWYKKwogfQogLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaAppbmRleCBlMGM3OTcz MDkzODc5ZGVmNGZkYmE2ZDJiZGFmNDc0MmMxOTFlMWM1Li4yYmUzYmEwYmM2Y2RiZTEyMTdlOGM5 ZDYyNTY0NDVhMTI4NDE5MzViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5oCkBAIC0zNDQsNiArMzQ0LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBoYXNMaW5l cygpIGNvbnN0OwogICAgIHZvaWQgaW52YWxpZGF0ZUxpbmVMYXlvdXRQYXRoKCkgZmluYWw7Cisg ICAgdm9pZCBjb21wdXRlQW5kU2V0TGluZUxheW91dFBhdGgoKTsKIAogICAgIGVudW0gTGluZUxh eW91dFBhdGggeyBVbmRldGVybWluZWRQYXRoID0gMCwgTW9kZXJuUGF0aCwgTGVnYWN5UGF0aCwg Rm9yY2VkTGVnYWN5UGF0aCB9OwogICAgIExpbmVMYXlvdXRQYXRoIGxpbmVMYXlvdXRQYXRoKCkg Y29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8TGluZUxheW91dFBhdGg+KHJlbmRlckJsb2NrRmxv d0xpbmVMYXlvdXRQYXRoKCkpOyB9CkBAIC01NDUsNiArNTQ2LDcgQEAgcHJpdmF0ZToKICNpZiBF TkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKICAgICBib29sIGhhc01vZGVybkxpbmVM YXlvdXQoKSBjb25zdDsKICAgICB2b2lkIGxheW91dE1vZGVybkxpbmVzKGJvb2wgcmVsYXlvdXRD aGlsZHJlbiwgTGF5b3V0VW5pdCYgcmVwYWludExvZ2ljYWxUb3AsIExheW91dFVuaXQmIHJlcGFp bnRMb2dpY2FsQm90dG9tKTsKKyAgICBib29sIHRyeUNvbXB1dGVQcmVmZXJyZWRXaWR0aHNVc2lu Z01vZGVyblBhdGgoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0JiBtYXhM b2dpY2FsV2lkdGgpOwogI2VuZGlmCiAKICAgICB2b2lkIGFkanVzdEludHJpbnNpY0xvZ2ljYWxX aWR0aHNGb3JDb2x1bW5zKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYg bWF4TG9naWNhbFdpZHRoKSBjb25zdDsK