230597 2021-09-21 22:08:02 -0700 [LFC][Integration] Remove ensureLineBoxes 2021-09-22 06:39:19 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto koivisto bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1795951 0 koivisto 2021-09-21 22:08:02 -0700 Remove some ensureLineBoxes 1795952 1 438919 koivisto 2021-09-21 22:10:27 -0700 Created attachment 438919 Patch 1795964 2 438927 koivisto 2021-09-22 00:17:02 -0700 Created attachment 438927 Patch 1795995 3 438935 koivisto 2021-09-22 02:08:46 -0700 Created attachment 438935 Patch 1796035 4 438935 zalan 2021-09-22 06:15:29 -0700 Comment on attachment 438935 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438935&action=review > Source/WebCore/rendering/RenderBlockFlow.cpp:-3905 > - ASSERT(didNeedLayout || ceilf(logicalHeight()) == ceilf(oldHeight)); The dreaded assert! I am not going to miss you. > Source/WebCore/rendering/RenderBlockFlow.h:-368 > - void ensureLineBoxes(); > - void generateLineBoxTree(); end of an era. 1796049 5 ews-feeder 2021-09-22 06:38:25 -0700 Committed r282873 (242002@main): <https://commits.webkit.org/242002@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438935. 1796050 6 webkit-bug-importer 2021-09-22 06:39:19 -0700 <rdar://problem/83398394> 438919 2021-09-21 22:10:27 -0700 2021-09-22 00:16:58 -0700 Patch bug-230597-20210922081026.patch text/plain 5049 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg3YjVlN2RlOWQwYTky YTliOGI0ODNiNTYxNDVkYmJhZTRhZDQzNy4uMGQyM2NkNTEyOThmYTdjMjFiYWVkMDBiYzQ1ZmMx NjEyMmFkYWZiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA5LTIxICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv bl0gU3VwcG9ydCAtd2Via2l0LWJvcmRlci1maXQ6bGluZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDU5NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uQ292ZXJhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OnByaW50UmVhc29uKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpj YW5Vc2VGb3JTdHlsZSk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uQ292ZXJhZ2UuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6YWRqdXN0Rm9yQm9yZGVyRml0 IGNvbnN0KToKKworICAgICAgICBVc2UgaXRlcmF0b3IuCisKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrRmxvdzo6Y2xlYXJUcnVuY2F0aW9uKToKKworICAgICAgICBBbHNvIHJlbW92ZSBh biB1bm5lY2Vzc2FyeSBlbnN1cmVMaW5lQm94ZXMgY2FsbC4KKwogMjAyMS0wOS0yMSAgQW50dGkg S29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjgyMTI5 KTogRG91YmxlIGNsaWNraW5nIG1hcmdpbiBvZiBhIGJsb2NrIGluc2lkZSBhIDxzcGFuPiBtYXkg c2VsZWN0IGEgd3JvbmcgYmxvY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcAppbmRleCA0 OTk1NTA2ZWJlZWNmMDZiZDA4NjU0NmQ5MGMxMTg1OWQyNGVjMTgxLi5lODUzYTc2Njg3NTkxNjYz MWRhN2MwN2Q4MzIyZTU0NjdhMDUxY2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3Bw CkBAIC0xNTEsOSArMTUxLDYgQEAgc3RhdGljIHZvaWQgcHJpbnRSZWFzb24oQXZvaWRhbmNlUmVh c29uIHJlYXNvbiwgVGV4dFN0cmVhbSYgc3RyZWFtKQogICAgIGNhc2UgQXZvaWRhbmNlUmVhc29u OjpGbG93SGFzVGV4dENvbWJpbmU6CiAgICAgICAgIHN0cmVhbSA8PCAidGV4dCBjb21iaW5lIjsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBBdm9pZGFuY2VSZWFzb246OkZsb3dIYXNCb3JkZXJG aXRMaW5lczoKLSAgICAgICAgc3RyZWFtIDw8ICItd2Via2l0LWJvcmRlci1maXQiOwotICAgICAg ICBicmVhazsKICAgICBjYXNlIEF2b2lkYW5jZVJlYXNvbjo6Rmxvd0hhc0FmdGVyV2hpdGVTcGFj ZUxpbmVCcmVhazoKICAgICAgICAgc3RyZWFtIDw8ICJsaW5lLWJyZWFrIGlzIGFmdGVyLXdoaXRl LXNwYWNlIjsKICAgICAgICAgYnJlYWs7CkBAIC01MDEsOCArNDk4LDYgQEAgc3RhdGljIE9wdGlv blNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvclN0eWxlKGNvbnN0IFJlbmRlclN0eWxlJiBz dHlsZSwgSW5jbHUKICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93 SGFzTGluZUFsaWduRWRnZXMsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKICAgICBpZiAoc3R5 bGUubGluZVNuYXAoKSAhPSBMaW5lU25hcDo6Tm9uZSkKICAgICAgICAgU0VUX1JFQVNPTl9BTkRf UkVUVVJOX0lGX05FRURFRChGbG93SGFzTGluZVNuYXAsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25z KTsKLSAgICBpZiAoc3R5bGUuYm9yZGVyRml0KCkgPT0gQm9yZGVyRml0OjpMaW5lcykKLSAgICAg ICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SGFzQm9yZGVyRml0TGluZXMs IHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsgICAgCiAgICAgcmV0dXJuIHJlYXNvbnM7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkNvdmVyYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5oCmluZGV4IDc2ZTJhNjlmMjMzZDg3MDE5YjA4ODU0NGM3 NmU1Y2FjNzEyNThkMmQuLmI2NDdjN2Y1NWI4YjMyZDY5MGMzYTlkYzM1YjZjNDFmNjRhOTMyNDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkNvdmVyYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaApAQCAtNjUsNyArNjUsNyBAQCBlbnVtIGNsYXNz IEF2b2lkYW5jZVJlYXNvbiA6IHVpbnQ2NF90IHsKICAgICBGbG93SGFzUHNldWRvRmlyc3RMZXR0 ZXIgICAgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDI1LAogICAgIEZsb3dIYXNUZXh0Q29t YmluZSAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgMjYsCiAgICAgLy8gVW51 c2VkICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCAyNywKLSAg ICBGbG93SGFzQm9yZGVyRml0TGluZXMgICAgICAgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8 IDI4LAorICAgIC8vIFVudXNlZCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0g MUxMVSAgPDwgMjgsCiAgICAgRmxvd0hhc0FmdGVyV2hpdGVTcGFjZUxpbmVCcmVhayAgICAgICAg ICAgICAgPSAxTExVICA8PCAyOSwKICAgICBGbG93SGFzVGV4dFNlY3VyaXR5ICAgICAgICAgICAg ICAgICAgICAgICAgICA9IDFMTFUgIDw8IDMwLAogICAgIEZsb3dIYXNTVkdGb250ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgMzEsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDc2MjcxNWZmNmIyZjkxOGJjODJkMjUw N2RlN2IyNzI4NzI3YWZiMWEuLjAwYThlZjkyYWVkMTFiNWVkOTAzNzhmYWZjYTcxYjc1OWYxMzhl NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBA IC0zMDQyLDEzICszMDQyLDkgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmFkanVzdEZvckJvcmRl ckZpdChMYXlvdXRVbml0IHgsIExheW91dFVuaXQmIGxlZnQsIExheW91dFUKICAgICAvLyBXZSBk b24ndCBkZWFsIHdpdGggcmVsYXRpdmUgcG9zaXRpb25pbmcuICBPdXIgYXNzdW1wdGlvbiBpcyB0 aGF0IHlvdSBzaHJpbmsgdG8gZml0IHRoZSBsaW5lcyB3aXRob3V0IGFjY291bnRpbmcKICAgICAv LyBmb3IgZWl0aGVyIG92ZXJmbG93IG9yIHRyYW5zbGF0aW9ucyB2aWEgcmVsYXRpdmUgcG9zaXRp b25pbmcuCiAgICAgaWYgKGNoaWxkcmVuSW5saW5lKCkpIHsKLSAgICAgICAgY29uc3RfY2FzdDxS ZW5kZXJCbG9ja0Zsb3cmPigqdGhpcykuZW5zdXJlTGluZUJveGVzKCk7Ci0KLSAgICAgICAgZm9y IChhdXRvKiBib3ggPSBmaXJzdFJvb3RCb3goKTsgYm94OyBib3ggPSBib3gtPm5leHRSb290Qm94 KCkpIHsKLSAgICAgICAgICAgIGlmIChib3gtPmZpcnN0Q2hpbGQoKSkKLSAgICAgICAgICAgICAg ICBsZWZ0ID0gc3RkOjptaW4obGVmdCwgeCArIExheW91dFVuaXQoYm94LT5maXJzdENoaWxkKCkt PngoKSkpOwotICAgICAgICAgICAgaWYgKGJveC0+bGFzdENoaWxkKCkpCi0gICAgICAgICAgICAg ICAgcmlnaHQgPSBzdGQ6Om1heChyaWdodCwgeCArIExheW91dFVuaXQoY2VpbGYoYm94LT5sYXN0 Q2hpbGQoKS0+bG9naWNhbFJpZ2h0KCkpKSk7CisgICAgICAgIGZvciAoYXV0byBsaW5lID0gTGF5 b3V0SW50ZWdyYXRpb246OmZpcnN0TGluZUZvcigqdGhpcyk7IGxpbmU7IGxpbmUudHJhdmVyc2VO ZXh0KCkpIHsKKyAgICAgICAgICAgIGxlZnQgPSBzdGQ6Om1pbihsZWZ0LCB4ICsgTGF5b3V0VW5p dChsaW5lLT5jb250ZW50TG9naWNhbExlZnQoKSkpOworICAgICAgICAgICAgcmlnaHQgPSBzdGQ6 Om1heChyaWdodCwgeCArIExheW91dFVuaXQoY2VpbGYobGluZS0+Y29udGVudExvZ2ljYWxSaWdo dCgpKSkpOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgZm9yIChSZW5kZXJCb3gq IG9iaiA9IGZpcnN0Q2hpbGRCb3goKTsgb2JqOyBvYmogPSBvYmotPm5leHRTaWJsaW5nQm94KCkp IHsKQEAgLTM0MzcsOCArMzQzMyw2IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpjbGVhclRydW5j YXRpb24oKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoY2hpbGRyZW5JbmxpbmUoKSAmJiBo YXNNYXJrdXBUcnVuY2F0aW9uKCkpIHsKLSAgICAgICAgZW5zdXJlTGluZUJveGVzKCk7Ci0KICAg ICAgICAgc2V0SGFzTWFya3VwVHJ1bmNhdGlvbihmYWxzZSk7CiAgICAgICAgIGZvciAoYXV0byog Ym94ID0gZmlyc3RSb290Qm94KCk7IGJveDsgYm94ID0gYm94LT5uZXh0Um9vdEJveCgpKQogICAg ICAgICAgICAgYm94LT5jbGVhclRydW5jYXRpb24oKTsK 438927 2021-09-22 00:17:02 -0700 2021-09-22 02:08:41 -0700 Patch bug-230597-20210922101701.patch text/plain 6064 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg3YjVlN2RlOWQwYTky YTliOGI0ODNiNTYxNDVkYmJhZTRhZDQzNy4uMGQyM2NkNTEyOThmYTdjMjFiYWVkMDBiYzQ1ZmMx NjEyMmFkYWZiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA5LTIxICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv bl0gU3VwcG9ydCAtd2Via2l0LWJvcmRlci1maXQ6bGluZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDU5NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uQ292ZXJhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OnByaW50UmVhc29uKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpj YW5Vc2VGb3JTdHlsZSk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uQ292ZXJhZ2UuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6YWRqdXN0Rm9yQm9yZGVyRml0 IGNvbnN0KToKKworICAgICAgICBVc2UgaXRlcmF0b3IuCisKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrRmxvdzo6Y2xlYXJUcnVuY2F0aW9uKToKKworICAgICAgICBBbHNvIHJlbW92ZSBh biB1bm5lY2Vzc2FyeSBlbnN1cmVMaW5lQm94ZXMgY2FsbC4KKwogMjAyMS0wOS0yMSAgQW50dGkg S29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjgyMTI5 KTogRG91YmxlIGNsaWNraW5nIG1hcmdpbiBvZiBhIGJsb2NrIGluc2lkZSBhIDxzcGFuPiBtYXkg c2VsZWN0IGEgd3JvbmcgYmxvY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcAppbmRleCA0 OTk1NTA2ZWJlZWNmMDZiZDA4NjU0NmQ5MGMxMTg1OWQyNGVjMTgxLi5lODUzYTc2Njg3NTkxNjYz MWRhN2MwN2Q4MzIyZTU0NjdhMDUxY2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3Bw CkBAIC0xNTEsOSArMTUxLDYgQEAgc3RhdGljIHZvaWQgcHJpbnRSZWFzb24oQXZvaWRhbmNlUmVh c29uIHJlYXNvbiwgVGV4dFN0cmVhbSYgc3RyZWFtKQogICAgIGNhc2UgQXZvaWRhbmNlUmVhc29u OjpGbG93SGFzVGV4dENvbWJpbmU6CiAgICAgICAgIHN0cmVhbSA8PCAidGV4dCBjb21iaW5lIjsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBBdm9pZGFuY2VSZWFzb246OkZsb3dIYXNCb3JkZXJG aXRMaW5lczoKLSAgICAgICAgc3RyZWFtIDw8ICItd2Via2l0LWJvcmRlci1maXQiOwotICAgICAg ICBicmVhazsKICAgICBjYXNlIEF2b2lkYW5jZVJlYXNvbjo6Rmxvd0hhc0FmdGVyV2hpdGVTcGFj ZUxpbmVCcmVhazoKICAgICAgICAgc3RyZWFtIDw8ICJsaW5lLWJyZWFrIGlzIGFmdGVyLXdoaXRl LXNwYWNlIjsKICAgICAgICAgYnJlYWs7CkBAIC01MDEsOCArNDk4LDYgQEAgc3RhdGljIE9wdGlv blNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvclN0eWxlKGNvbnN0IFJlbmRlclN0eWxlJiBz dHlsZSwgSW5jbHUKICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93 SGFzTGluZUFsaWduRWRnZXMsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKICAgICBpZiAoc3R5 bGUubGluZVNuYXAoKSAhPSBMaW5lU25hcDo6Tm9uZSkKICAgICAgICAgU0VUX1JFQVNPTl9BTkRf UkVUVVJOX0lGX05FRURFRChGbG93SGFzTGluZVNuYXAsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25z KTsKLSAgICBpZiAoc3R5bGUuYm9yZGVyRml0KCkgPT0gQm9yZGVyRml0OjpMaW5lcykKLSAgICAg ICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SGFzQm9yZGVyRml0TGluZXMs IHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsgICAgCiAgICAgcmV0dXJuIHJlYXNvbnM7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkNvdmVyYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5oCmluZGV4IDc2ZTJhNjlmMjMzZDg3MDE5YjA4ODU0NGM3 NmU1Y2FjNzEyNThkMmQuLmI2NDdjN2Y1NWI4YjMyZDY5MGMzYTlkYzM1YjZjNDFmNjRhOTMyNDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkNvdmVyYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaApAQCAtNjUsNyArNjUsNyBAQCBlbnVtIGNsYXNz IEF2b2lkYW5jZVJlYXNvbiA6IHVpbnQ2NF90IHsKICAgICBGbG93SGFzUHNldWRvRmlyc3RMZXR0 ZXIgICAgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDI1LAogICAgIEZsb3dIYXNUZXh0Q29t YmluZSAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgMjYsCiAgICAgLy8gVW51 c2VkICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCAyNywKLSAg ICBGbG93SGFzQm9yZGVyRml0TGluZXMgICAgICAgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8 IDI4LAorICAgIC8vIFVudXNlZCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0g MUxMVSAgPDwgMjgsCiAgICAgRmxvd0hhc0FmdGVyV2hpdGVTcGFjZUxpbmVCcmVhayAgICAgICAg ICAgICAgPSAxTExVICA8PCAyOSwKICAgICBGbG93SGFzVGV4dFNlY3VyaXR5ICAgICAgICAgICAg ICAgICAgICAgICAgICA9IDFMTFUgIDw8IDMwLAogICAgIEZsb3dIYXNTVkdGb250ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgMzEsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDc2MjcxNWZmNmIyZjkxOGJjODJkMjUw N2RlN2IyNzI4NzI3YWZiMWEuLjAwYThlZjkyYWVkMTFiNWVkOTAzNzhmYWZjYTcxYjc1OWYxMzhl NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBA IC0zMDQyLDEzICszMDQyLDkgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmFkanVzdEZvckJvcmRl ckZpdChMYXlvdXRVbml0IHgsIExheW91dFVuaXQmIGxlZnQsIExheW91dFUKICAgICAvLyBXZSBk b24ndCBkZWFsIHdpdGggcmVsYXRpdmUgcG9zaXRpb25pbmcuICBPdXIgYXNzdW1wdGlvbiBpcyB0 aGF0IHlvdSBzaHJpbmsgdG8gZml0IHRoZSBsaW5lcyB3aXRob3V0IGFjY291bnRpbmcKICAgICAv LyBmb3IgZWl0aGVyIG92ZXJmbG93IG9yIHRyYW5zbGF0aW9ucyB2aWEgcmVsYXRpdmUgcG9zaXRp b25pbmcuCiAgICAgaWYgKGNoaWxkcmVuSW5saW5lKCkpIHsKLSAgICAgICAgY29uc3RfY2FzdDxS ZW5kZXJCbG9ja0Zsb3cmPigqdGhpcykuZW5zdXJlTGluZUJveGVzKCk7Ci0KLSAgICAgICAgZm9y IChhdXRvKiBib3ggPSBmaXJzdFJvb3RCb3goKTsgYm94OyBib3ggPSBib3gtPm5leHRSb290Qm94 KCkpIHsKLSAgICAgICAgICAgIGlmIChib3gtPmZpcnN0Q2hpbGQoKSkKLSAgICAgICAgICAgICAg ICBsZWZ0ID0gc3RkOjptaW4obGVmdCwgeCArIExheW91dFVuaXQoYm94LT5maXJzdENoaWxkKCkt PngoKSkpOwotICAgICAgICAgICAgaWYgKGJveC0+bGFzdENoaWxkKCkpCi0gICAgICAgICAgICAg ICAgcmlnaHQgPSBzdGQ6Om1heChyaWdodCwgeCArIExheW91dFVuaXQoY2VpbGYoYm94LT5sYXN0 Q2hpbGQoKS0+bG9naWNhbFJpZ2h0KCkpKSk7CisgICAgICAgIGZvciAoYXV0byBsaW5lID0gTGF5 b3V0SW50ZWdyYXRpb246OmZpcnN0TGluZUZvcigqdGhpcyk7IGxpbmU7IGxpbmUudHJhdmVyc2VO ZXh0KCkpIHsKKyAgICAgICAgICAgIGxlZnQgPSBzdGQ6Om1pbihsZWZ0LCB4ICsgTGF5b3V0VW5p dChsaW5lLT5jb250ZW50TG9naWNhbExlZnQoKSkpOworICAgICAgICAgICAgcmlnaHQgPSBzdGQ6 Om1heChyaWdodCwgeCArIExheW91dFVuaXQoY2VpbGYobGluZS0+Y29udGVudExvZ2ljYWxSaWdo dCgpKSkpOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgZm9yIChSZW5kZXJCb3gq IG9iaiA9IGZpcnN0Q2hpbGRCb3goKTsgb2JqOyBvYmogPSBvYmotPm5leHRTaWJsaW5nQm94KCkp IHsKQEAgLTM0MzcsOCArMzQzMyw2IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpjbGVhclRydW5j YXRpb24oKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoY2hpbGRyZW5JbmxpbmUoKSAmJiBo YXNNYXJrdXBUcnVuY2F0aW9uKCkpIHsKLSAgICAgICAgZW5zdXJlTGluZUJveGVzKCk7Ci0KICAg ICAgICAgc2V0SGFzTWFya3VwVHJ1bmNhdGlvbihmYWxzZSk7CiAgICAgICAgIGZvciAoYXV0byog Ym94ID0gZmlyc3RSb290Qm94KCk7IGJveDsgYm94ID0gYm94LT5uZXh0Um9vdEJveCgpKQogICAg ICAgICAgICAgYm94LT5jbGVhclRydW5jYXRpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHAKaW5kZXggNjY0YzdhMmQ0MWNkZjAxNjJmMTAyZWU5MmE2ZTg4MTAy YzM4OTVhOC4uOGFlODEzODg4YmQ0MzkzMTg0YmQxMGRlY2MxOTgxYThlMzQ3NmY5MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKQEAgLTQxNiw5ICs0MTYsOSBA QCBjb25zdCBjaGFyKiBSZW5kZXJJbmxpbmU6OnJlbmRlck5hbWUoKSBjb25zdAogYm9vbCBSZW5k ZXJJbmxpbmU6Om5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRU ZXN0UmVzdWx0JiByZXN1bHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IEhpdFRlc3RMb2NhdGlvbiYgbG9jYXRpb25JbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0UG9pbnQm IGFjY3VtdWxhdGVkT2Zmc2V0LCBIaXRUZXN0QWN0aW9uIGhpdFRlc3RBY3Rpb24pCiB7CisgICAg QVNTRVJUKGxheWVyKCkpOwogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQot ICAgIGlmIChhdXRvKiBsaW5lTGF5b3V0ID0gTGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6 OmNvbnRhaW5pbmcoY29uc3RfY2FzdDxSZW5kZXJJbmxpbmUmPigqdGhpcykpKQotICAgICAgICBs aW5lTGF5b3V0LT5mbG93KCkuZW5zdXJlTGluZUJveGVzKCk7CisgICAgQVNTRVJUKCFMYXlvdXRJ bnRlZ3JhdGlvbjo6TGluZUxheW91dDo6Y29udGFpbmluZyhjb25zdF9jYXN0PFJlbmRlcklubGlu ZSY+KCp0aGlzKSkpOwogI2VuZGlmCiAgICAgcmV0dXJuIG1fbGluZUJveGVzLmhpdFRlc3QodGhp cywgcmVxdWVzdCwgcmVzdWx0LCBsb2NhdGlvbkluQ29udGFpbmVyLCBhY2N1bXVsYXRlZE9mZnNl dCwgaGl0VGVzdEFjdGlvbik7CiB9Cg== 438935 2021-09-22 02:08:46 -0700 2021-09-22 06:38:26 -0700 Patch bug-230597-20210922120845.patch text/plain 10203 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg3YjVlN2RlOWQwYTky YTliOGI0ODNiNTYxNDVkYmJhZTRhZDQzNy4uMWZkM2ZlYTYxNTliZTIwZWNkOTI5OTc3NDFlYTlh NzgwNzI0NDE5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTA5LTIyICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv bl0gUmVtb3ZlIGVuc3VyZUxpbmVCb3hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2UgZG9uJ3QgbmVlZCB0byBzd2l0Y2ggdG8gbGVnYWN5IGxpbmVi b3hlcyBkeW5hbWljYWxseSBmb3Igbm9uLXN0eWxlIHJlYXNvbnMgYW55bW9yZS4KKworICAgICAg ICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpwcmludFJlYXNvbik6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Y2FuVXNlRm9yU3R5bGUpOgorCisgICAgICAg IFN1cHBvcnQgLXdlYmtpdC1ib3JkZXItZml0OmxpbmVzLgorCisgICAgICAgICogbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxv dzo6YWRqdXN0Rm9yQm9yZGVyRml0IGNvbnN0KToKKworICAgICAgICBVc2UgaXRlcmF0b3IuCisK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Y2xlYXJUcnVuY2F0aW9uKToKKwor ICAgICAgICBSZW1vdmUgYW4gdW5uZWNlc3NhcnkgZW5zdXJlTGluZUJveGVzIGNhbGwuCisKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6ZW5zdXJlTGluZUJveGVzKTogRGVsZXRl ZC4KKworICAgICAgICBCb29tLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVySW5saW5lOjpub2RlQXRQb2ludCk6CisKKyAgICAgICAgVGhpcyBpcyBub3Qg bmVlZGVkIGJlZm9yZSB3ZSBzdGFydCBzdXBwb3J0aW5nIFJlbmRlcklubGluZXMgd2l0aCBsYXll cnMgb24gTEZDIHBhdGguCisKIDIwMjEtMDktMjEgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBw bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI4MjEyOSk6IERvdWJsZSBjbGlja2luZyBt YXJnaW4gb2YgYSBibG9jayBpbnNpZGUgYSA8c3Bhbj4gbWF5IHNlbGVjdCBhIHdyb25nIGJsb2Nr CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25Db3ZlcmFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v TGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKaW5kZXggNDk5NTUwNmViZWVjZjA2YmQwODY1 NDZkOTBjMTE4NTlkMjRlYzE4MS4uZTg1M2E3NjY4NzU5MTY2MzFkYTdjMDdkODMyMmU1NDY3YTA1 MWNjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcApAQCAtMTUxLDkgKzE1MSw2IEBA IHN0YXRpYyB2b2lkIHByaW50UmVhc29uKEF2b2lkYW5jZVJlYXNvbiByZWFzb24sIFRleHRTdHJl YW0mIHN0cmVhbSkKICAgICBjYXNlIEF2b2lkYW5jZVJlYXNvbjo6Rmxvd0hhc1RleHRDb21iaW5l OgogICAgICAgICBzdHJlYW0gPDwgInRleHQgY29tYmluZSI7CiAgICAgICAgIGJyZWFrOwotICAg IGNhc2UgQXZvaWRhbmNlUmVhc29uOjpGbG93SGFzQm9yZGVyRml0TGluZXM6Ci0gICAgICAgIHN0 cmVhbSA8PCAiLXdlYmtpdC1ib3JkZXItZml0IjsKLSAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBB dm9pZGFuY2VSZWFzb246OkZsb3dIYXNBZnRlcldoaXRlU3BhY2VMaW5lQnJlYWs6CiAgICAgICAg IHN0cmVhbSA8PCAibGluZS1icmVhayBpcyBhZnRlci13aGl0ZS1zcGFjZSI7CiAgICAgICAgIGJy ZWFrOwpAQCAtNTAxLDggKzQ5OCw2IEBAIHN0YXRpYyBPcHRpb25TZXQ8QXZvaWRhbmNlUmVhc29u PiBjYW5Vc2VGb3JTdHlsZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIEluY2x1CiAgICAgICAg IFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd0hhc0xpbmVBbGlnbkVkZ2VzLCBy ZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7CiAgICAgaWYgKHN0eWxlLmxpbmVTbmFwKCkgIT0gTGlu ZVNuYXA6Ok5vbmUpCiAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxv d0hhc0xpbmVTbmFwLCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7Ci0gICAgaWYgKHN0eWxlLmJv cmRlckZpdCgpID09IEJvcmRlckZpdDo6TGluZXMpCi0gICAgICAgIFNFVF9SRUFTT05fQU5EX1JF VFVSTl9JRl9ORUVERUQoRmxvd0hhc0JvcmRlckZpdExpbmVzLCByZWFzb25zLCBpbmNsdWRlUmVh c29ucyk7ICAgIAogICAgIHJldHVybiByZWFzb25zOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJh Z2UuaAppbmRleCA3NmUyYTY5ZjIzM2Q4NzAxOWIwODg1NDRjNzZlNWNhYzcxMjU4ZDJkLi5iNjQ3 YzdmNTViOGIzMmQ2OTBjM2E5ZGMzNWI2YzQxZjY0YTkzMjQwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNv dmVyYWdlLmgKQEAgLTY1LDcgKzY1LDcgQEAgZW51bSBjbGFzcyBBdm9pZGFuY2VSZWFzb24gOiB1 aW50NjRfdCB7CiAgICAgRmxvd0hhc1BzZXVkb0ZpcnN0TGV0dGVyICAgICAgICAgICAgICAgICAg ICAgPSAxTExVICA8PCAyNSwKICAgICBGbG93SGFzVGV4dENvbWJpbmUgICAgICAgICAgICAgICAg ICAgICAgICAgICA9IDFMTFUgIDw8IDI2LAogICAgIC8vIFVudXNlZCAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgMjcsCi0gICAgRmxvd0hhc0JvcmRlckZpdExp bmVzICAgICAgICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCAyOCwKKyAgICAvLyBVbnVzZWQg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDI4LAogICAgIEZs b3dIYXNBZnRlcldoaXRlU3BhY2VMaW5lQnJlYWsgICAgICAgICAgICAgID0gMUxMVSAgPDwgMjks CiAgICAgRmxvd0hhc1RleHRTZWN1cml0eSAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxTExV ICA8PCAzMCwKICAgICBGbG93SGFzU1ZHRm9udCAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA9IDFMTFUgIDw8IDMxLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmNwcAppbmRleCA3NjI3MTVmZjZiMmY5MThiYzgyZDI1MDdkZTdiMjcyODcyN2FmYjFhLi4y NGM5Mzg3YjE4NGE4MmRjNzQzNDIyZGRiNWZlMWVjNjY1NjRjMDA4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzA0MiwxMyArMzA0Miw5IEBA IHZvaWQgUmVuZGVyQmxvY2tGbG93OjphZGp1c3RGb3JCb3JkZXJGaXQoTGF5b3V0VW5pdCB4LCBM YXlvdXRVbml0JiBsZWZ0LCBMYXlvdXRVCiAgICAgLy8gV2UgZG9uJ3QgZGVhbCB3aXRoIHJlbGF0 aXZlIHBvc2l0aW9uaW5nLiAgT3VyIGFzc3VtcHRpb24gaXMgdGhhdCB5b3Ugc2hyaW5rIHRvIGZp dCB0aGUgbGluZXMgd2l0aG91dCBhY2NvdW50aW5nCiAgICAgLy8gZm9yIGVpdGhlciBvdmVyZmxv dyBvciB0cmFuc2xhdGlvbnMgdmlhIHJlbGF0aXZlIHBvc2l0aW9uaW5nLgogICAgIGlmIChjaGls ZHJlbklubGluZSgpKSB7Ci0gICAgICAgIGNvbnN0X2Nhc3Q8UmVuZGVyQmxvY2tGbG93Jj4oKnRo aXMpLmVuc3VyZUxpbmVCb3hlcygpOwotCi0gICAgICAgIGZvciAoYXV0byogYm94ID0gZmlyc3RS b290Qm94KCk7IGJveDsgYm94ID0gYm94LT5uZXh0Um9vdEJveCgpKSB7Ci0gICAgICAgICAgICBp ZiAoYm94LT5maXJzdENoaWxkKCkpCi0gICAgICAgICAgICAgICAgbGVmdCA9IHN0ZDo6bWluKGxl ZnQsIHggKyBMYXlvdXRVbml0KGJveC0+Zmlyc3RDaGlsZCgpLT54KCkpKTsKLSAgICAgICAgICAg IGlmIChib3gtPmxhc3RDaGlsZCgpKQotICAgICAgICAgICAgICAgIHJpZ2h0ID0gc3RkOjptYXgo cmlnaHQsIHggKyBMYXlvdXRVbml0KGNlaWxmKGJveC0+bGFzdENoaWxkKCktPmxvZ2ljYWxSaWdo dCgpKSkpOworICAgICAgICBmb3IgKGF1dG8gbGluZSA9IExheW91dEludGVncmF0aW9uOjpmaXJz dExpbmVGb3IoKnRoaXMpOyBsaW5lOyBsaW5lLnRyYXZlcnNlTmV4dCgpKSB7CisgICAgICAgICAg ICBsZWZ0ID0gc3RkOjptaW4obGVmdCwgeCArIExheW91dFVuaXQobGluZS0+Y29udGVudExvZ2lj YWxMZWZ0KCkpKTsKKyAgICAgICAgICAgIHJpZ2h0ID0gc3RkOjptYXgocmlnaHQsIHggKyBMYXlv dXRVbml0KGNlaWxmKGxpbmUtPmNvbnRlbnRMb2dpY2FsUmlnaHQoKSkpKTsKICAgICAgICAgfQog ICAgIH0gZWxzZSB7CiAgICAgICAgIGZvciAoUmVuZGVyQm94KiBvYmogPSBmaXJzdENoaWxkQm94 KCk7IG9iajsgb2JqID0gb2JqLT5uZXh0U2libGluZ0JveCgpKSB7CkBAIC0zNDM3LDggKzM0MzMs NiBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y2xlYXJUcnVuY2F0aW9uKCkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgaWYgKGNoaWxkcmVuSW5saW5lKCkgJiYgaGFzTWFya3VwVHJ1bmNhdGlvbigp KSB7Ci0gICAgICAgIGVuc3VyZUxpbmVCb3hlcygpOwotCiAgICAgICAgIHNldEhhc01hcmt1cFRy dW5jYXRpb24oZmFsc2UpOwogICAgICAgICBmb3IgKGF1dG8qIGJveCA9IGZpcnN0Um9vdEJveCgp OyBib3g7IGJveCA9IGJveC0+bmV4dFJvb3RCb3goKSkKICAgICAgICAgICAgIGJveC0+Y2xlYXJU cnVuY2F0aW9uKCk7CkBAIC0zODM1LDc5ICszODI5LDYgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6 OmxheW91dE1vZGVybkxpbmVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgcmVw YWkKIH0KICNlbmRpZgogCi12b2lkIFJlbmRlckJsb2NrRmxvdzo6ZW5zdXJlTGluZUJveGVzKCkK LXsKLSAgICBpZiAoIWNoaWxkcmVuSW5saW5lKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIHNl dExpbmVMYXlvdXRQYXRoKEZvcmNlTGluZUJveGVzUGF0aCk7Ci0KLSAgICBpZiAobGVnYWN5TGlu ZUxheW91dCgpIHx8ICFoYXNMaW5lTGF5b3V0KCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGJv b2wgbmVlZHNUb1BhZ2luYXRlQ29tcGxleExpbmVzID0gWyZdIHsKLSNpZiBFTkFCTEUoTEFZT1VU X0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSAgICAgICAgaWYgKG1vZGVybkxpbmVMYXlvdXQoKSAmJiBt b2Rlcm5MaW5lTGF5b3V0KCktPmlzUGFnaW5hdGVkKCkpCi0gICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKLSNlbmRpZgotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfSgpOwotCi0gICAgbV9saW5l TGF5b3V0ID0gbWFrZVVuaXF1ZTxMZWdhY3lMaW5lTGF5b3V0PigqdGhpcyk7Ci0KLSAgICBhdXRv JiBsZWdhY3lMaW5lTGF5b3V0ID0gKnRoaXMtPmxlZ2FjeUxpbmVMYXlvdXQoKTsKLQotI2lmIEFT U0VSVF9FTkFCTEVECi0gICAgTGF5b3V0VW5pdCBvbGRIZWlnaHQgPSBsb2dpY2FsSGVpZ2h0KCk7 Ci0jZW5kaWYKLSAgICBib29sIGRpZE5lZWRMYXlvdXQgPSBuZWVkc0xheW91dCgpOwotCi0gICAg Ym9vbCByZWxheW91dENoaWxkcmVuID0gZmFsc2U7Ci0gICAgTGF5b3V0VW5pdCByZXBhaW50TG9n aWNhbFRvcDsKLSAgICBMYXlvdXRVbml0IHJlcGFpbnRMb2dpY2FsQm90dG9tOwotICAgIGlmIChu ZWVkc1RvUGFnaW5hdGVDb21wbGV4TGluZXMpIHsKLSAgICAgICAgUGFnaW5hdGVkTGF5b3V0U3Rh dGVNYWludGFpbmVyIHN0YXRlKCp0aGlzKTsKLSAgICAgICAgbGVnYWN5TGluZUxheW91dC5sYXlv dXRMaW5lQm94ZXMocmVsYXlvdXRDaGlsZHJlbiwgcmVwYWludExvZ2ljYWxUb3AsIHJlcGFpbnRM b2dpY2FsQm90dG9tKTsKLSAgICAgICAgLy8gVGhpcyBtYXRjaGVzIHJlbGF5b3V0VG9Bdm9pZFdp ZG93cy4KLSAgICAgICAgaWYgKHNob3VsZEJyZWFrQXRMaW5lVG9Bdm9pZFdpZG93KCkpCi0gICAg ICAgICAgICBsZWdhY3lMaW5lTGF5b3V0LmxheW91dExpbmVCb3hlcyhyZWxheW91dENoaWxkcmVu LCByZXBhaW50TG9naWNhbFRvcCwgcmVwYWludExvZ2ljYWxCb3R0b20pOwotICAgICAgICAvLyBG SVhNRTogVGhpcyBpcyBuZWVkZWQgYXMgbG9uZyBhcyBzaW1wbGUgYW5kIG5vcm1hbCBsaW5lIGxh eW91dCBwcm9kdWNlIGRpZmZlcmVudCBsaW5lIGJyZWFraW5ncy4KLSAgICAgICAgcmVwYWludCgp OwotICAgIH0gZWxzZQotICAgICAgICBsZWdhY3lMaW5lTGF5b3V0LmxheW91dExpbmVCb3hlcyhy ZWxheW91dENoaWxkcmVuLCByZXBhaW50TG9naWNhbFRvcCwgcmVwYWludExvZ2ljYWxCb3R0b20p OwotCi0gICAgewotICAgICAgICBzdHJ1Y3QgRGVwcmVjYXRlZEJveFN0cmVjaGluZ1Njb3BlIHsK LSAgICAgICAgICAgIERlcHJlY2F0ZWRCb3hTdHJlY2hpbmdTY29wZShSZW5kZXJFbGVtZW50JiBw YXJlbnQpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzPFJlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveD4ocGFyZW50KSAmJiBwYXJlbnQuc3R5bGUoKS5ib3hBbGlnbigpID09 IEJveEFsaWdubWVudDo6U3RyZXRjaCkgewotICAgICAgICAgICAgICAgICAgICAvLyBXaGlsZSBt b2Rlcm4gZmxleCBib3gncyB1c2VzIG92ZXJyaWRlIGhlaWdodCB0byBzdHJldGNoIGl0cyBjaGls ZHJlbiwgZGVwcmVjYXRlZCBmbGV4IGJveAotICAgICAgICAgICAgICAgICAgICAvLyB1c2VzIGEg ZmxhZyB3aGljaCBpcyBjb25zdWx0ZWQgYXQgdXBkYXRlTG9naWNhbEhlaWdodCgpLgotICAgICAg ICAgICAgICAgICAgICAvLyBUaGlzIHNjb3BlIGNsYXNzIGVuc3VyZXMgdGhhdCB3ZSBkb24ndCBj b2xsYXBzZSBmbGV4IGl0ZW1zIHdoaWxlIHN3YXBwaW5nIHRoZSBsaW5lIHN0cnVjdHVyZXMuCi0g ICAgICAgICAgICAgICAgICAgIC8vIHNlZSBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0 IHdoZXJlIGlzU3RyZXRjaGluZ0NoaWxkcmVuKCkgaXMgY29uc3VsdGVkLgotICAgICAgICAgICAg ICAgICAgICBzdHJlY2hpbmdSZW5kZXJlciA9IG1ha2VXZWFrUHRyKGRvd25jYXN0PFJlbmRlckRl cHJlY2F0ZWRGbGV4aWJsZUJveD4ocGFyZW50KSk7Ci0gICAgICAgICAgICAgICAgICAgIHN0cmVj aGluZ1JlbmRlcmVyLT5zZXRJc1N0cmV0Y2hpbmdDaGlsZHJlbih0cnVlKTsKLSAgICAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIH5EZXByZWNhdGVkQm94U3RyZWNo aW5nU2NvcGUoKQotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIGlmIChzdHJlY2hpbmdS ZW5kZXJlcikKLSAgICAgICAgICAgICAgICAgICAgc3RyZWNoaW5nUmVuZGVyZXItPnNldElzU3Ry ZXRjaGluZ0NoaWxkcmVuKGZhbHNlKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgV2Vh a1B0cjxSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g+IHN0cmVjaGluZ1JlbmRlcmVyOwotCi0g ICAgICAgIH07Ci0gICAgICAgIGF1dG8gZGVwcmVjYXRlZEJveFN0cmVjaGluZ1Njb3BlID0gRGVw cmVjYXRlZEJveFN0cmVjaGluZ1Njb3BlKCpwYXJlbnQoKSk7Ci0gICAgICAgIHVwZGF0ZUxvZ2lj YWxIZWlnaHQoKTsKLSAgICB9Ci0gICAgQVNTRVJUKGRpZE5lZWRMYXlvdXQgfHwgY2VpbGYobG9n aWNhbEhlaWdodCgpKSA9PSBjZWlsZihvbGRIZWlnaHQpKTsKLQotICAgIGlmICghZGlkTmVlZExh eW91dCkKLSAgICAgICAgY2xlYXJOZWVkc0xheW91dCgpOwotfQotCiAjaWYgRU5BQkxFKFRSRUVf REVCVUdHSU5HKQogdm9pZCBSZW5kZXJCbG9ja0Zsb3c6Om91dHB1dEZsb2F0aW5nT2JqZWN0cyhX VEY6OlRleHRTdHJlYW0mIHN0cmVhbSwgaW50IGRlcHRoKSBjb25zdAogewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCmluZGV4IDVmOTE4MTFiYWUwZTU3MGY1MmNm NGNhMzQxZGY0OTI5NmUyMzk0ZmEuLmNiMzBlNmQzYTM3NzVkNWRiM2EzNDM5Y2YzNzNmMTY5ODdi ZTIwMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKQEAg LTM2NCw5ICszNjQsNiBAQCBwdWJsaWM6CiAgICAgTGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlv dXQqIG1vZGVybkxpbmVMYXlvdXQoKTsKICNlbmRpZgogCi0gICAgdm9pZCBlbnN1cmVMaW5lQm94 ZXMoKTsKLSAgICB2b2lkIGdlbmVyYXRlTGluZUJveFRyZWUoKTsKLQogI2lmIEVOQUJMRShUUkVF X0RFQlVHR0lORykKICAgICB2b2lkIG91dHB1dEZsb2F0aW5nT2JqZWN0cyhXVEY6OlRleHRTdHJl YW0mLCBpbnQgZGVwdGgpIGNvbnN0OwogICAgIHZvaWQgb3V0cHV0TGluZVRyZWVBbmRNYXJrKFdU Rjo6VGV4dFN0cmVhbSYsIGNvbnN0IExlZ2FjeUlubGluZUJveCogbWFya2VkQm94LCBpbnQgZGVw dGgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklu bGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRl eCA2NjRjN2EyZDQxY2RmMDE2MmYxMDJlZTkyYTZlODgxMDJjMzg5NWE4Li44YWU4MTM4ODhiZDQz OTMxODRiZDEwZGVjYzE5ODFhOGUzNDc2ZjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW5saW5lLmNwcApAQCAtNDE2LDkgKzQxNiw5IEBAIGNvbnN0IGNoYXIqIFJlbmRlcklu bGluZTo6cmVuZGVyTmFtZSgpIGNvbnN0CiBib29sIFJlbmRlcklubGluZTo6bm9kZUF0UG9pbnQo Y29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBsb2Nh dGlvbkluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhp dFRlc3RBY3Rpb24gaGl0VGVzdEFjdGlvbikKIHsKKyAgICBBU1NFUlQobGF5ZXIoKSk7CiAjaWYg RU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgaWYgKGF1dG8qIGxpbmVMYXlv dXQgPSBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6Y29udGFpbmluZyhjb25zdF9jYXN0 PFJlbmRlcklubGluZSY+KCp0aGlzKSkpCi0gICAgICAgIGxpbmVMYXlvdXQtPmZsb3coKS5lbnN1 cmVMaW5lQm94ZXMoKTsKKyAgICBBU1NFUlQoIUxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0 Ojpjb250YWluaW5nKGNvbnN0X2Nhc3Q8UmVuZGVySW5saW5lJj4oKnRoaXMpKSk7CiAjZW5kaWYK ICAgICByZXR1cm4gbV9saW5lQm94ZXMuaGl0VGVzdCh0aGlzLCByZXF1ZXN0LCByZXN1bHQsIGxv Y2F0aW9uSW5Db250YWluZXIsIGFjY3VtdWxhdGVkT2Zmc2V0LCBoaXRUZXN0QWN0aW9uKTsKIH0K