210402 2020-04-11 22:07:10 -0700 [LFC][TFC] Column, Row and Cell boxes are always ContainerBoxes 2020-04-12 10:54:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1640647 0 zalan 2020-04-11 22:07:10 -0700 use ContainerBox instead of Box 1640650 1 396214 zalan 2020-04-11 22:09:19 -0700 Created attachment 396214 Patch 1640698 2 396229 zalan 2020-04-12 10:32:34 -0700 Created attachment 396229 Patch 1640704 3 ews-feeder 2020-04-12 10:53:41 -0700 Committed r259983: <https://trac.webkit.org/changeset/259983> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396229. 1640705 4 webkit-bug-importer 2020-04-12 10:54:13 -0700 <rdar://problem/61678622> 396214 2020-04-11 22:09:19 -0700 2020-04-12 10:32:33 -0700 Patch bug-210402-20200411220918.patch text/plain 10832 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGU0OGM2MDQ1YTcyZTQ5 NjVhYWIyZjRiNWJjYWY1OWMzZTIwZDQwMC4uZDQ2OGRkN2M1ODI0M2M3NTExNjlhMGY1MzI3NjMz NTJmMTBhMjllNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA0LTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBDb2x1bW4s IFJvdyBhbmQgQ2VsbCBib3hlcyBhcmUgYWx3YXlzIENvbnRhaW5lckJveGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTA0MDIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVzZSBib3hlcyBhcmUgYWx3 YXlzIENvbnRhaW5lckJveCB0eXBlcy4KKworICAgICAgICAqIGxheW91dC90YWJsZWZvcm1hdHRp bmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OlRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dENlbGwpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjplbnN1cmVUYWJsZUdyaWQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZFByZWZl cnJlZFdpZHRoRm9yQ29sdW1ucyk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9U YWJsZUdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OkNvbHVt bjo6Q29sdW1uKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVHcmlkOjpDb2x1bW5z OjphZGRDb2x1bW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OlJvd3M6 OmFkZFJvdyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxlR3JpZDo6Um93OjpSb3cp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OkNlbGw6OkNlbGwpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OmFwcGVuZENlbGwpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6Omluc2VydENlbGwpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OnJlbW92ZUNlbGwpOgorICAgICAgICAqIGxheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVHcmlkLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxl R3JpZDo6Q29sdW1uOjpib3ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJs ZUdyaWQ6OlJvdzo6Ym94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVH cmlkOjpDZWxsOjpib3ggY29uc3QpOgorCiAyMDIwLTA0LTExICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3VwcG9ydCBmb3IgZml4ZWQg d2lkdGggY29sdW1ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9y bWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNWZlZDQ2 MmY1NjNmNjAyOGI4ODAxMTJlZjRiNGEwZDFiY2U5NjczNy4uYzc0NmY1OWY4N2RkNDdlMjQ0OGY0 Mjg1ZTllMWU1MGE4NWFjYjRkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3Rh YmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC0xMjIsOSArMTIyLDggQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRDZWxs KGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYgY2VsbCwgSW52YWxpZGF0aW8KICAgICBjZWxsRGlzcGxh eUJveC5zZXRDb250ZW50Qm94V2lkdGgoY29udGVudFdpZHRoKTsKIAogICAgIEFTU0VSVChjZWxs Qm94LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKTsKLSAgICBpZiAoaXM8Q29u dGFpbmVyQm94PihjZWxsQm94KSAmJiBkb3duY2FzdDxDb250YWluZXJCb3g+KGNlbGxCb3gpLmhh c0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKSB7Ci0gICAgICAgIGF1dG8mIGZvcm1hdHRpbmdDb250 ZXh0Um9vdCA9IGRvd25jYXN0PENvbnRhaW5lckJveD4oY2VsbEJveCk7Ci0gICAgICAgIGF1dG8g Zm9ybWF0dGluZ0NvbnRleHRGb3JDZWxsQ29udGVudCA9IExheW91dENvbnRleHQ6OmNyZWF0ZUZv cm1hdHRpbmdDb250ZXh0KGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgbGF5b3V0U3RhdGUoKSk7Cisg ICAgaWYgKGNlbGxCb3guaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpIHsKKyAgICAgICAgYXV0 byBmb3JtYXR0aW5nQ29udGV4dEZvckNlbGxDb250ZW50ID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRl Rm9ybWF0dGluZ0NvbnRleHQoY2VsbEJveCwgbGF5b3V0U3RhdGUoKSk7CiAgICAgICAgIGF1dG8g aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yQ2VsbENvbnRlbnQgPSBHZW9tZXRyeTo6aG9yaXpvbnRh bENvbnN0cmFpbnRzRm9ySW5GbG93KGNlbGxEaXNwbGF5Qm94KTsKICAgICAgICAgYXV0byB2ZXJ0 aWNhbENvbnN0cmFpbnRzRm9yQ2VsbENvbnRlbnQgPSBHZW9tZXRyeTo6dmVydGljYWxDb25zdHJh aW50c0ZvckluRmxvdyhjZWxsRGlzcGxheUJveCk7CiAgICAgICAgIGZvcm1hdHRpbmdDb250ZXh0 Rm9yQ2VsbENvbnRlbnQtPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGhv cml6b250YWxDb25zdHJhaW50c0ZvckNlbGxDb250ZW50LCB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9y Q2VsbENvbnRlbnQpOwpAQCAtMjE5LDcgKzIxOCw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29u dGV4dDo6ZW5zdXJlVGFibGVHcmlkKCkKICAgICAgICAgICAgIGF1dG8gY29sdW1uU3BhbkNvdW50 ID0gY29sdW1uLT5jb2x1bW5TcGFuKCk7CiAgICAgICAgICAgICBBU1NFUlQoY29sdW1uU3BhbkNv dW50ID4gMCk7CiAgICAgICAgICAgICB3aGlsZSAoY29sdW1uU3BhbkNvdW50LS0pCi0gICAgICAg ICAgICAgICAgY29sdW1ucy5hZGRDb2x1bW4oKmNvbHVtbik7CisgICAgICAgICAgICAgICAgY29s dW1ucy5hZGRDb2x1bW4oZG93bmNhc3Q8Q29udGFpbmVyQm94PigqY29sdW1uKSk7CiAgICAgICAg IH0KICAgICB9CiAKQEAgLTIzMCw3ICsyMjksNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRl eHQ6OmVuc3VyZVRhYmxlR3JpZCgpCiAgICAgICAgICAgICBBU1NFUlQocm93LT5pc1RhYmxlUm93 KCkpOwogICAgICAgICAgICAgZm9yIChhdXRvKiBjZWxsID0gZG93bmNhc3Q8Q29udGFpbmVyQm94 Pigqcm93KS5maXJzdENoaWxkKCk7IGNlbGw7IGNlbGwgPSBjZWxsLT5uZXh0U2libGluZygpKSB7 CiAgICAgICAgICAgICAgICAgQVNTRVJUKGNlbGwtPmlzVGFibGVDZWxsKCkpOwotICAgICAgICAg ICAgICAgIHRhYmxlR3JpZC5hcHBlbmRDZWxsKCpjZWxsKTsKKyAgICAgICAgICAgICAgICB0YWJs ZUdyaWQuYXBwZW5kQ2VsbChkb3duY2FzdDxDb250YWluZXJCb3g+KCpjZWxsKSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC0yNTEsNyArMjUwLDcgQEAgRm9ybWF0dGluZ0Nv bnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZWRQcmUKIAogICAgICAgICBhdXRvIGludHJpbnNpY1dpZHRoID0gZm9ybWF0dGluZ1N0 YXRlLmludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JCb3goY2VsbEJveCk7CiAgICAgICAgIGlm ICghaW50cmluc2ljV2lkdGgpIHsKLSAgICAgICAgICAgIGludHJpbnNpY1dpZHRoID0gZ2VvbWV0 cnkoKS5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yQ2VsbChkb3duY2FzdDxDb250YWluZXJC b3g+KGNlbGxCb3gpKTsKKyAgICAgICAgICAgIGludHJpbnNpY1dpZHRoID0gZ2VvbWV0cnkoKS5p bnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yQ2VsbChjZWxsQm94KTsKICAgICAgICAgICAgIGZv cm1hdHRpbmdTdGF0ZS5zZXRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yQm94KGNlbGxCb3gs ICppbnRyaW5zaWNXaWR0aCk7CiAgICAgICAgIH0KICAgICAgICAgLy8gU3Bhbm5lciBjZWxscyBw dXQgdGhlaXIgaW50cmluc2ljIHdpZHRocyBvbiB0aGUgaW5pdGlhbCBzbG90cy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmNwcAppbmRl eCAxNDg2YWI3ZjRhMDVmZmYxZjBlOGUxYzRlM2RkYzlhMjdkNGJlZGEyLi4yNDUwMjZhYzhmNzNj OGI2M2VkOGE4YWNmNGJjYTk2ZDJlY2Q1ZTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuY3BwCkBAIC0zNSw3ICszNSw3IEBAIG5h bWVzcGFjZSBMYXlvdXQgewogCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoVGFibGVHcmlk KTsKIAotVGFibGVHcmlkOjpDb2x1bW46OkNvbHVtbihjb25zdCBCb3gqIGNvbHVtbkJveCkKK1Rh YmxlR3JpZDo6Q29sdW1uOjpDb2x1bW4oY29uc3QgQ29udGFpbmVyQm94KiBjb2x1bW5Cb3gpCiAg ICAgOiBtX2xheW91dEJveChtYWtlV2Vha1B0cihjb2x1bW5Cb3gpKQogewogfQpAQCAtNzMsNyAr NzMsNyBAQCBib29sIFRhYmxlR3JpZDo6Q29sdW1uOjppc0ZpeGVkV2lkdGgoKSBjb25zdAogICAg IHJldHVybiBoYXNGaXhlZFdpZHRoQ2VsbCgpIHx8IChib3goKSAmJiBib3goKS0+Y29sdW1uV2lk dGgoKSk7CiB9CiAKLXZvaWQgVGFibGVHcmlkOjpDb2x1bW5zOjphZGRDb2x1bW4oY29uc3QgQm94 JiBjb2x1bW5Cb3gpCit2b2lkIFRhYmxlR3JpZDo6Q29sdW1uczo6YWRkQ29sdW1uKGNvbnN0IENv bnRhaW5lckJveCYgY29sdW1uQm94KQogewogICAgIG1fY29sdW1uTGlzdC5hcHBlbmQoeyAmY29s dW1uQm94IH0pOwogfQpAQCAtODMsMTcgKzgzLDE3IEBAIHZvaWQgVGFibGVHcmlkOjpDb2x1bW5z OjphZGRBbm9ueW1vdXNDb2x1bW4oKQogICAgIG1fY29sdW1uTGlzdC5hcHBlbmQoeyBudWxscHRy IH0pOwogfQogCi12b2lkIFRhYmxlR3JpZDo6Um93czo6YWRkUm93KGNvbnN0IEJveCYgcm93Qm94 KQordm9pZCBUYWJsZUdyaWQ6OlJvd3M6OmFkZFJvdyhjb25zdCBDb250YWluZXJCb3gmIHJvd0Jv eCkKIHsKICAgICBtX3Jvd0xpc3QuYXBwZW5kKHsgcm93Qm94IH0pOwogfQogCi1UYWJsZUdyaWQ6 OlJvdzo6Um93KGNvbnN0IEJveCYgcm93Qm94KQorVGFibGVHcmlkOjpSb3c6OlJvdyhjb25zdCBD b250YWluZXJCb3gmIHJvd0JveCkKICAgICA6IG1fbGF5b3V0Qm94KG1ha2VXZWFrUHRyKHJvd0Jv eCkpCiB7CiB9CiAKLVRhYmxlR3JpZDo6Q2VsbDo6Q2VsbChjb25zdCBCb3gmIGNlbGxCb3gsIFNs b3RQb3NpdGlvbiBwb3NpdGlvbiwgQ2VsbFNwYW4gc3BhbikKK1RhYmxlR3JpZDo6Q2VsbDo6Q2Vs bChjb25zdCBDb250YWluZXJCb3gmIGNlbGxCb3gsIFNsb3RQb3NpdGlvbiBwb3NpdGlvbiwgQ2Vs bFNwYW4gc3BhbikKICAgICA6IG1fbGF5b3V0Qm94KG1ha2VXZWFrUHRyKGNlbGxCb3gpKQogICAg ICwgbV9wb3NpdGlvbihwb3NpdGlvbikKICAgICAsIG1fc3BhbihzcGFuKQpAQCAtMTIxLDcgKzEy MSw3IEBAIFRhYmxlR3JpZDo6U2xvdCogVGFibGVHcmlkOjpzbG90KFNsb3RQb3NpdGlvbiBwb3Np dGlvbikKICAgICByZXR1cm4gbV9zbG90TWFwLmdldChwb3NpdGlvbik7CiB9CiAKLXZvaWQgVGFi bGVHcmlkOjphcHBlbmRDZWxsKGNvbnN0IEJveCYgY2VsbEJveCkKK3ZvaWQgVGFibGVHcmlkOjph cHBlbmRDZWxsKGNvbnN0IENvbnRhaW5lckJveCYgY2VsbEJveCkKIHsKICAgICBhdXRvIHJvd1Nw YW4gPSBjZWxsQm94LnJvd1NwYW4oKTsKICAgICBhdXRvIGNvbHVtblNwYW4gPSBjZWxsQm94LmNv bHVtblNwYW4oKTsKQEAgLTE3MiwxMyArMTcyLDEzIEBAIHZvaWQgVGFibGVHcmlkOjphcHBlbmRD ZWxsKGNvbnN0IEJveCYgY2VsbEJveCkKICAgICBtX2NlbGxzLmFkZChXVEZNb3ZlKGNlbGwpKTsK IH0KIAotdm9pZCBUYWJsZUdyaWQ6Omluc2VydENlbGwoY29uc3QgQm94JiBjZWxsQm94LCBjb25z dCBCb3gmIGJlZm9yZSkKK3ZvaWQgVGFibGVHcmlkOjppbnNlcnRDZWxsKGNvbnN0IENvbnRhaW5l ckJveCYgY2VsbEJveCwgY29uc3QgQ29udGFpbmVyQm94JiBiZWZvcmUpCiB7CiAgICAgVU5VU0VE X1BBUkFNKGNlbGxCb3gpOwogICAgIFVOVVNFRF9QQVJBTShiZWZvcmUpOwogfQogCi12b2lkIFRh YmxlR3JpZDo6cmVtb3ZlQ2VsbChjb25zdCBCb3gmIGNlbGxCb3gpCit2b2lkIFRhYmxlR3JpZDo6 cmVtb3ZlQ2VsbChjb25zdCBDb250YWluZXJCb3gmIGNlbGxCb3gpCiB7CiAgICAgVU5VU0VEX1BB UkFNKGNlbGxCb3gpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxl Zm9ybWF0dGluZy9UYWJsZUdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1h dHRpbmcvVGFibGVHcmlkLmgKaW5kZXggOWM5YzMwYTRjYjg4ODUzYzI5YTg5MzM0NjcwNjRjNTMx NDJhYjk0ZC4uM2U3MzcyMDQ1NDJjNDM4NWMwOTYwMDNhNzg5NGU2NjJhMzEyYzI0YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5oCkBA IC0zOCwxNSArMzgsMTYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQg ewogY2xhc3MgQm94OworY2xhc3MgQ29udGFpbmVyQm94OwogCiBjbGFzcyBUYWJsZUdyaWQgewog ICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoVGFibGVHcmlkKTsKIHB1YmxpYzoKICAgICBUYWJs ZUdyaWQoKTsKIAotICAgIHZvaWQgYXBwZW5kQ2VsbChjb25zdCBCb3gmKTsKLSAgICB2b2lkIGlu c2VydENlbGwoY29uc3QgQm94JiwgY29uc3QgQm94JiBiZWZvcmUpOwotICAgIHZvaWQgcmVtb3Zl Q2VsbChjb25zdCBCb3gmKTsKKyAgICB2b2lkIGFwcGVuZENlbGwoY29uc3QgQ29udGFpbmVyQm94 Jik7CisgICAgdm9pZCBpbnNlcnRDZWxsKGNvbnN0IENvbnRhaW5lckJveCYsIGNvbnN0IENvbnRh aW5lckJveCYgYmVmb3JlKTsKKyAgICB2b2lkIHJlbW92ZUNlbGwoY29uc3QgQ29udGFpbmVyQm94 Jik7CiAKICAgICB2b2lkIHNldEhvcml6b250YWxTcGFjaW5nKExheW91dFVuaXQgaG9yaXpvbnRh bFNwYWNpbmcpIHsgbV9ob3Jpem9udGFsU3BhY2luZyA9IGhvcml6b250YWxTcGFjaW5nOyB9CiAg ICAgTGF5b3V0VW5pdCBob3Jpem9udGFsU3BhY2luZygpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpv bnRhbFNwYWNpbmc7IH0KQEAgLTYxLDcgKzYyLDcgQEAgcHVibGljOgogICAgIC8vIENvbHVtbiBy ZXByZXNlbnRzIGEgdmVydGljYWwgc2V0IG9mIHNsb3RzIGluIHRoZSBncmlkLiBBIGNvbHVtbiBo YXMgaG9yaXpvbnRhbCBwb3NpdGlvbiBhbmQgd2lkdGguCiAgICAgY2xhc3MgQ29sdW1uIHsKICAg ICBwdWJsaWM6Ci0gICAgICAgIENvbHVtbihjb25zdCBCb3gqKTsKKyAgICAgICAgQ29sdW1uKGNv bnN0IENvbnRhaW5lckJveCopOwogCiAgICAgICAgIHZvaWQgc2V0TG9naWNhbExlZnQoTGF5b3V0 VW5pdCk7CiAgICAgICAgIExheW91dFVuaXQgbG9naWNhbExlZnQoKSBjb25zdDsKQEAgLTcyLDE0 ICs3MywxNCBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNGaXhlZFdpZHRoKCkgY29uc3Q7CiAK ICAgICAgICAgdm9pZCBzZXRIYXNGaXhlZFdpZHRoQ2VsbCgpIHsgbV9oYXNGaXhlZFdpZHRoQ2Vs bCA9IHRydWU7IH0KLSAgICAgICAgY29uc3QgQm94KiBib3goKSBjb25zdCB7IHJldHVybiBtX2xh eW91dEJveC5nZXQoKTsgfQorICAgICAgICBjb25zdCBDb250YWluZXJCb3gqIGJveCgpIGNvbnN0 IHsgcmV0dXJuIG1fbGF5b3V0Qm94LmdldCgpOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBi b29sIGhhc0ZpeGVkV2lkdGhDZWxsKCkgY29uc3QgeyByZXR1cm4gbV9oYXNGaXhlZFdpZHRoQ2Vs bDsgfQogCiAgICAgICAgIExheW91dFVuaXQgbV9jb21wdXRlZExvZ2ljYWxXaWR0aDsKICAgICAg ICAgTGF5b3V0VW5pdCBtX2NvbXB1dGVkTG9naWNhbExlZnQ7Ci0gICAgICAgIFdlYWtQdHI8Y29u c3QgQm94PiBtX2xheW91dEJveDsKKyAgICAgICAgV2Vha1B0cjxjb25zdCBDb250YWluZXJCb3g+ IG1fbGF5b3V0Qm94OwogICAgICAgICBib29sIG1faGFzRml4ZWRXaWR0aENlbGwgeyBmYWxzZSB9 OwogCiAjaWYgQVNTRVJUX0VOQUJMRUQKQEAgLTk1LDcgKzk2LDcgQEAgcHVibGljOgogICAgICAg ICBjb25zdCBDb2x1bW5MaXN0JiBsaXN0KCkgY29uc3QgeyByZXR1cm4gbV9jb2x1bW5MaXN0OyB9 CiAgICAgICAgIHNpemVfdCBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9jb2x1bW5MaXN0LnNpemUo KTsgfQogCi0gICAgICAgIHZvaWQgYWRkQ29sdW1uKGNvbnN0IEJveCYpOworICAgICAgICB2b2lk IGFkZENvbHVtbihjb25zdCBDb250YWluZXJCb3gmKTsKICAgICAgICAgdm9pZCBhZGRBbm9ueW1v dXNDb2x1bW4oKTsKIAogICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsg cmV0dXJuIG1fY29sdW1uTGlzdC5sYXN0KCkubG9naWNhbFJpZ2h0KCkgLSBtX2NvbHVtbkxpc3Qu Zmlyc3QoKS5sb2dpY2FsTGVmdCgpOyB9CkBAIC0xMDYsNyArMTA3LDcgQEAgcHVibGljOgogCiAg ICAgY2xhc3MgUm93IHsKICAgICBwdWJsaWM6Ci0gICAgICAgIFJvdyhjb25zdCBCb3gmKTsKKyAg ICAgICAgUm93KGNvbnN0IENvbnRhaW5lckJveCYpOwogCiAgICAgICAgIHZvaWQgc2V0TG9naWNh bFRvcChMYXlvdXRVbml0IGxvZ2ljYWxUb3ApIHsgbV9sb2dpY2FsVG9wID0gbG9naWNhbFRvcDsg fQogICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3AoKSBjb25zdCB7IHJldHVybiBtX2xvZ2lj YWxUb3A7IH0KQEAgLTExNSwxMiArMTE2LDEyIEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBzZXRM b2dpY2FsSGVpZ2h0KExheW91dFVuaXQgbG9naWNhbEhlaWdodCkgeyBtX2xvZ2ljYWxIZWlnaHQg PSBsb2dpY2FsSGVpZ2h0OyB9CiAgICAgICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNv bnN0IHsgcmV0dXJuIG1fbG9naWNhbEhlaWdodDsgfQogCi0gICAgICAgIGNvbnN0IEJveCYgYm94 KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94LmdldCgpOyB9CisgICAgICAgIGNvbnN0IENv bnRhaW5lckJveCYgYm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94LmdldCgpOyB9CiAK ICAgICBwcml2YXRlOgogICAgICAgICBMYXlvdXRVbml0IG1fbG9naWNhbFRvcDsKICAgICAgICAg TGF5b3V0VW5pdCBtX2xvZ2ljYWxIZWlnaHQ7Ci0gICAgICAgIFdlYWtQdHI8Y29uc3QgQm94PiBt X2xheW91dEJveDsKKyAgICAgICAgV2Vha1B0cjxjb25zdCBDb250YWluZXJCb3g+IG1fbGF5b3V0 Qm94OwogICAgIH07CiAKICAgICBjbGFzcyBSb3dzIHsKQEAgLTEyOSw3ICsxMzAsNyBAQCBwdWJs aWM6CiAgICAgICAgIFJvd0xpc3QmIGxpc3QoKSB7IHJldHVybiBtX3Jvd0xpc3Q7IH0KICAgICAg ICAgY29uc3QgUm93TGlzdCYgcm93TGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1fcm93TGlzdDsgfQog Ci0gICAgICAgIHZvaWQgYWRkUm93KGNvbnN0IEJveCYpOworICAgICAgICB2b2lkIGFkZFJvdyhj b25zdCBDb250YWluZXJCb3gmKTsKIAogICAgICAgICBzaXplX3Qgc2l6ZSgpIGNvbnN0IHsgcmV0 dXJuIG1fcm93TGlzdC5zaXplKCk7IH0KIApAQCAtMTQxLDcgKzE0Miw3IEBAIHB1YmxpYzoKICAg ICBjbGFzcyBDZWxsIDogcHVibGljIENhbk1ha2VXZWFrUHRyPENlbGw+IHsKICAgICAgICAgV1RG X01BS0VfSVNPX0FMTE9DQVRFRF9JTkxJTkUoQ2VsbCk7CiAgICAgcHVibGljOgotICAgICAgICBD ZWxsKGNvbnN0IEJveCYsIFNsb3RQb3NpdGlvbiwgQ2VsbFNwYW4pOworICAgICAgICBDZWxsKGNv bnN0IENvbnRhaW5lckJveCYsIFNsb3RQb3NpdGlvbiwgQ2VsbFNwYW4pOwogCiAgICAgICAgIHNp emVfdCBzdGFydENvbHVtbigpIGNvbnN0IHsgcmV0dXJuIG1fcG9zaXRpb24uY29sdW1uOyB9CiAg ICAgICAgIHNpemVfdCBlbmRDb2x1bW4oKSBjb25zdCB7IHJldHVybiBtX3Bvc2l0aW9uLmNvbHVt biArIG1fc3Bhbi5jb2x1bW47IH0KQEAgLTE1NywxMCArMTU4LDEwIEBAIHB1YmxpYzoKIAogICAg ICAgICBib29sIGlzRml4ZWRXaWR0aCgpIGNvbnN0OwogCi0gICAgICAgIGNvbnN0IEJveCYgYm94 KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94LmdldCgpOyB9CisgICAgICAgIGNvbnN0IENv bnRhaW5lckJveCYgYm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94LmdldCgpOyB9CiAK ICAgICBwcml2YXRlOgotICAgICAgICBXZWFrUHRyPGNvbnN0IEJveD4gbV9sYXlvdXRCb3g7Cisg ICAgICAgIFdlYWtQdHI8Y29uc3QgQ29udGFpbmVyQm94PiBtX2xheW91dEJveDsKICAgICAgICAg U2xvdFBvc2l0aW9uIG1fcG9zaXRpb247CiAgICAgICAgIENlbGxTcGFuIG1fc3BhbjsKICAgICB9 Owo= 396229 2020-04-12 10:32:34 -0700 2020-04-12 10:53:42 -0700 Patch bug-210402-20200412103233.patch text/plain 10832 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5OTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTAzMGQ4YmVhNDIwNmYy ZGM4M2RiYWE1Mzc2NGY3NmQ3YTlkN2I5YS4uNDJhOWQwN2QzN2NkM2ExZmZiMDNlZWM4MThiZjE5 YmViOGUwNDFjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA0LTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBDb2x1bW4s IFJvdyBhbmQgQ2VsbCBib3hlcyBhcmUgYWx3YXlzIENvbnRhaW5lckJveGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTA0MDIKKworICAgICAgICBS ZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBUaGVzZSBib3hlcyBhcmUgYWx3 YXlzIENvbnRhaW5lckJveCB0eXBlcy4KKworICAgICAgICAqIGxheW91dC90YWJsZWZvcm1hdHRp bmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OlRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dENlbGwpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjplbnN1cmVUYWJsZUdyaWQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZFByZWZl cnJlZFdpZHRoRm9yQ29sdW1ucyk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9U YWJsZUdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OkNvbHVt bjo6Q29sdW1uKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVHcmlkOjpDb2x1bW5z OjphZGRDb2x1bW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OlJvd3M6 OmFkZFJvdyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxlR3JpZDo6Um93OjpSb3cp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OkNlbGw6OkNlbGwpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OmFwcGVuZENlbGwpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6Omluc2VydENlbGwpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OnJlbW92ZUNlbGwpOgorICAgICAgICAqIGxheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVHcmlkLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxl R3JpZDo6Q29sdW1uOjpib3ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJs ZUdyaWQ6OlJvdzo6Ym94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVH cmlkOjpDZWxsOjpib3ggY29uc3QpOgorCiAyMDIwLTA0LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3VwcG9ydCBmb3IgZml4ZWQg d2lkdGggY29sdW1ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9y bWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNWZlZDQ2 MmY1NjNmNjAyOGI4ODAxMTJlZjRiNGEwZDFiY2U5NjczNy4uYzc0NmY1OWY4N2RkNDdlMjQ0OGY0 Mjg1ZTllMWU1MGE4NWFjYjRkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3Rh YmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC0xMjIsOSArMTIyLDggQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRDZWxs KGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYgY2VsbCwgSW52YWxpZGF0aW8KICAgICBjZWxsRGlzcGxh eUJveC5zZXRDb250ZW50Qm94V2lkdGgoY29udGVudFdpZHRoKTsKIAogICAgIEFTU0VSVChjZWxs Qm94LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKTsKLSAgICBpZiAoaXM8Q29u dGFpbmVyQm94PihjZWxsQm94KSAmJiBkb3duY2FzdDxDb250YWluZXJCb3g+KGNlbGxCb3gpLmhh c0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKSB7Ci0gICAgICAgIGF1dG8mIGZvcm1hdHRpbmdDb250 ZXh0Um9vdCA9IGRvd25jYXN0PENvbnRhaW5lckJveD4oY2VsbEJveCk7Ci0gICAgICAgIGF1dG8g Zm9ybWF0dGluZ0NvbnRleHRGb3JDZWxsQ29udGVudCA9IExheW91dENvbnRleHQ6OmNyZWF0ZUZv cm1hdHRpbmdDb250ZXh0KGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgbGF5b3V0U3RhdGUoKSk7Cisg ICAgaWYgKGNlbGxCb3guaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpIHsKKyAgICAgICAgYXV0 byBmb3JtYXR0aW5nQ29udGV4dEZvckNlbGxDb250ZW50ID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRl Rm9ybWF0dGluZ0NvbnRleHQoY2VsbEJveCwgbGF5b3V0U3RhdGUoKSk7CiAgICAgICAgIGF1dG8g aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yQ2VsbENvbnRlbnQgPSBHZW9tZXRyeTo6aG9yaXpvbnRh bENvbnN0cmFpbnRzRm9ySW5GbG93KGNlbGxEaXNwbGF5Qm94KTsKICAgICAgICAgYXV0byB2ZXJ0 aWNhbENvbnN0cmFpbnRzRm9yQ2VsbENvbnRlbnQgPSBHZW9tZXRyeTo6dmVydGljYWxDb25zdHJh aW50c0ZvckluRmxvdyhjZWxsRGlzcGxheUJveCk7CiAgICAgICAgIGZvcm1hdHRpbmdDb250ZXh0 Rm9yQ2VsbENvbnRlbnQtPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGhv cml6b250YWxDb25zdHJhaW50c0ZvckNlbGxDb250ZW50LCB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9y Q2VsbENvbnRlbnQpOwpAQCAtMjE5LDcgKzIxOCw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29u dGV4dDo6ZW5zdXJlVGFibGVHcmlkKCkKICAgICAgICAgICAgIGF1dG8gY29sdW1uU3BhbkNvdW50 ID0gY29sdW1uLT5jb2x1bW5TcGFuKCk7CiAgICAgICAgICAgICBBU1NFUlQoY29sdW1uU3BhbkNv dW50ID4gMCk7CiAgICAgICAgICAgICB3aGlsZSAoY29sdW1uU3BhbkNvdW50LS0pCi0gICAgICAg ICAgICAgICAgY29sdW1ucy5hZGRDb2x1bW4oKmNvbHVtbik7CisgICAgICAgICAgICAgICAgY29s dW1ucy5hZGRDb2x1bW4oZG93bmNhc3Q8Q29udGFpbmVyQm94PigqY29sdW1uKSk7CiAgICAgICAg IH0KICAgICB9CiAKQEAgLTIzMCw3ICsyMjksNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRl eHQ6OmVuc3VyZVRhYmxlR3JpZCgpCiAgICAgICAgICAgICBBU1NFUlQocm93LT5pc1RhYmxlUm93 KCkpOwogICAgICAgICAgICAgZm9yIChhdXRvKiBjZWxsID0gZG93bmNhc3Q8Q29udGFpbmVyQm94 Pigqcm93KS5maXJzdENoaWxkKCk7IGNlbGw7IGNlbGwgPSBjZWxsLT5uZXh0U2libGluZygpKSB7 CiAgICAgICAgICAgICAgICAgQVNTRVJUKGNlbGwtPmlzVGFibGVDZWxsKCkpOwotICAgICAgICAg ICAgICAgIHRhYmxlR3JpZC5hcHBlbmRDZWxsKCpjZWxsKTsKKyAgICAgICAgICAgICAgICB0YWJs ZUdyaWQuYXBwZW5kQ2VsbChkb3duY2FzdDxDb250YWluZXJCb3g+KCpjZWxsKSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC0yNTEsNyArMjUwLDcgQEAgRm9ybWF0dGluZ0Nv bnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZWRQcmUKIAogICAgICAgICBhdXRvIGludHJpbnNpY1dpZHRoID0gZm9ybWF0dGluZ1N0 YXRlLmludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JCb3goY2VsbEJveCk7CiAgICAgICAgIGlm ICghaW50cmluc2ljV2lkdGgpIHsKLSAgICAgICAgICAgIGludHJpbnNpY1dpZHRoID0gZ2VvbWV0 cnkoKS5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yQ2VsbChkb3duY2FzdDxDb250YWluZXJC b3g+KGNlbGxCb3gpKTsKKyAgICAgICAgICAgIGludHJpbnNpY1dpZHRoID0gZ2VvbWV0cnkoKS5p bnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yQ2VsbChjZWxsQm94KTsKICAgICAgICAgICAgIGZv cm1hdHRpbmdTdGF0ZS5zZXRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yQm94KGNlbGxCb3gs ICppbnRyaW5zaWNXaWR0aCk7CiAgICAgICAgIH0KICAgICAgICAgLy8gU3Bhbm5lciBjZWxscyBw dXQgdGhlaXIgaW50cmluc2ljIHdpZHRocyBvbiB0aGUgaW5pdGlhbCBzbG90cy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmNwcAppbmRl eCA1YzI3ODA2M2QzMjBkZDI0YjdkYTFkNGVjMDBlNGU2M2ZhZGJjZTQ0Li43MWZjNjk4MjQxM2Zh MDBiNGY3OWUyZGE5OTZlMjQzOGIxZmQzYmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuY3BwCkBAIC0zNSw3ICszNSw3IEBAIG5h bWVzcGFjZSBMYXlvdXQgewogCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoVGFibGVHcmlk KTsKIAotVGFibGVHcmlkOjpDb2x1bW46OkNvbHVtbihjb25zdCBCb3gqIGNvbHVtbkJveCkKK1Rh YmxlR3JpZDo6Q29sdW1uOjpDb2x1bW4oY29uc3QgQ29udGFpbmVyQm94KiBjb2x1bW5Cb3gpCiAg ICAgOiBtX2xheW91dEJveChtYWtlV2Vha1B0cihjb2x1bW5Cb3gpKQogewogfQpAQCAtNzMsNyAr NzMsNyBAQCBib29sIFRhYmxlR3JpZDo6Q29sdW1uOjppc0ZpeGVkV2lkdGgoKSBjb25zdAogICAg IHJldHVybiBoYXNGaXhlZFdpZHRoQ2VsbCgpIHx8IChib3goKSAmJiBib3goKS0+Y29sdW1uV2lk dGgoKSk7CiB9CiAKLXZvaWQgVGFibGVHcmlkOjpDb2x1bW5zOjphZGRDb2x1bW4oY29uc3QgQm94 JiBjb2x1bW5Cb3gpCit2b2lkIFRhYmxlR3JpZDo6Q29sdW1uczo6YWRkQ29sdW1uKGNvbnN0IENv bnRhaW5lckJveCYgY29sdW1uQm94KQogewogICAgIG1fY29sdW1uTGlzdC5hcHBlbmQoeyAmY29s dW1uQm94IH0pOwogfQpAQCAtODMsMTcgKzgzLDE3IEBAIHZvaWQgVGFibGVHcmlkOjpDb2x1bW5z OjphZGRBbm9ueW1vdXNDb2x1bW4oKQogICAgIG1fY29sdW1uTGlzdC5hcHBlbmQoeyBudWxscHRy IH0pOwogfQogCi12b2lkIFRhYmxlR3JpZDo6Um93czo6YWRkUm93KGNvbnN0IEJveCYgcm93Qm94 KQordm9pZCBUYWJsZUdyaWQ6OlJvd3M6OmFkZFJvdyhjb25zdCBDb250YWluZXJCb3gmIHJvd0Jv eCkKIHsKICAgICBtX3Jvd0xpc3QuYXBwZW5kKHsgcm93Qm94IH0pOwogfQogCi1UYWJsZUdyaWQ6 OlJvdzo6Um93KGNvbnN0IEJveCYgcm93Qm94KQorVGFibGVHcmlkOjpSb3c6OlJvdyhjb25zdCBD b250YWluZXJCb3gmIHJvd0JveCkKICAgICA6IG1fbGF5b3V0Qm94KG1ha2VXZWFrUHRyKHJvd0Jv eCkpCiB7CiB9CiAKLVRhYmxlR3JpZDo6Q2VsbDo6Q2VsbChjb25zdCBCb3gmIGNlbGxCb3gsIFNs b3RQb3NpdGlvbiBwb3NpdGlvbiwgQ2VsbFNwYW4gc3BhbikKK1RhYmxlR3JpZDo6Q2VsbDo6Q2Vs bChjb25zdCBDb250YWluZXJCb3gmIGNlbGxCb3gsIFNsb3RQb3NpdGlvbiBwb3NpdGlvbiwgQ2Vs bFNwYW4gc3BhbikKICAgICA6IG1fbGF5b3V0Qm94KG1ha2VXZWFrUHRyKGNlbGxCb3gpKQogICAg ICwgbV9wb3NpdGlvbihwb3NpdGlvbikKICAgICAsIG1fc3BhbihzcGFuKQpAQCAtMTIxLDcgKzEy MSw3IEBAIFRhYmxlR3JpZDo6U2xvdCogVGFibGVHcmlkOjpzbG90KFNsb3RQb3NpdGlvbiBwb3Np dGlvbikKICAgICByZXR1cm4gbV9zbG90TWFwLmdldChwb3NpdGlvbik7CiB9CiAKLXZvaWQgVGFi bGVHcmlkOjphcHBlbmRDZWxsKGNvbnN0IEJveCYgY2VsbEJveCkKK3ZvaWQgVGFibGVHcmlkOjph cHBlbmRDZWxsKGNvbnN0IENvbnRhaW5lckJveCYgY2VsbEJveCkKIHsKICAgICBhdXRvIHJvd1Nw YW4gPSBjZWxsQm94LnJvd1NwYW4oKTsKICAgICBhdXRvIGNvbHVtblNwYW4gPSBjZWxsQm94LmNv bHVtblNwYW4oKTsKQEAgLTE3MiwxMyArMTcyLDEzIEBAIHZvaWQgVGFibGVHcmlkOjphcHBlbmRD ZWxsKGNvbnN0IEJveCYgY2VsbEJveCkKICAgICBtX2NlbGxzLmFkZChXVEZNb3ZlKGNlbGwpKTsK IH0KIAotdm9pZCBUYWJsZUdyaWQ6Omluc2VydENlbGwoY29uc3QgQm94JiBjZWxsQm94LCBjb25z dCBCb3gmIGJlZm9yZSkKK3ZvaWQgVGFibGVHcmlkOjppbnNlcnRDZWxsKGNvbnN0IENvbnRhaW5l ckJveCYgY2VsbEJveCwgY29uc3QgQ29udGFpbmVyQm94JiBiZWZvcmUpCiB7CiAgICAgVU5VU0VE X1BBUkFNKGNlbGxCb3gpOwogICAgIFVOVVNFRF9QQVJBTShiZWZvcmUpOwogfQogCi12b2lkIFRh YmxlR3JpZDo6cmVtb3ZlQ2VsbChjb25zdCBCb3gmIGNlbGxCb3gpCit2b2lkIFRhYmxlR3JpZDo6 cmVtb3ZlQ2VsbChjb25zdCBDb250YWluZXJCb3gmIGNlbGxCb3gpCiB7CiAgICAgVU5VU0VEX1BB UkFNKGNlbGxCb3gpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxl Zm9ybWF0dGluZy9UYWJsZUdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1h dHRpbmcvVGFibGVHcmlkLmgKaW5kZXggOWM5YzMwYTRjYjg4ODUzYzI5YTg5MzM0NjcwNjRjNTMx NDJhYjk0ZC4uM2U3MzcyMDQ1NDJjNDM4NWMwOTYwMDNhNzg5NGU2NjJhMzEyYzI0YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5oCkBA IC0zOCwxNSArMzgsMTYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQg ewogY2xhc3MgQm94OworY2xhc3MgQ29udGFpbmVyQm94OwogCiBjbGFzcyBUYWJsZUdyaWQgewog ICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoVGFibGVHcmlkKTsKIHB1YmxpYzoKICAgICBUYWJs ZUdyaWQoKTsKIAotICAgIHZvaWQgYXBwZW5kQ2VsbChjb25zdCBCb3gmKTsKLSAgICB2b2lkIGlu c2VydENlbGwoY29uc3QgQm94JiwgY29uc3QgQm94JiBiZWZvcmUpOwotICAgIHZvaWQgcmVtb3Zl Q2VsbChjb25zdCBCb3gmKTsKKyAgICB2b2lkIGFwcGVuZENlbGwoY29uc3QgQ29udGFpbmVyQm94 Jik7CisgICAgdm9pZCBpbnNlcnRDZWxsKGNvbnN0IENvbnRhaW5lckJveCYsIGNvbnN0IENvbnRh aW5lckJveCYgYmVmb3JlKTsKKyAgICB2b2lkIHJlbW92ZUNlbGwoY29uc3QgQ29udGFpbmVyQm94 Jik7CiAKICAgICB2b2lkIHNldEhvcml6b250YWxTcGFjaW5nKExheW91dFVuaXQgaG9yaXpvbnRh bFNwYWNpbmcpIHsgbV9ob3Jpem9udGFsU3BhY2luZyA9IGhvcml6b250YWxTcGFjaW5nOyB9CiAg ICAgTGF5b3V0VW5pdCBob3Jpem9udGFsU3BhY2luZygpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpv bnRhbFNwYWNpbmc7IH0KQEAgLTYxLDcgKzYyLDcgQEAgcHVibGljOgogICAgIC8vIENvbHVtbiBy ZXByZXNlbnRzIGEgdmVydGljYWwgc2V0IG9mIHNsb3RzIGluIHRoZSBncmlkLiBBIGNvbHVtbiBo YXMgaG9yaXpvbnRhbCBwb3NpdGlvbiBhbmQgd2lkdGguCiAgICAgY2xhc3MgQ29sdW1uIHsKICAg ICBwdWJsaWM6Ci0gICAgICAgIENvbHVtbihjb25zdCBCb3gqKTsKKyAgICAgICAgQ29sdW1uKGNv bnN0IENvbnRhaW5lckJveCopOwogCiAgICAgICAgIHZvaWQgc2V0TG9naWNhbExlZnQoTGF5b3V0 VW5pdCk7CiAgICAgICAgIExheW91dFVuaXQgbG9naWNhbExlZnQoKSBjb25zdDsKQEAgLTcyLDE0 ICs3MywxNCBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNGaXhlZFdpZHRoKCkgY29uc3Q7CiAK ICAgICAgICAgdm9pZCBzZXRIYXNGaXhlZFdpZHRoQ2VsbCgpIHsgbV9oYXNGaXhlZFdpZHRoQ2Vs bCA9IHRydWU7IH0KLSAgICAgICAgY29uc3QgQm94KiBib3goKSBjb25zdCB7IHJldHVybiBtX2xh eW91dEJveC5nZXQoKTsgfQorICAgICAgICBjb25zdCBDb250YWluZXJCb3gqIGJveCgpIGNvbnN0 IHsgcmV0dXJuIG1fbGF5b3V0Qm94LmdldCgpOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBi b29sIGhhc0ZpeGVkV2lkdGhDZWxsKCkgY29uc3QgeyByZXR1cm4gbV9oYXNGaXhlZFdpZHRoQ2Vs bDsgfQogCiAgICAgICAgIExheW91dFVuaXQgbV9jb21wdXRlZExvZ2ljYWxXaWR0aDsKICAgICAg ICAgTGF5b3V0VW5pdCBtX2NvbXB1dGVkTG9naWNhbExlZnQ7Ci0gICAgICAgIFdlYWtQdHI8Y29u c3QgQm94PiBtX2xheW91dEJveDsKKyAgICAgICAgV2Vha1B0cjxjb25zdCBDb250YWluZXJCb3g+ IG1fbGF5b3V0Qm94OwogICAgICAgICBib29sIG1faGFzRml4ZWRXaWR0aENlbGwgeyBmYWxzZSB9 OwogCiAjaWYgQVNTRVJUX0VOQUJMRUQKQEAgLTk1LDcgKzk2LDcgQEAgcHVibGljOgogICAgICAg ICBjb25zdCBDb2x1bW5MaXN0JiBsaXN0KCkgY29uc3QgeyByZXR1cm4gbV9jb2x1bW5MaXN0OyB9 CiAgICAgICAgIHNpemVfdCBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9jb2x1bW5MaXN0LnNpemUo KTsgfQogCi0gICAgICAgIHZvaWQgYWRkQ29sdW1uKGNvbnN0IEJveCYpOworICAgICAgICB2b2lk IGFkZENvbHVtbihjb25zdCBDb250YWluZXJCb3gmKTsKICAgICAgICAgdm9pZCBhZGRBbm9ueW1v dXNDb2x1bW4oKTsKIAogICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsg cmV0dXJuIG1fY29sdW1uTGlzdC5sYXN0KCkubG9naWNhbFJpZ2h0KCkgLSBtX2NvbHVtbkxpc3Qu Zmlyc3QoKS5sb2dpY2FsTGVmdCgpOyB9CkBAIC0xMDYsNyArMTA3LDcgQEAgcHVibGljOgogCiAg ICAgY2xhc3MgUm93IHsKICAgICBwdWJsaWM6Ci0gICAgICAgIFJvdyhjb25zdCBCb3gmKTsKKyAg ICAgICAgUm93KGNvbnN0IENvbnRhaW5lckJveCYpOwogCiAgICAgICAgIHZvaWQgc2V0TG9naWNh bFRvcChMYXlvdXRVbml0IGxvZ2ljYWxUb3ApIHsgbV9sb2dpY2FsVG9wID0gbG9naWNhbFRvcDsg fQogICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3AoKSBjb25zdCB7IHJldHVybiBtX2xvZ2lj YWxUb3A7IH0KQEAgLTExNSwxMiArMTE2LDEyIEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBzZXRM b2dpY2FsSGVpZ2h0KExheW91dFVuaXQgbG9naWNhbEhlaWdodCkgeyBtX2xvZ2ljYWxIZWlnaHQg PSBsb2dpY2FsSGVpZ2h0OyB9CiAgICAgICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNv bnN0IHsgcmV0dXJuIG1fbG9naWNhbEhlaWdodDsgfQogCi0gICAgICAgIGNvbnN0IEJveCYgYm94 KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94LmdldCgpOyB9CisgICAgICAgIGNvbnN0IENv bnRhaW5lckJveCYgYm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94LmdldCgpOyB9CiAK ICAgICBwcml2YXRlOgogICAgICAgICBMYXlvdXRVbml0IG1fbG9naWNhbFRvcDsKICAgICAgICAg TGF5b3V0VW5pdCBtX2xvZ2ljYWxIZWlnaHQ7Ci0gICAgICAgIFdlYWtQdHI8Y29uc3QgQm94PiBt X2xheW91dEJveDsKKyAgICAgICAgV2Vha1B0cjxjb25zdCBDb250YWluZXJCb3g+IG1fbGF5b3V0 Qm94OwogICAgIH07CiAKICAgICBjbGFzcyBSb3dzIHsKQEAgLTEyOSw3ICsxMzAsNyBAQCBwdWJs aWM6CiAgICAgICAgIFJvd0xpc3QmIGxpc3QoKSB7IHJldHVybiBtX3Jvd0xpc3Q7IH0KICAgICAg ICAgY29uc3QgUm93TGlzdCYgcm93TGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1fcm93TGlzdDsgfQog Ci0gICAgICAgIHZvaWQgYWRkUm93KGNvbnN0IEJveCYpOworICAgICAgICB2b2lkIGFkZFJvdyhj b25zdCBDb250YWluZXJCb3gmKTsKIAogICAgICAgICBzaXplX3Qgc2l6ZSgpIGNvbnN0IHsgcmV0 dXJuIG1fcm93TGlzdC5zaXplKCk7IH0KIApAQCAtMTQxLDcgKzE0Miw3IEBAIHB1YmxpYzoKICAg ICBjbGFzcyBDZWxsIDogcHVibGljIENhbk1ha2VXZWFrUHRyPENlbGw+IHsKICAgICAgICAgV1RG X01BS0VfSVNPX0FMTE9DQVRFRF9JTkxJTkUoQ2VsbCk7CiAgICAgcHVibGljOgotICAgICAgICBD ZWxsKGNvbnN0IEJveCYsIFNsb3RQb3NpdGlvbiwgQ2VsbFNwYW4pOworICAgICAgICBDZWxsKGNv bnN0IENvbnRhaW5lckJveCYsIFNsb3RQb3NpdGlvbiwgQ2VsbFNwYW4pOwogCiAgICAgICAgIHNp emVfdCBzdGFydENvbHVtbigpIGNvbnN0IHsgcmV0dXJuIG1fcG9zaXRpb24uY29sdW1uOyB9CiAg ICAgICAgIHNpemVfdCBlbmRDb2x1bW4oKSBjb25zdCB7IHJldHVybiBtX3Bvc2l0aW9uLmNvbHVt biArIG1fc3Bhbi5jb2x1bW47IH0KQEAgLTE1NywxMCArMTU4LDEwIEBAIHB1YmxpYzoKIAogICAg ICAgICBib29sIGlzRml4ZWRXaWR0aCgpIGNvbnN0OwogCi0gICAgICAgIGNvbnN0IEJveCYgYm94 KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94LmdldCgpOyB9CisgICAgICAgIGNvbnN0IENv bnRhaW5lckJveCYgYm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94LmdldCgpOyB9CiAK ICAgICBwcml2YXRlOgotICAgICAgICBXZWFrUHRyPGNvbnN0IEJveD4gbV9sYXlvdXRCb3g7Cisg ICAgICAgIFdlYWtQdHI8Y29uc3QgQ29udGFpbmVyQm94PiBtX2xheW91dEJveDsKICAgICAgICAg U2xvdFBvc2l0aW9uIG1fcG9zaXRpb247CiAgICAgICAgIENlbGxTcGFuIG1fc3BhbjsKICAgICB9 Owo=