220705 2021-01-18 00:58:13 -0800 Remove recently added glue code: RenderLayer::(scrollToOffset / scrollToXOffset / scrollToYOffset) 2021-01-18 02:30:16 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 60305 1 zimmermann zimmermann aboxhall aperez apinheiro bfulgham cfleizach changseok dmazzoni esprehn+autocc ews-watchlist fred.wang glenn jcraig jdiggs kondapallykalyan pdr samuel_white simon.fraser webkit-bug-importer zalan oldest_to_newest 1720288 0 zimmermann 2021-01-18 00:58:13 -0800 Remove recently added glue code: RenderLayer::(scrollToOffset / scrollToXOffset / scrollToYOffset) 1720289 1 417812 zimmermann 2021-01-18 00:59:45 -0800 Created attachment 417812 Remove glue code that was recently added in r271559: RenderLayer::(scrollToOffset / scrollToXOffset / scrollToYOffset). We can use RenderLayerScrollableArea directly instead and get rid of the glue code that was only added to ease the landing of the patch on bug 60305 1720293 2 417815 zimmermann 2021-01-18 01:17:28 -0800 Created attachment 417815 Patch, v2 1720294 3 417816 zimmermann 2021-01-18 01:19:02 -0800 Created attachment 417816 Patch, v3 1720306 4 zimmermann 2021-01-18 02:29:07 -0800 Committed r271577: <https://trac.webkit.org/changeset/271577> 1720308 5 webkit-bug-importer 2021-01-18 02:30:16 -0800 <rdar://problem/73316589> 417812 2021-01-18 00:59:45 -0800 2021-01-18 01:19:05 -0800 Remove glue code that was recently added in r271559: RenderLayer::(scrollToOffset / scrollToXOffset / scrollToYOffset). bug-220705-20210118095944.patch text/plain 8367 zimmermann U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2VjZjQwOGEyYjNhYWM3 MmE1NTM1NTNjNDQwMTFiOTU3MDgwYzJmNS4uNTNkZjdjMmY3MWFhNjIyZTY0MGExMmE2N2NkYTdh MzFkMTI2OTVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAxLTE4ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbW92 ZSByZWNlbnRseSBhZGRlZCBnbHVlIGNvZGU6IFJlbmRlckxheWVyOjooc2Nyb2xsVG9PZmZzZXQg LyBzY3JvbGxUb1hPZmZzZXQgLyBzY3JvbGxUb1lPZmZzZXQpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA3MDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2xsb3ctdXAgb24gcGF0Y2ggYWRyZXNzaW5n IHRoZSByZW1vdmFsIG9mIHRoZSBnbHVlIGNvZGUgdGhhdAorICAgICAgICBmb3J3YXJkcyBjYWxs cyBmcm9tIFJlbmRlckxheWVyIHRvIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEgKHNlZQorICAg ICAgICB3ZWJraXQub3JnL2IvNjAzMDUpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3Rpbmcg dGVzdHMuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2Ny b2xsVG8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsVG9PZmZzZXQpOiBEZWxldGVkLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OnNjcm9sbFRvWE9mZnNldCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllcjo6c2Nyb2xsVG9ZT2Zmc2V0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTWFycXVlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXJxdWVlOjpzdGFy dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXJxdWVlOjp0aW1lckZpcmVkKToKKwogMjAy MS0wMS0xNyAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAg IEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjpyZXNoYXBlRkJPcygpIEFOR0xFIHZhcmlhbnQgY2Fs bHMgaW50byBtYWtlQ29udGV4dEN1cnJlbnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmlu ZGV4IGVjNDY1MTg2YWJmYTNmNzQzYWUyY2U3YjNkMzZmYjQxYTY3OTA3YzUuLmE3NGE0ZDRiMGFm NmNkNmNhMjc3ZWQ1YmJhOTljYmI2ZjdiMzFmYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wMS0xOCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnpp bW1lcm1hbm5AaWdhbGlhLmNvbT4KKworICAgICAgICBSZW1vdmUgcmVjZW50bHkgYWRkZWQgZ2x1 ZSBjb2RlOiBSZW5kZXJMYXllcjo6KHNjcm9sbFRvT2Zmc2V0IC8gc2Nyb2xsVG9YT2Zmc2V0IC8g c2Nyb2xsVG9ZT2Zmc2V0KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjIwNzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBET00vRE9NSFRNTC5tbToKKyAgICAgICAgKC1bRE9NSFRNTEVsZW1lbnQgc2V0 U2Nyb2xsWE9mZnNldDpzY3JvbGxZT2Zmc2V0OmFkanVzdEZvcklPU0NhcmV0Ol0pOgorCiAyMDIx LTAxLTE0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt b3ZlZCBtb3N0IHVzZXMgb2YgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUo KSwgLi4uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXggM2M1NTMyNGY5NmRjMTM1MDVmNzE3YzQ5 ZGE4OWE4YTg2ZDEwN2JkZi4uNDYwZTY1ZmI3OGEzYmM1NWU5NjExN2EwOWE4Mzk4OGViZmJmNTkz MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0zOTIwLDcgKzM5MjAsNyBAQCB2b2lkIEFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3Q6OnNjcm9sbFRvKGNvbnN0IEludFBvaW50JiBwb2ludCkgY29u c3QKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6IGlzIHBvaW50IGEgU2Nyb2xsT2Zm c2V0IG9yIFNjcm9sbFBvc2l0aW9uPyBUZXN0IGluIFJUTCBvdmVyZmxvdy4KLSAgICBib3gubGF5 ZXIoKS0+c2Nyb2xsVG9PZmZzZXQocG9pbnQpOworICAgIGJveC5sYXllcigpLT5lbnN1cmVMYXll clNjcm9sbGFibGVBcmVhKCktPnNjcm9sbFRvT2Zmc2V0KHBvaW50KTsKIH0KIAogI2lmIEVOQUJM RShNQVRITUwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA3 NDQwYTIxYjIwYjkwODk3NDMyNDJlYWU1Mzc2Y2Y3Njk3OTY1NjcwLi4wZDI2ZWMyNmQ1ZjlkZWQ5 NTQ4MDg1MTU2ZGQxYzU3NjQ5MzhiNDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKQEAgLTM5NiwxMSArMzk2LDYgQEAgU2Nyb2xsT2Zmc2V0IFJlbmRlckxheWVy OjpzY3JvbGxPZmZzZXQoKSBjb25zdAogICAgIHJldHVybiB7IDAsIDAgfTsKIH0KIAotdm9pZCBS ZW5kZXJMYXllcjo6c2Nyb2xsVG9PZmZzZXQoY29uc3QgU2Nyb2xsT2Zmc2V0JiBzY3JvbGxPZmZz ZXQsIGNvbnN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyYgb3B0aW9ucykKLXsKLSAgICBl bnN1cmVMYXllclNjcm9sbGFibGVBcmVhKCktPnNjcm9sbFRvT2Zmc2V0KHNjcm9sbE9mZnNldCwg b3B0aW9ucyk7Ci19Ci0KIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFRvWFBvc2l0aW9uKGludCB4 LCBjb25zdCBTY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMmIG9wdGlvbnMpCiB7CiAgICAgZW5z dXJlTGF5ZXJTY3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxUb1hQb3NpdGlvbih4LCBvcHRpb25zKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggNzYyNWY0MTcxMTZmMGRm Mjk5NDljOWI1MzIxY2Y1OWRjMTE3MDI0Zi4uYTI0ZmEwMDcxYzI0ZDNkNjk5Zjc2ODc1YTczNjkw OWNhMzVhMzI4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTE2 Myw3ICsxNjMsNiBAQCBwdWJsaWM6CiAgICAgU2Nyb2xsVHlwZSBjdXJyZW50U2Nyb2xsVHlwZSgp IGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIFNjcm9sbEFuaW1hdG9yJiBzY3JvbGxBbmltYXRv cigpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIFNjcm9sbE9mZnNldCBzY3JvbGxPZmZzZXQo KSBjb25zdDsKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNjcm9sbFRvT2Zmc2V0KGNvbnN0IFNj cm9sbE9mZnNldCYsIGNvbnN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyYgPSBTY3JvbGxQ b3NpdGlvbkNoYW5nZU9wdGlvbnM6OmNyZWF0ZVByb2dyYW1tYXRpYygpKTsKICAgICB2b2lkIHNj cm9sbFRvWFBvc2l0aW9uKGludCB4LCBjb25zdCBTY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMm KTsKICAgICB2b2lkIHNjcm9sbFRvWVBvc2l0aW9uKGludCB5LCBjb25zdCBTY3JvbGxQb3NpdGlv bkNoYW5nZU9wdGlvbnMmKTsKICAgICB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IFNjcm9s bFBvc2l0aW9uJiwgY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zJik7CkBAIC0yMDIs OCArMjAxLDYgQEAgcHVibGljOgogICAgIGludCB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoKE92ZXJs YXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5ID0gSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUpIGNv bnN0OwogICAgIGludCBob3Jpem9udGFsU2Nyb2xsYmFySGVpZ2h0KE92ZXJsYXlTY3JvbGxiYXJT aXplUmVsZXZhbmN5ID0gSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUpIGNvbnN0OwogICAgIGJv b2wgc2Nyb2xsKFNjcm9sbERpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksIGZsb2F0IG11bHRp cGxpZXIgPSAxKTsKLSAgICB2b2lkIHNjcm9sbFRvWE9mZnNldChpbnQgeCkgeyBzY3JvbGxUb09m ZnNldChTY3JvbGxPZmZzZXQoeCwgc2Nyb2xsT2Zmc2V0KCkueSgpKSwgU2Nyb2xsUG9zaXRpb25D aGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWNVbmNsYW1wZWQoKSk7IH0KLSAgICB2b2lk IHNjcm9sbFRvWU9mZnNldChpbnQgeSkgeyBzY3JvbGxUb09mZnNldChTY3JvbGxPZmZzZXQoc2Ny b2xsT2Zmc2V0KCkueCgpLCB5KSwgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQ cm9ncmFtbWF0aWNVbmNsYW1wZWQoKSk7IH0KICAgICB2b2lkIHNldENvbnN0cmFpbnNTY3JvbGxp bmdUb0NvbnRlbnRFZGdlKGJvb2wpOwogICAgIC8vIEVuZCBvZiB0ZW1wb3JhcnkgZ2x1ZSBjb2Rl CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNwcAppbmRleCA2ZTAy NDRjMTY0ZGVkNmE1OGMyNmY1ODFmY2Q4NjkxNDU1MjJmM2MyLi5iMTJkMDBkMWNmOTE1Njk1ZTgx YTg5MGFjMGRkODg5YzExNzgxMDQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTWFycXVlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck1hcnF1ZWUuY3BwCkBAIC01MCw2ICs1MCw3IEBACiAjaW5jbHVkZSAiSFRNTE1hcnF1ZWVFbGVt ZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXIuaCIK KyNpbmNsdWRlICJSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmgiCiAjaW5jbHVkZSAiUmVuZGVy Vmlldy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0xNzEsMTIgKzE3MiwxNSBAQCB2b2lk IFJlbmRlck1hcnF1ZWU6OnN0YXJ0KCkKICAgICBpZiAobV90aW1lci5pc0FjdGl2ZSgpIHx8IG1f bGF5ZXItPnJlbmRlcmVyKCkuc3R5bGUoKS5tYXJxdWVlSW5jcmVtZW50KCkuaXNaZXJvKCkpCiAg ICAgICAgIHJldHVybjsKIAorICAgIGF1dG8qIHNjcm9sbGFibGVMYXllciA9IG1fbGF5ZXItPnNj cm9sbGFibGVBcmVhKCk7CisgICAgQVNTRVJUKHNjcm9sbGFibGVMYXllcik7CisKICAgICBhdXRv IGRldGFpbHMgPSBTY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnM6OmNyZWF0ZVByb2dyYW1tYXRp Y1VuY2xhbXBlZCgpOwogICAgIGlmICghbV9zdXNwZW5kZWQgJiYgIW1fc3RvcHBlZCkgewogICAg ICAgICBpZiAoaXNIb3Jpem9udGFsKCkpCi0gICAgICAgICAgICBtX2xheWVyLT5zY3JvbGxUb09m ZnNldChTY3JvbGxPZmZzZXQobV9zdGFydCwgMCksIGRldGFpbHMpOworICAgICAgICAgICAgc2Ny b2xsYWJsZUxheWVyLT5zY3JvbGxUb09mZnNldChTY3JvbGxPZmZzZXQobV9zdGFydCwgMCksIGRl dGFpbHMpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2xheWVyLT5zY3JvbGxUb09mZnNl dChTY3JvbGxPZmZzZXQoMCwgbV9zdGFydCksIGRldGFpbHMpOworICAgICAgICAgICAgc2Nyb2xs YWJsZUxheWVyLT5zY3JvbGxUb09mZnNldChTY3JvbGxPZmZzZXQoMCwgbV9zdGFydCksIGRldGFp bHMpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIG1fc3VzcGVuZGVkID0gZmFsc2U7CiAgICAgICAg IG1fc3RvcHBlZCA9IGZhbHNlOwpAQCAtMjQ0LDEzICsyNDgsMTYgQEAgdm9pZCBSZW5kZXJNYXJx dWVlOjp0aW1lckZpcmVkKCkKIHsKICAgICBpZiAobV9sYXllci0+cmVuZGVyZXIoKS52aWV3KCku bmVlZHNMYXlvdXQoKSkKICAgICAgICAgcmV0dXJuOwotICAgIAorCisgICAgYXV0byogc2Nyb2xs YWJsZUxheWVyID0gbV9sYXllci0+c2Nyb2xsYWJsZUFyZWEoKTsKKyAgICBBU1NFUlQoc2Nyb2xs YWJsZUxheWVyKTsKKwogICAgIGlmIChtX3Jlc2V0KSB7CiAgICAgICAgIG1fcmVzZXQgPSBmYWxz ZTsKICAgICAgICAgaWYgKGlzSG9yaXpvbnRhbCgpKQotICAgICAgICAgICAgbV9sYXllci0+c2Ny b2xsVG9YT2Zmc2V0KG1fc3RhcnQpOworICAgICAgICAgICAgc2Nyb2xsYWJsZUxheWVyLT5zY3Jv bGxUb1hPZmZzZXQobV9zdGFydCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fbGF5ZXIt PnNjcm9sbFRvWU9mZnNldChtX3N0YXJ0KTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVMYXllci0+ c2Nyb2xsVG9ZT2Zmc2V0KG1fc3RhcnQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIApA QCAtMjkwLDkgKzI5Nyw5IEBAIHZvaWQgUmVuZGVyTWFycXVlZTo6dGltZXJGaXJlZCgpCiAgICAg fQogICAgIAogICAgIGlmIChpc0hvcml6b250YWwoKSkKLSAgICAgICAgbV9sYXllci0+c2Nyb2xs VG9YT2Zmc2V0KG5ld1Bvcyk7CisgICAgICAgIHNjcm9sbGFibGVMYXllci0+c2Nyb2xsVG9YT2Zm c2V0KG5ld1Bvcyk7CiAgICAgZWxzZQotICAgICAgICBtX2xheWVyLT5zY3JvbGxUb1lPZmZzZXQo bmV3UG9zKTsKKyAgICAgICAgc2Nyb2xsYWJsZUxheWVyLT5zY3JvbGxUb1lPZmZzZXQobmV3UG9z KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00v RE9NSFRNTC5tbQppbmRleCBmZmUxNGVkMGJmZTdkNDk0ZGQyZTY2OGY0YWJmNTM1Mzg4YzYwN2Nl Li43OTA3Y2FiOWY2M2UzMmE0YmIwNmM5NzRmMjkzNjY4N2I5MTZlYTk2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vRE9NSFRNTC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 TGVnYWN5L21hYy9ET00vRE9NSFRNTC5tbQpAQCAtMTExLDEyICsxMTEsMTYgQEAgLSAodm9pZClz ZXRTY3JvbGxYT2Zmc2V0OihpbnQpeCBzY3JvbGxZT2Zmc2V0OihpbnQpeSBhZGp1c3RGb3JJT1ND YXJldDooQk9PTClhZGoKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byogbGF5ZXIgPSBkb3du Y2FzdDxXZWJDb3JlOjpSZW5kZXJCb3g+KCpyZW5kZXJlcikubGF5ZXIoKTsKKyAgICBBU3NFUlQo bGF5ZXIpOworCisgICAgYXV0byogc2Nyb2xsYWJsZUxheWVyID0gbGF5ZXItPmVuc3VyZUxheWVy U2Nyb2xsYWJsZUFyZWEoKTsKKwogICAgIGlmIChhZGp1c3RGb3JJT1NDYXJldCkKICAgICAgICAg bGF5ZXItPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyh0cnVlKTsKIAogICAgIGF1 dG8gc2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zID0gV2ViQ29yZTo6U2Nyb2xsUG9zaXRpb25D aGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKTsKICAgICBzY3JvbGxQb3NpdGlvbkNo YW5nZU9wdGlvbnMuY2xhbXBpbmcgPSBXZWJDb3JlOjpTY3JvbGxDbGFtcGluZzo6VW5jbGFtcGVk OwotICAgIGxheWVyLT5zY3JvbGxUb09mZnNldChXZWJDb3JlOjpTY3JvbGxPZmZzZXQoeCwgeSks IHNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyk7CisgICAgc2Nyb2xsYWJsZUxheWVyLT5zY3Jv bGxUb09mZnNldChXZWJDb3JlOjpTY3JvbGxPZmZzZXQoeCwgeSksIHNjcm9sbFBvc2l0aW9uQ2hh bmdlT3B0aW9ucyk7CiAgICAgaWYgKGFkanVzdEZvcklPU0NhcmV0KQogICAgICAgICBsYXllci0+ c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGZhbHNlKTsKIH0K 417815 2021-01-18 01:17:28 -0800 2021-01-18 01:18:57 -0800 Patch, v2 bug-220705-20210118101727.patch text/plain 8584 zimmermann U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2VjZjQwOGEyYjNhYWM3 MmE1NTM1NTNjNDQwMTFiOTU3MDgwYzJmNS4uNTNkZjdjMmY3MWFhNjIyZTY0MGExMmE2N2NkYTdh MzFkMTI2OTVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAxLTE4ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbW92 ZSByZWNlbnRseSBhZGRlZCBnbHVlIGNvZGU6IFJlbmRlckxheWVyOjooc2Nyb2xsVG9PZmZzZXQg LyBzY3JvbGxUb1hPZmZzZXQgLyBzY3JvbGxUb1lPZmZzZXQpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA3MDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2xsb3ctdXAgb24gcGF0Y2ggYWRyZXNzaW5n IHRoZSByZW1vdmFsIG9mIHRoZSBnbHVlIGNvZGUgdGhhdAorICAgICAgICBmb3J3YXJkcyBjYWxs cyBmcm9tIFJlbmRlckxheWVyIHRvIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEgKHNlZQorICAg ICAgICB3ZWJraXQub3JnL2IvNjAzMDUpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3Rpbmcg dGVzdHMuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2Ny b2xsVG8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsVG9PZmZzZXQpOiBEZWxldGVkLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OnNjcm9sbFRvWE9mZnNldCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllcjo6c2Nyb2xsVG9ZT2Zmc2V0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTWFycXVlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXJxdWVlOjpzdGFy dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXJxdWVlOjp0aW1lckZpcmVkKToKKwogMjAy MS0wMS0xNyAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAg IEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjpyZXNoYXBlRkJPcygpIEFOR0xFIHZhcmlhbnQgY2Fs bHMgaW50byBtYWtlQ29udGV4dEN1cnJlbnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmlu ZGV4IGVjNDY1MTg2YWJmYTNmNzQzYWUyY2U3YjNkMzZmYjQxYTY3OTA3YzUuLmJiMzg2MjExM2E3 NDU4ODNiMDNiNjYwN2ZkZjM0MWI1NjY5YjYwODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0wMS0xOCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnpp bW1lcm1hbm5AaWdhbGlhLmNvbT4KKworICAgICAgICBSZW1vdmUgcmVjZW50bHkgYWRkZWQgZ2x1 ZSBjb2RlOiBSZW5kZXJMYXllcjo6KHNjcm9sbFRvT2Zmc2V0IC8gc2Nyb2xsVG9YT2Zmc2V0IC8g c2Nyb2xsVG9ZT2Zmc2V0KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjIwNzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRm9sbG93LXVwIG9uIHBhdGNoIGFkcmVzc2luZyB0aGUgcmVtb3ZhbCBvZiB0aGUg Z2x1ZSBjb2RlIHRoYXQKKyAgICAgICAgZm9yd2FyZHMgY2FsbHMgZnJvbSBSZW5kZXJMYXllciB0 byBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhIChzZWUKKyAgICAgICAgd2Via2l0Lm9yZy9iLzYw MzA1KS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICog RE9NL0RPTUhUTUwubW06CisgICAgICAgICgtW0RPTUhUTUxFbGVtZW50IHNldFNjcm9sbFhPZmZz ZXQ6c2Nyb2xsWU9mZnNldDphZGp1c3RGb3JJT1NDYXJldDpdKToKKwogMjAyMS0wMS0xNCAgR2Vv ZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZWQgbW9zdCB1 c2VzIG9mIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIC4uLikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuY3BwCmluZGV4IDNjNTUzMjRmOTZkYzEzNTA1ZjcxN2M0OWRhODlhOGE4NmQx MDdiZGYuLjQ2MGU2NWZiNzhhM2JjNTVlOTYxMTdhMDlhODM5ODhlYmZiZjU5MzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0LmNwcApAQCAtMzkyMCw3ICszOTIwLDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0OjpzY3JvbGxUbyhjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiAgICAgICAg IHJldHVybjsKIAogICAgIC8vIEZJWE1FOiBpcyBwb2ludCBhIFNjcm9sbE9mZnNldCBvciBTY3Jv bGxQb3NpdGlvbj8gVGVzdCBpbiBSVEwgb3ZlcmZsb3cuCi0gICAgYm94LmxheWVyKCktPnNjcm9s bFRvT2Zmc2V0KHBvaW50KTsKKyAgICBib3gubGF5ZXIoKS0+ZW5zdXJlTGF5ZXJTY3JvbGxhYmxl QXJlYSgpLT5zY3JvbGxUb09mZnNldChwb2ludCk7CiB9CiAKICNpZiBFTkFCTEUoTUFUSE1MKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggNzQ0MGEyMWIyMGI5 MDg5NzQzMjQyZWFlNTM3NmNmNzY5Nzk2NTY3MC4uMGQyNmVjMjZkNWY5ZGVkOTU0ODA4NTE1NmRk MWM1NzY0OTM4YjQ2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3Bw CkBAIC0zOTYsMTEgKzM5Niw2IEBAIFNjcm9sbE9mZnNldCBSZW5kZXJMYXllcjo6c2Nyb2xsT2Zm c2V0KCkgY29uc3QKICAgICByZXR1cm4geyAwLCAwIH07CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6 OnNjcm9sbFRvT2Zmc2V0KGNvbnN0IFNjcm9sbE9mZnNldCYgc2Nyb2xsT2Zmc2V0LCBjb25zdCBT Y3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMmIG9wdGlvbnMpCi17Ci0gICAgZW5zdXJlTGF5ZXJT Y3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxUb09mZnNldChzY3JvbGxPZmZzZXQsIG9wdGlvbnMpOwot fQotCiB2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxUb1hQb3NpdGlvbihpbnQgeCwgY29uc3QgU2Ny b2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zJiBvcHRpb25zKQogewogICAgIGVuc3VyZUxheWVyU2Ny b2xsYWJsZUFyZWEoKS0+c2Nyb2xsVG9YUG9zaXRpb24oeCwgb3B0aW9ucyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IDc2MjVmNDE3MTE2ZjBkZjI5OTQ5YzliNTMy MWNmNTlkYzExNzAyNGYuLmEyNGZhMDA3MWMyNGQzZDY5OWY3Njg3NWE3MzY5MDljYTM1YTMyODEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC0xNjMsNyArMTYzLDYg QEAgcHVibGljOgogICAgIFNjcm9sbFR5cGUgY3VycmVudFNjcm9sbFR5cGUoKSBjb25zdDsKICAg ICBXRUJDT1JFX0VYUE9SVCBTY3JvbGxBbmltYXRvciYgc2Nyb2xsQW5pbWF0b3IoKSBjb25zdDsK ICAgICBXRUJDT1JFX0VYUE9SVCBTY3JvbGxPZmZzZXQgc2Nyb2xsT2Zmc2V0KCkgY29uc3Q7Ci0g ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzY3JvbGxUb09mZnNldChjb25zdCBTY3JvbGxPZmZzZXQm LCBjb25zdCBTY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMmID0gU2Nyb2xsUG9zaXRpb25DaGFu Z2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKSk7CiAgICAgdm9pZCBzY3JvbGxUb1hQb3Np dGlvbihpbnQgeCwgY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zJik7CiAgICAgdm9p ZCBzY3JvbGxUb1lQb3NpdGlvbihpbnQgeSwgY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRp b25zJik7CiAgICAgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBTY3JvbGxQb3NpdGlvbiYs IGNvbnN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyYpOwpAQCAtMjAyLDggKzIwMSw2IEBA IHB1YmxpYzoKICAgICBpbnQgdmVydGljYWxTY3JvbGxiYXJXaWR0aChPdmVybGF5U2Nyb2xsYmFy U2l6ZVJlbGV2YW5jeSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKSBjb25zdDsKICAgICBp bnQgaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodChPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5j eSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKSBjb25zdDsKICAgICBib29sIHNjcm9sbChT Y3JvbGxEaXJlY3Rpb24sIFNjcm9sbEdyYW51bGFyaXR5LCBmbG9hdCBtdWx0aXBsaWVyID0gMSk7 Ci0gICAgdm9pZCBzY3JvbGxUb1hPZmZzZXQoaW50IHgpIHsgc2Nyb2xsVG9PZmZzZXQoU2Nyb2xs T2Zmc2V0KHgsIHNjcm9sbE9mZnNldCgpLnkoKSksIFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9u czo6Y3JlYXRlUHJvZ3JhbW1hdGljVW5jbGFtcGVkKCkpOyB9Ci0gICAgdm9pZCBzY3JvbGxUb1lP ZmZzZXQoaW50IHkpIHsgc2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNldCgp LngoKSwgeSksIFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9uczo6Y3JlYXRlUHJvZ3JhbW1hdGlj VW5jbGFtcGVkKCkpOyB9CiAgICAgdm9pZCBzZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50 RWRnZShib29sKTsKICAgICAvLyBFbmQgb2YgdGVtcG9yYXJ5IGdsdWUgY29kZQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWFycXVlZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWFycXVlZS5jcHAKaW5kZXggNmUwMjQ0YzE2NGRlZDZh NThjMjZmNTgxZmNkODY5MTQ1NTIyZjNjMi4uYjEyZDAwZDFjZjkxNTY5NWU4MWE4OTBhYzBkZDg4 OWMxMTc4MTA0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1h cnF1ZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNw cApAQCAtNTAsNiArNTAsNyBAQAogI2luY2x1ZGUgIkhUTUxNYXJxdWVlRWxlbWVudC5oIgogI2lu Y2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyLmgiCisjaW5jbHVkZSAi UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oIgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKIAog bmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMTcxLDEyICsxNzIsMTUgQEAgdm9pZCBSZW5kZXJNYXJx dWVlOjpzdGFydCgpCiAgICAgaWYgKG1fdGltZXIuaXNBY3RpdmUoKSB8fCBtX2xheWVyLT5yZW5k ZXJlcigpLnN0eWxlKCkubWFycXVlZUluY3JlbWVudCgpLmlzWmVybygpKQogICAgICAgICByZXR1 cm47CiAKKyAgICBhdXRvKiBzY3JvbGxhYmxlTGF5ZXIgPSBtX2xheWVyLT5zY3JvbGxhYmxlQXJl YSgpOworICAgIEFTU0VSVChzY3JvbGxhYmxlTGF5ZXIpOworCiAgICAgYXV0byBkZXRhaWxzID0g U2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWNVbmNsYW1wZWQo KTsKICAgICBpZiAoIW1fc3VzcGVuZGVkICYmICFtX3N0b3BwZWQpIHsKICAgICAgICAgaWYgKGlz SG9yaXpvbnRhbCgpKQotICAgICAgICAgICAgbV9sYXllci0+c2Nyb2xsVG9PZmZzZXQoU2Nyb2xs T2Zmc2V0KG1fc3RhcnQsIDApLCBkZXRhaWxzKTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVMYXll ci0+c2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KG1fc3RhcnQsIDApLCBkZXRhaWxzKTsKICAg ICAgICAgZWxzZQotICAgICAgICAgICAgbV9sYXllci0+c2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zm c2V0KDAsIG1fc3RhcnQpLCBkZXRhaWxzKTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVMYXllci0+ c2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KDAsIG1fc3RhcnQpLCBkZXRhaWxzKTsKICAgICB9 IGVsc2UgewogICAgICAgICBtX3N1c3BlbmRlZCA9IGZhbHNlOwogICAgICAgICBtX3N0b3BwZWQg PSBmYWxzZTsKQEAgLTI0NCwxMyArMjQ4LDE2IEBAIHZvaWQgUmVuZGVyTWFycXVlZTo6dGltZXJG aXJlZCgpCiB7CiAgICAgaWYgKG1fbGF5ZXItPnJlbmRlcmVyKCkudmlldygpLm5lZWRzTGF5b3V0 KCkpCiAgICAgICAgIHJldHVybjsKLSAgICAKKworICAgIGF1dG8qIHNjcm9sbGFibGVMYXllciA9 IG1fbGF5ZXItPnNjcm9sbGFibGVBcmVhKCk7CisgICAgQVNTRVJUKHNjcm9sbGFibGVMYXllcik7 CisKICAgICBpZiAobV9yZXNldCkgewogICAgICAgICBtX3Jlc2V0ID0gZmFsc2U7CiAgICAgICAg IGlmIChpc0hvcml6b250YWwoKSkKLSAgICAgICAgICAgIG1fbGF5ZXItPnNjcm9sbFRvWE9mZnNl dChtX3N0YXJ0KTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVMYXllci0+c2Nyb2xsVG9YT2Zmc2V0 KG1fc3RhcnQpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2xheWVyLT5zY3JvbGxUb1lP ZmZzZXQobV9zdGFydCk7CisgICAgICAgICAgICBzY3JvbGxhYmxlTGF5ZXItPnNjcm9sbFRvWU9m ZnNldChtX3N0YXJ0KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKQEAgLTI5MCw5ICsy OTcsOSBAQCB2b2lkIFJlbmRlck1hcnF1ZWU6OnRpbWVyRmlyZWQoKQogICAgIH0KICAgICAKICAg ICBpZiAoaXNIb3Jpem9udGFsKCkpCi0gICAgICAgIG1fbGF5ZXItPnNjcm9sbFRvWE9mZnNldChu ZXdQb3MpOworICAgICAgICBzY3JvbGxhYmxlTGF5ZXItPnNjcm9sbFRvWE9mZnNldChuZXdQb3Mp OwogICAgIGVsc2UKLSAgICAgICAgbV9sYXllci0+c2Nyb2xsVG9ZT2Zmc2V0KG5ld1Bvcyk7Cisg ICAgICAgIHNjcm9sbGFibGVMYXllci0+c2Nyb2xsVG9ZT2Zmc2V0KG5ld1Bvcyk7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0RPTS9ET01IVE1MLm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0K aW5kZXggZmZlMTRlZDBiZmU3ZDQ5NGRkMmU2NjhmNGFiZjUzNTM4OGM2MDdjZS4uZTYwNGI5YTlj ODZjYjMzOWRlODJlOTQ0NDQyYWJiZDlhZjdkOTE1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv RE9NL0RPTUhUTUwubW0KQEAgLTExMSwxMiArMTExLDE2IEBAIC0gKHZvaWQpc2V0U2Nyb2xsWE9m ZnNldDooaW50KXggc2Nyb2xsWU9mZnNldDooaW50KXkgYWRqdXN0Rm9ySU9TQ2FyZXQ6KEJPT0wp YWRqCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8qIGxheWVyID0gZG93bmNhc3Q8V2ViQ29y ZTo6UmVuZGVyQm94PigqcmVuZGVyZXIpLmxheWVyKCk7CisgICAgQVNTRVJUKGxheWVyKTsKKwor ICAgIGF1dG8qIHNjcm9sbGFibGVMYXllciA9IGxheWVyLT5lbnN1cmVMYXllclNjcm9sbGFibGVB cmVhKCk7CisKICAgICBpZiAoYWRqdXN0Rm9ySU9TQ2FyZXQpCiAgICAgICAgIGxheWVyLT5zZXRB ZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcodHJ1ZSk7CiAKICAgICBhdXRvIHNjcm9sbFBv c2l0aW9uQ2hhbmdlT3B0aW9ucyA9IFdlYkNvcmU6OlNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9u czo6Y3JlYXRlUHJvZ3JhbW1hdGljKCk7CiAgICAgc2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25z LmNsYW1waW5nID0gV2ViQ29yZTo6U2Nyb2xsQ2xhbXBpbmc6OlVuY2xhbXBlZDsKLSAgICBsYXll ci0+c2Nyb2xsVG9PZmZzZXQoV2ViQ29yZTo6U2Nyb2xsT2Zmc2V0KHgsIHkpLCBzY3JvbGxQb3Np dGlvbkNoYW5nZU9wdGlvbnMpOworICAgIHNjcm9sbGFibGVMYXllci0+c2Nyb2xsVG9PZmZzZXQo V2ViQ29yZTo6U2Nyb2xsT2Zmc2V0KHgsIHkpLCBzY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMp OwogICAgIGlmIChhZGp1c3RGb3JJT1NDYXJldCkKICAgICAgICAgbGF5ZXItPnNldEFkanVzdEZv cklPU0NhcmV0V2hlblNjcm9sbGluZyhmYWxzZSk7CiB9Cg== 417816 2021-01-18 01:19:02 -0800 2021-01-18 01:51:25 -0800 Patch, v3 bug-220705-20210118101901.patch text/plain 8844 zimmermann U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2VjZjQwOGEyYjNhYWM3 MmE1NTM1NTNjNDQwMTFiOTU3MDgwYzJmNS4uNTNkZjdjMmY3MWFhNjIyZTY0MGExMmE2N2NkYTdh MzFkMTI2OTVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAxLTE4ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbW92 ZSByZWNlbnRseSBhZGRlZCBnbHVlIGNvZGU6IFJlbmRlckxheWVyOjooc2Nyb2xsVG9PZmZzZXQg LyBzY3JvbGxUb1hPZmZzZXQgLyBzY3JvbGxUb1lPZmZzZXQpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA3MDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2xsb3ctdXAgb24gcGF0Y2ggYWRyZXNzaW5n IHRoZSByZW1vdmFsIG9mIHRoZSBnbHVlIGNvZGUgdGhhdAorICAgICAgICBmb3J3YXJkcyBjYWxs cyBmcm9tIFJlbmRlckxheWVyIHRvIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEgKHNlZQorICAg ICAgICB3ZWJraXQub3JnL2IvNjAzMDUpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3Rpbmcg dGVzdHMuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2Ny b2xsVG8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsVG9PZmZzZXQpOiBEZWxldGVkLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OnNjcm9sbFRvWE9mZnNldCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllcjo6c2Nyb2xsVG9ZT2Zmc2V0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTWFycXVlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXJxdWVlOjpzdGFy dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXJxdWVlOjp0aW1lckZpcmVkKToKKwogMjAy MS0wMS0xNyAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAg IEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjpyZXNoYXBlRkJPcygpIEFOR0xFIHZhcmlhbnQgY2Fs bHMgaW50byBtYWtlQ29udGV4dEN1cnJlbnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmlu ZGV4IGVjNDY1MTg2YWJmYTNmNzQzYWUyY2U3YjNkMzZmYjQxYTY3OTA3YzUuLmJiMzg2MjExM2E3 NDU4ODNiMDNiNjYwN2ZkZjM0MWI1NjY5YjYwODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0wMS0xOCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnpp bW1lcm1hbm5AaWdhbGlhLmNvbT4KKworICAgICAgICBSZW1vdmUgcmVjZW50bHkgYWRkZWQgZ2x1 ZSBjb2RlOiBSZW5kZXJMYXllcjo6KHNjcm9sbFRvT2Zmc2V0IC8gc2Nyb2xsVG9YT2Zmc2V0IC8g c2Nyb2xsVG9ZT2Zmc2V0KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjIwNzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRm9sbG93LXVwIG9uIHBhdGNoIGFkcmVzc2luZyB0aGUgcmVtb3ZhbCBvZiB0aGUg Z2x1ZSBjb2RlIHRoYXQKKyAgICAgICAgZm9yd2FyZHMgY2FsbHMgZnJvbSBSZW5kZXJMYXllciB0 byBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhIChzZWUKKyAgICAgICAgd2Via2l0Lm9yZy9iLzYw MzA1KS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICog RE9NL0RPTUhUTUwubW06CisgICAgICAgICgtW0RPTUhUTUxFbGVtZW50IHNldFNjcm9sbFhPZmZz ZXQ6c2Nyb2xsWU9mZnNldDphZGp1c3RGb3JJT1NDYXJldDpdKToKKwogMjAyMS0wMS0xNCAgR2Vv ZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZWQgbW9zdCB1 c2VzIG9mIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIC4uLikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuY3BwCmluZGV4IDNjNTUzMjRmOTZkYzEzNTA1ZjcxN2M0OWRhODlhOGE4NmQx MDdiZGYuLjQ2MGU2NWZiNzhhM2JjNTVlOTYxMTdhMDlhODM5ODhlYmZiZjU5MzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0LmNwcApAQCAtMzkyMCw3ICszOTIwLDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0OjpzY3JvbGxUbyhjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiAgICAgICAg IHJldHVybjsKIAogICAgIC8vIEZJWE1FOiBpcyBwb2ludCBhIFNjcm9sbE9mZnNldCBvciBTY3Jv bGxQb3NpdGlvbj8gVGVzdCBpbiBSVEwgb3ZlcmZsb3cuCi0gICAgYm94LmxheWVyKCktPnNjcm9s bFRvT2Zmc2V0KHBvaW50KTsKKyAgICBib3gubGF5ZXIoKS0+ZW5zdXJlTGF5ZXJTY3JvbGxhYmxl QXJlYSgpLT5zY3JvbGxUb09mZnNldChwb2ludCk7CiB9CiAKICNpZiBFTkFCTEUoTUFUSE1MKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggNzQ0MGEyMWIyMGI5 MDg5NzQzMjQyZWFlNTM3NmNmNzY5Nzk2NTY3MC4uMGQyNmVjMjZkNWY5ZGVkOTU0ODA4NTE1NmRk MWM1NzY0OTM4YjQ2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3Bw CkBAIC0zOTYsMTEgKzM5Niw2IEBAIFNjcm9sbE9mZnNldCBSZW5kZXJMYXllcjo6c2Nyb2xsT2Zm c2V0KCkgY29uc3QKICAgICByZXR1cm4geyAwLCAwIH07CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6 OnNjcm9sbFRvT2Zmc2V0KGNvbnN0IFNjcm9sbE9mZnNldCYgc2Nyb2xsT2Zmc2V0LCBjb25zdCBT Y3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMmIG9wdGlvbnMpCi17Ci0gICAgZW5zdXJlTGF5ZXJT Y3JvbGxhYmxlQXJlYSgpLT5zY3JvbGxUb09mZnNldChzY3JvbGxPZmZzZXQsIG9wdGlvbnMpOwot fQotCiB2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxUb1hQb3NpdGlvbihpbnQgeCwgY29uc3QgU2Ny b2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zJiBvcHRpb25zKQogewogICAgIGVuc3VyZUxheWVyU2Ny b2xsYWJsZUFyZWEoKS0+c2Nyb2xsVG9YUG9zaXRpb24oeCwgb3B0aW9ucyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IDc2MjVmNDE3MTE2ZjBkZjI5OTQ5YzliNTMy MWNmNTlkYzExNzAyNGYuLmEyNGZhMDA3MWMyNGQzZDY5OWY3Njg3NWE3MzY5MDljYTM1YTMyODEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC0xNjMsNyArMTYzLDYg QEAgcHVibGljOgogICAgIFNjcm9sbFR5cGUgY3VycmVudFNjcm9sbFR5cGUoKSBjb25zdDsKICAg ICBXRUJDT1JFX0VYUE9SVCBTY3JvbGxBbmltYXRvciYgc2Nyb2xsQW5pbWF0b3IoKSBjb25zdDsK ICAgICBXRUJDT1JFX0VYUE9SVCBTY3JvbGxPZmZzZXQgc2Nyb2xsT2Zmc2V0KCkgY29uc3Q7Ci0g ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzY3JvbGxUb09mZnNldChjb25zdCBTY3JvbGxPZmZzZXQm LCBjb25zdCBTY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMmID0gU2Nyb2xsUG9zaXRpb25DaGFu Z2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKSk7CiAgICAgdm9pZCBzY3JvbGxUb1hQb3Np dGlvbihpbnQgeCwgY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zJik7CiAgICAgdm9p ZCBzY3JvbGxUb1lQb3NpdGlvbihpbnQgeSwgY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRp b25zJik7CiAgICAgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBTY3JvbGxQb3NpdGlvbiYs IGNvbnN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyYpOwpAQCAtMjAyLDggKzIwMSw2IEBA IHB1YmxpYzoKICAgICBpbnQgdmVydGljYWxTY3JvbGxiYXJXaWR0aChPdmVybGF5U2Nyb2xsYmFy U2l6ZVJlbGV2YW5jeSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKSBjb25zdDsKICAgICBp bnQgaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodChPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5j eSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKSBjb25zdDsKICAgICBib29sIHNjcm9sbChT Y3JvbGxEaXJlY3Rpb24sIFNjcm9sbEdyYW51bGFyaXR5LCBmbG9hdCBtdWx0aXBsaWVyID0gMSk7 Ci0gICAgdm9pZCBzY3JvbGxUb1hPZmZzZXQoaW50IHgpIHsgc2Nyb2xsVG9PZmZzZXQoU2Nyb2xs T2Zmc2V0KHgsIHNjcm9sbE9mZnNldCgpLnkoKSksIFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9u czo6Y3JlYXRlUHJvZ3JhbW1hdGljVW5jbGFtcGVkKCkpOyB9Ci0gICAgdm9pZCBzY3JvbGxUb1lP ZmZzZXQoaW50IHkpIHsgc2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNldCgp LngoKSwgeSksIFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9uczo6Y3JlYXRlUHJvZ3JhbW1hdGlj VW5jbGFtcGVkKCkpOyB9CiAgICAgdm9pZCBzZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50 RWRnZShib29sKTsKICAgICAvLyBFbmQgb2YgdGVtcG9yYXJ5IGdsdWUgY29kZQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWFycXVlZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWFycXVlZS5jcHAKaW5kZXggNmUwMjQ0YzE2NGRlZDZh NThjMjZmNTgxZmNkODY5MTQ1NTIyZjNjMi4uYjEyZDAwZDFjZjkxNTY5NWU4MWE4OTBhYzBkZDg4 OWMxMTc4MTA0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1h cnF1ZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNw cApAQCAtNTAsNiArNTAsNyBAQAogI2luY2x1ZGUgIkhUTUxNYXJxdWVlRWxlbWVudC5oIgogI2lu Y2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyLmgiCisjaW5jbHVkZSAi UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oIgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKIAog bmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMTcxLDEyICsxNzIsMTUgQEAgdm9pZCBSZW5kZXJNYXJx dWVlOjpzdGFydCgpCiAgICAgaWYgKG1fdGltZXIuaXNBY3RpdmUoKSB8fCBtX2xheWVyLT5yZW5k ZXJlcigpLnN0eWxlKCkubWFycXVlZUluY3JlbWVudCgpLmlzWmVybygpKQogICAgICAgICByZXR1 cm47CiAKKyAgICBhdXRvKiBzY3JvbGxhYmxlTGF5ZXIgPSBtX2xheWVyLT5zY3JvbGxhYmxlQXJl YSgpOworICAgIEFTU0VSVChzY3JvbGxhYmxlTGF5ZXIpOworCiAgICAgYXV0byBkZXRhaWxzID0g U2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWNVbmNsYW1wZWQo KTsKICAgICBpZiAoIW1fc3VzcGVuZGVkICYmICFtX3N0b3BwZWQpIHsKICAgICAgICAgaWYgKGlz SG9yaXpvbnRhbCgpKQotICAgICAgICAgICAgbV9sYXllci0+c2Nyb2xsVG9PZmZzZXQoU2Nyb2xs T2Zmc2V0KG1fc3RhcnQsIDApLCBkZXRhaWxzKTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVMYXll ci0+c2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KG1fc3RhcnQsIDApLCBkZXRhaWxzKTsKICAg ICAgICAgZWxzZQotICAgICAgICAgICAgbV9sYXllci0+c2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zm c2V0KDAsIG1fc3RhcnQpLCBkZXRhaWxzKTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVMYXllci0+ c2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KDAsIG1fc3RhcnQpLCBkZXRhaWxzKTsKICAgICB9 IGVsc2UgewogICAgICAgICBtX3N1c3BlbmRlZCA9IGZhbHNlOwogICAgICAgICBtX3N0b3BwZWQg PSBmYWxzZTsKQEAgLTI0NCwxMyArMjQ4LDE2IEBAIHZvaWQgUmVuZGVyTWFycXVlZTo6dGltZXJG aXJlZCgpCiB7CiAgICAgaWYgKG1fbGF5ZXItPnJlbmRlcmVyKCkudmlldygpLm5lZWRzTGF5b3V0 KCkpCiAgICAgICAgIHJldHVybjsKLSAgICAKKworICAgIGF1dG8qIHNjcm9sbGFibGVMYXllciA9 IG1fbGF5ZXItPnNjcm9sbGFibGVBcmVhKCk7CisgICAgQVNTRVJUKHNjcm9sbGFibGVMYXllcik7 CisKICAgICBpZiAobV9yZXNldCkgewogICAgICAgICBtX3Jlc2V0ID0gZmFsc2U7CiAgICAgICAg IGlmIChpc0hvcml6b250YWwoKSkKLSAgICAgICAgICAgIG1fbGF5ZXItPnNjcm9sbFRvWE9mZnNl dChtX3N0YXJ0KTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVMYXllci0+c2Nyb2xsVG9YT2Zmc2V0 KG1fc3RhcnQpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2xheWVyLT5zY3JvbGxUb1lP ZmZzZXQobV9zdGFydCk7CisgICAgICAgICAgICBzY3JvbGxhYmxlTGF5ZXItPnNjcm9sbFRvWU9m ZnNldChtX3N0YXJ0KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKQEAgLTI5MCw5ICsy OTcsOSBAQCB2b2lkIFJlbmRlck1hcnF1ZWU6OnRpbWVyRmlyZWQoKQogICAgIH0KICAgICAKICAg ICBpZiAoaXNIb3Jpem9udGFsKCkpCi0gICAgICAgIG1fbGF5ZXItPnNjcm9sbFRvWE9mZnNldChu ZXdQb3MpOworICAgICAgICBzY3JvbGxhYmxlTGF5ZXItPnNjcm9sbFRvWE9mZnNldChuZXdQb3Mp OwogICAgIGVsc2UKLSAgICAgICAgbV9sYXllci0+c2Nyb2xsVG9ZT2Zmc2V0KG5ld1Bvcyk7Cisg ICAgICAgIHNjcm9sbGFibGVMYXllci0+c2Nyb2xsVG9ZT2Zmc2V0KG5ld1Bvcyk7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0RPTS9ET01IVE1MLm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0K aW5kZXggZmZlMTRlZDBiZmU3ZDQ5NGRkMmU2NjhmNGFiZjUzNTM4OGM2MDdjZS4uZmQ1NDYxNDli ZTRkZDg5NTI2NWY5MmUwYmMwZTRjMmVkYzgzYmYzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv RE9NL0RPTUhUTUwubW0KQEAgLTUzLDYgKzUzLDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvSFRNTFRl eHRGb3JtQ29udHJvbEVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvSlNFeGVjU3RhdGUuaD4K ICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyTGF5ZXIuaD4KKyNpbXBvcnQgPFdlYkNvcmUvUmVuZGVy TGF5ZXJTY3JvbGxhYmxlQXJlYS5oPgogI2ltcG9ydCA8V2ViQ29yZS9XQUtXaW5kb3cuaD4KICNp bXBvcnQgPFdlYkNvcmUvV2ViQ29yZVRocmVhZE1lc3NhZ2UuaD4KICNlbmRpZgpAQCAtMTExLDEy ICsxMTIsMTYgQEAgLSAodm9pZClzZXRTY3JvbGxYT2Zmc2V0OihpbnQpeCBzY3JvbGxZT2Zmc2V0 OihpbnQpeSBhZGp1c3RGb3JJT1NDYXJldDooQk9PTClhZGoKICAgICAgICAgcmV0dXJuOwogCiAg ICAgYXV0byogbGF5ZXIgPSBkb3duY2FzdDxXZWJDb3JlOjpSZW5kZXJCb3g+KCpyZW5kZXJlciku bGF5ZXIoKTsKKyAgICBBU1NFUlQobGF5ZXIpOworCisgICAgYXV0byogc2Nyb2xsYWJsZUxheWVy ID0gbGF5ZXItPmVuc3VyZUxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKKwogICAgIGlmIChhZGp1c3RG b3JJT1NDYXJldCkKICAgICAgICAgbGF5ZXItPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9s bGluZyh0cnVlKTsKIAogICAgIGF1dG8gc2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zID0gV2Vi Q29yZTo6U2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKTsK ICAgICBzY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMuY2xhbXBpbmcgPSBXZWJDb3JlOjpTY3Jv bGxDbGFtcGluZzo6VW5jbGFtcGVkOwotICAgIGxheWVyLT5zY3JvbGxUb09mZnNldChXZWJDb3Jl OjpTY3JvbGxPZmZzZXQoeCwgeSksIHNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyk7CisgICAg c2Nyb2xsYWJsZUxheWVyLT5zY3JvbGxUb09mZnNldChXZWJDb3JlOjpTY3JvbGxPZmZzZXQoeCwg eSksIHNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyk7CiAgICAgaWYgKGFkanVzdEZvcklPU0Nh cmV0KQogICAgICAgICBsYXllci0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGZh bHNlKTsKIH0K