206121 2020-01-10 19:48:37 -0800 [LFC][BFC] BlockFormattingContext::computeEstimatedVerticalPositionForAncestors should take ConstraintsPair<HorizontalConstraints> 2020-01-11 16:05:56 -0800 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 1605474 0 zalan 2020-01-10 19:48:37 -0800 ssia 1605475 1 webkit-bug-importer 2020-01-10 19:48:58 -0800 <rdar://problem/58499492> 1605476 2 387416 zalan 2020-01-10 19:56:24 -0800 Created attachment 387416 Patch 1605562 3 387444 zalan 2020-01-11 12:53:53 -0800 Created attachment 387444 Patch 1605574 4 zalan 2020-01-11 16:05:56 -0800 Committed r254404: <https://trac.webkit.org/changeset/254404> 387416 2020-01-10 19:56:24 -0800 2020-01-11 12:53:51 -0800 Patch bug-206121-20200110195624.patch text/plain 11395 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0Mjk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODNhZDg2NzhkMDZjYjdi ZGM1MWYyZGE5NGE3MTAwOTE4MGZmMmIxMC4uOTAwYzRkOWFiMGU4NzAyNzVkZThiNTc0ZjczMWI1 MWJjY2JmZWZjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAxLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckFuY2Vz dG9ycyBzaG91bGQgdGFrZSBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MTIxCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODQ5OTQ5Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHByZXZlbnRzIGNvbXB1dGVFc3RpbWF0ZWRW ZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzIGZyb20gcmVhZGluZyBnZW9tZXRyeSBvdXRzaWRl IG9mIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQuIAorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZVN0YXRpY1ZlcnRpY2FsUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpC bG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRpb24pOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVk VmVydGljYWxQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3Jz KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JGb3JtYXR0aW5nUm9vdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0 ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yRmxvYXRDbGVhcik6CisgICAgICAgICogbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisKIDIwMjAtMDEtMTAgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBJbnRyb2R1Y2UgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6Q29uc3RyYWludHNQYWlyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0LmNwcAppbmRleCAwYjRiMWYxOTA0ZWJjYmQyZWI0YzFmYjJiZWJlNmU5NTM3MmI1MTli Li5lZDAyYTUzNmE5MGZmZmM3ZGEzNmNiYzZhNzljNDk1ZjAxM2VhZTE3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRl eHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTIwNyw3ICsyMDcsNyBAQCB2b2lkIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGxheW91 dEJveCwgRgogICAgIGF1dG8gYWRqdXN0ZWRIb3Jpem9udGFsQ29uc3RyYWludHMgPSBDb25zdHJh aW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiB7IGhvcml6b250YWxDb25zdHJhaW50cy5y b290KCksIHsgKCpob3Jpem9udGFsQ29uc3RyYWludHMpLmxvZ2ljYWxMZWZ0LCBhdmFpbGFibGVX aWR0aCB9IH07CiAKICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gsICphZGp1 c3RlZEhvcml6b250YWxDb25zdHJhaW50cyk7Ci0gICAgY29tcHV0ZVN0YXRpY1ZlcnRpY2FsUG9z aXRpb24oZmxvYXRpbmdDb250ZXh0LCBsYXlvdXRCb3gsIHZlcnRpY2FsQ29uc3RyYWludHMpOwor ICAgIGNvbXB1dGVTdGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0 Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOwogICAgIGNv bXB1dGVXaWR0aEFuZE1hcmdpbihsYXlvdXRCb3gsIGFkanVzdGVkSG9yaXpvbnRhbENvbnN0cmFp bnRzKTsKICAgICBjb21wdXRlU3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uKGxheW91dEJveCwgYWRq dXN0ZWRIb3Jpem9udGFsQ29uc3RyYWludHMpOwogCkBAIC0yNDgsMTMgKzI0OCwxMyBAQCB2b2lk IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OnBsYWNlSW5GbG93UG9zaXRpb25lZENoaWxkcmVuKGNv bnN0IEJveCYgbGF5b3V0Qm94LAogICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4 dExheW91dCwgc3RyZWFtIDw8ICJFbmQ6IG1vdmUgaW4tZmxvdyBwb3NpdGlvbmVkIGNoaWxkcmVu IC0+IHBhcmVudDogIiA8PCAmbGF5b3V0Qm94KTsKIH0KIAotdm9pZCBCbG9ja0Zvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlU3RhdGljVmVydGljYWxQb3NpdGlvbihjb25zdCBGbG9hdGluZ0NvbnRl eHQmIGZsb2F0aW5nQ29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IENvbnN0cmFp bnRzUGFpcjxWZXJ0aWNhbENvbnN0cmFpbnRzPiYgdmVydGljYWxDb25zdHJhaW50cykKK3ZvaWQg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRpY1ZlcnRpY2FsUG9zaXRpb24oY29u c3QgRmxvYXRpbmdDb250ZXh0JiBmbG9hdGluZ0NvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYgaG9yaXpvbnRh bENvbnN0cmFpbnRzLCBjb25zdCBDb25zdHJhaW50c1BhaXI8VmVydGljYWxDb25zdHJhaW50cz4m IHZlcnRpY2FsQ29uc3RyYWludHMpCiB7CiAgICAgZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJv eChsYXlvdXRCb3gpLnNldFRvcChnZW9tZXRyeSgpLnN0YXRpY1ZlcnRpY2FsUG9zaXRpb24obGF5 b3V0Qm94LCAqdmVydGljYWxDb25zdHJhaW50cykpOwogICAgIGlmIChsYXlvdXRCb3guaGFzRmxv YXRDbGVhcigpKQotICAgICAgICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZs b2F0Q2xlYXIoZmxvYXRpbmdDb250ZXh0LCBsYXlvdXRCb3gpOworICAgICAgICBjb21wdXRlRXN0 aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIoZmxvYXRpbmdDb250ZXh0LCBsYXlv dXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CiAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmVz dGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkKLSAgICAgICAgY29tcHV0ZUVzdGltYXRlZFZl cnRpY2FsUG9zaXRpb25Gb3JGb3JtYXR0aW5nUm9vdChsYXlvdXRCb3gpOworICAgICAgICBjb21w dXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290KGxheW91dEJveCwg aG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKIH0KIAogdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlU3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBj b25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYgaG9yaXpvbnRhbENv bnN0cmFpbnRzKQpAQCAtMjY0LDEzICsyNjQsMTIgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlU3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uKGNvbnN0IEJveCYgbGF5b3V0Qm8K IAogdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRpb24oY29u c3QgRmxvYXRpbmdDb250ZXh0JiBmbG9hdGluZ0NvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYgaG9yaXpvbnRh bENvbnN0cmFpbnRzLCBjb25zdCBDb25zdHJhaW50c1BhaXI8VmVydGljYWxDb25zdHJhaW50cz4m IHZlcnRpY2FsQ29uc3RyYWludHMpCiB7Ci0gICAgY29tcHV0ZVN0YXRpY1ZlcnRpY2FsUG9zaXRp b24oZmxvYXRpbmdDb250ZXh0LCBsYXlvdXRCb3gsIHZlcnRpY2FsQ29uc3RyYWludHMpOworICAg IGNvbXB1dGVTdGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94 LCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOwogICAgIGNvbXB1 dGVTdGF0aWNIb3Jpem9udGFsUG9zaXRpb24obGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWlu dHMpOwogfQogCi12b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRW ZXJ0aWNhbFBvc2l0aW9uKGNvbnN0IEJveCYgbGF5b3V0Qm94KQordm9pZCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbihjb25zdCBCb3gmIGxh eW91dEJveCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jpem9udGFsQ29uc3RyYWlu dHMpCiB7Ci0gICAgYXV0byBob3Jpem9udGFsQ29uc3RyYWludHMgPSBHZW9tZXRyeTo6aG9yaXpv bnRhbENvbnN0cmFpbnRzRm9ySW5GbG93KGdlb21ldHJ5Rm9yQm94KCpsYXlvdXRCb3guY29udGFp bmluZ0Jsb2NrKCkpKTsKICAgICBhdXRvIGNvbXB1dGVkVmVydGljYWxNYXJnaW4gPSBnZW9tZXRy eSgpLmNvbXB1dGVkVmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWlu dHMpOwogICAgIGF1dG8gdXNlZE5vbkNvbGxhcHNlZE1hcmdpbiA9IFVzZWRWZXJ0aWNhbE1hcmdp bjo6Tm9uQ29sbGFwc2VkVmFsdWVzIHsgY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5iZWZvcmUudmFs dWVPcigwKSwgY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5hZnRlci52YWx1ZU9yKDApIH07CiAgICAg YXV0byBlc3RpbWF0ZWRNYXJnaW5CZWZvcmUgPSBtYXJnaW5Db2xsYXBzZSgpLmVzdGltYXRlZE1h cmdpbkJlZm9yZShsYXlvdXRCb3gsIHVzZWROb25Db2xsYXBzZWRNYXJnaW4pOwpAQCAtMjg3LDcg KzI4Niw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZFZl cnRpY2FsUG9zaXRpb24oY29uc3QgQm94JiBsYXlvdXRCCiAjZW5kaWYKIH0KIAotdm9pZCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckFu Y2VzdG9ycyhjb25zdCBCb3gmIGxheW91dEJveCkKK3ZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMoY29uc3QgQm94 JiBsYXlvdXRCb3gsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+ JiBob3Jpem9udGFsQ29uc3RyYWludHMpCiB7CiAgICAgLy8gV2Ugb25seSBuZWVkIHRvIGVzdGlt YXRlIG1hcmdpbiB0b3AgZm9yIGZsb2F0IHJlbGF0ZWQgbGF5b3V0IChmb3JtYXR0aW5nIGNvbnRl eHQgcm9vdHMgYXZvaWQgZmxvYXRzKS4KICAgICBBU1NFUlQobGF5b3V0Qm94LmlzRmxvYXRBdm9p ZGVyKCkgfHwgbGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSk7 CkBAIC0zMDUsNDAgKzMwNCw0NCBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzKGNvbnN0CiAgICAgICAgIC8v IEZJWE1FOiB3aXRoIGluY3JlbWVudGFsIGxheW91dCwgd2UgbWlnaHQgYWN0dWFsbHkgaGF2ZSBh IHZhbGlkIChub24tZXN0aW1hdGVkKSBtYXJnaW4gdG9wIGFzIHdlbGwuCiAgICAgICAgIGlmICho YXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUoKmFuY2VzdG9yKSkKICAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb24oKmFuY2VzdG9yKTsKKyAg ICAgICAgCisgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yQW5jZXN0b3IgPSBo b3Jpem9udGFsQ29uc3RyYWludHMucm9vdCgpOyAKKyAgICAgICAgaWYgKGFuY2VzdG9yLT5jb250 YWluaW5nQmxvY2soKSAhPSAmcm9vdCgpKSAKKyAgICAgICAgICAgIGhvcml6b250YWxDb25zdHJh aW50c0ZvckFuY2VzdG9yID0gR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxv dyhnZW9tZXRyeUZvckJveCgqYW5jZXN0b3ItPmNvbnRhaW5pbmdCbG9jaygpKSk7CisgICAgICAg IGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uKCphbmNlc3RvciwgaG9yaXpvbnRhbENv bnN0cmFpbnRzRm9yQW5jZXN0b3IpOwogICAgIH0KIH0KIAotdm9pZCBCbG9ja0Zvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290 KGNvbnN0IEJveCYgbGF5b3V0Qm94KQordm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290KGNvbnN0IEJveCYg bGF5b3V0Qm94LCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYg aG9yaXpvbnRhbENvbnN0cmFpbnRzKQogewogICAgIEFTU0VSVChsYXlvdXRCb3guZXN0YWJsaXNo ZXNGb3JtYXR0aW5nQ29udGV4dCgpKTsKICAgICBBU1NFUlQoIWxheW91dEJveC5oYXNGbG9hdENs ZWFyKCkpOwogCiAgICAgaWYgKGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKSB7Ci0g ICAgICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzKGxheW91 dEJveCk7CisgICAgICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0 b3JzKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uKGxheW91dEJveCk7 Ci0gICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMobGF5b3V0 Qm94KTsKKyAgICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbihsYXlvdXRCb3gsICpo b3Jpem9udGFsQ29uc3RyYWludHMpOworICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0 aW9uRm9yQW5jZXN0b3JzKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKIAogICAg IC8vIElmIHRoZSBpbmxpbmUgZm9ybWF0dGluZyByb290IGlzIGFsc28gdGhlIHJvb3QgZm9yIHRo ZSBmbG9hdHMgKGhhcHBlbnMgd2hlbiB0aGUgcm9vdCBib3ggYWxzbyBlc3RhYmxpc2hlcyBhIGJs b2NrIGZvcm1hdHRpbmcgY29udGV4dCkKICAgICAvLyB0aGUgZmxvYXRzIGFyZSBpbiB0aGUgY29v cmRpbmF0ZSBzeXN0ZW0gb2YgdGhpcyByb290LiBObyBuZWVkIHRvIGZpbmQgdGhlIGZpbmFsIHZl cnRpY2FsIHBvc2l0aW9uLgogICAgIGF1dG8gaW5saW5lQ29udGV4dEluaGVyaXRzRmxvYXRzID0g bGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHRPbmx5KCk7CiAgICAg aWYgKGlubGluZUNvbnRleHRJbmhlcml0c0Zsb2F0cykgewotICAgICAgICBjb21wdXRlRXN0aW1h dGVkVmVydGljYWxQb3NpdGlvbihsYXlvdXRCb3gpOwotICAgICAgICBjb21wdXRlRXN0aW1hdGVk VmVydGljYWxQb3NpdGlvbkZvckFuY2VzdG9ycyhsYXlvdXRCb3gpOworICAgICAgICBjb21wdXRl RXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbihsYXlvdXRCb3gsICpob3Jpem9udGFsQ29uc3RyYWlu dHMpOworICAgICAgICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckFuY2VzdG9y cyhsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CiAgICAgfQogfQogCi12b2lkIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9y RmxvYXRDbGVhcihjb25zdCBGbG9hdGluZ0NvbnRleHQmIGZsb2F0aW5nQ29udGV4dCwgY29uc3Qg Qm94JiBsYXlvdXRCb3gpCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3Rp bWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yRmxvYXRDbGVhcihjb25zdCBGbG9hdGluZ0NvbnRleHQm IGZsb2F0aW5nQ29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IENvbnN0cmFpbnRz UGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+JiBob3Jpem9udGFsQ29uc3RyYWludHMpCiB7CiAg ICAgQVNTRVJUKGxheW91dEJveC5oYXNGbG9hdENsZWFyKCkpOwogICAgIGlmIChmbG9hdGluZ0Nv bnRleHQuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAgICAgLy8gVGhlIHN0YXRpYyBwb3Np dGlvbiB3aXRoIGNsZWFyIHJlcXVpcmVzIG1hcmdpbiBlc2l0bWF0aW9uIHRvIHNlZSBpZiBjbGVh cmFuY2UgaXMgbmVlZGVkLgotICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uKGxh eW91dEJveCk7Ci0gICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3Rv cnMobGF5b3V0Qm94KTsKKyAgICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbihsYXlv dXRCb3gsICpob3Jpem9udGFsQ29uc3RyYWludHMpOworICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0 aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRz KTsKICAgICBhdXRvIHZlcnRpY2FsUG9zaXRpb25BbmRDbGVhcmFuY2UgPSBmbG9hdGluZ0NvbnRl eHQudmVydGljYWxQb3NpdGlvbldpdGhDbGVhcmFuY2UobGF5b3V0Qm94KTsKICAgICBpZiAoIXZl cnRpY2FsUG9zaXRpb25BbmRDbGVhcmFuY2UucG9zaXRpb24pIHsKICAgICAgICAgQVNTRVJUKCF2 ZXJ0aWNhbFBvc2l0aW9uQW5kQ2xlYXJhbmNlLmNsZWFyYW5jZSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5oCmluZGV4IGVkYzAwMGFlYWFiODE2MzkxY2Q5ZGE3NTJhYjU0OWNmMjYyNzJiYzUu LmMzMDc1MmE3ZmVjODJjZWJmYzQ3NzA4NTA1ZjM1OThhNjJhYWRmNjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5oCkBAIC03MSwxNSArNzEsMTUgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNv bXB1dGVIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiwgY29uc3QgQ29uc3RyYWludHNQYWlyPEhv cml6b250YWxDb25zdHJhaW50cz4mKTsKIAogICAgIHZvaWQgY29tcHV0ZVN0YXRpY0hvcml6b250 YWxQb3NpdGlvbihjb25zdCBCb3gmLCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENv bnN0cmFpbnRzPiYpOwotICAgIHZvaWQgY29tcHV0ZVN0YXRpY1ZlcnRpY2FsUG9zaXRpb24oY29u c3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3QgQm94JiwgY29uc3QgQ29uc3RyYWludHNQYWlyPFZl cnRpY2FsQ29uc3RyYWludHM+Jik7CisgICAgdm9pZCBjb21wdXRlU3RhdGljVmVydGljYWxQb3Np dGlvbihjb25zdCBGbG9hdGluZ0NvbnRleHQmLCBjb25zdCBCb3gmLCBjb25zdCBDb25zdHJhaW50 c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxWZXJ0 aWNhbENvbnN0cmFpbnRzPiYpOwogICAgIHZvaWQgY29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGNvbnN0 IEZsb2F0aW5nQ29udGV4dCYsIGNvbnN0IEJveCYsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jp em9udGFsQ29uc3RyYWludHM+JiwgY29uc3QgQ29uc3RyYWludHNQYWlyPFZlcnRpY2FsQ29uc3Ry YWludHM+Jik7CiAgICAgdm9pZCBjb21wdXRlRmxvYXRpbmdQb3NpdGlvbihjb25zdCBGbG9hdGlu Z0NvbnRleHQmLCBjb25zdCBCb3gmKTsKICAgICB2b2lkIGNvbXB1dGVQb3NpdGlvblRvQXZvaWRG bG9hdHMoY29uc3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3QgQm94Jik7CiAKLSAgICB2b2lkIGNv bXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uKGNvbnN0IEJveCYpOwotICAgIHZvaWQgY29t cHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMoY29uc3QgQm94Jik7Ci0g ICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290 KGNvbnN0IEJveCYpOwotICAgIHZvaWQgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25G b3JGbG9hdENsZWFyKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIGNvbnN0IEJveCYpOworICAgIHZv aWQgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb24oY29uc3QgQm94JiwgY29uc3QgSG9y aXpvbnRhbENvbnN0cmFpbnRzJik7CisgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQ b3NpdGlvbkZvckFuY2VzdG9ycyhjb25zdCBCb3gmLCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9y aXpvbnRhbENvbnN0cmFpbnRzPiYpOworICAgIHZvaWQgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2Fs UG9zaXRpb25Gb3JGb3JtYXR0aW5nUm9vdChjb25zdCBCb3gmLCBjb25zdCBDb25zdHJhaW50c1Bh aXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYpOworICAgIHZvaWQgY29tcHV0ZUVzdGltYXRlZFZl cnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIGNvbnN0 IEJveCYsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+Jik7CiAK ICAgICBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25z dHJhaW50cygpIG92ZXJyaWRlOwogICAgIExheW91dFVuaXQgdmVydGljYWxQb3NpdGlvbldpdGhN YXJnaW4oY29uc3QgQm94JiwgY29uc3QgVXNlZFZlcnRpY2FsTWFyZ2luJikgY29uc3Q7Cg== 387444 2020-01-11 12:53:53 -0800 2020-01-11 13:44:13 -0800 Patch bug-206121-20200111125352.patch text/plain 11466 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0Mjk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg2NjI5NzUyYjYwZWNj OGRlM2RiMzY3Y2Q2ZDRmOWUxODM2OWQ3ZS4uOGVmOGE2ZjYzZjU4MTdlMDI0MjZlNDc0MmRhYjcx OTYwOGIzNzdkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAxLTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckFuY2Vz dG9ycyBzaG91bGQgdGFrZSBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MTIxCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODQ5OTQ5Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHByZXZlbnRzIGNvbXB1dGVFc3RpbWF0ZWRW ZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzIGZyb20gcmVhZGluZyBnZW9tZXRyeSBvdXRzaWRl IG9mIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQuCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlU3RhdGljVmVydGljYWxQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVTdGF0aWNQb3NpdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRW ZXJ0aWNhbFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRl ZFZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoKKwogMjAyMC0wMS0xMSAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIEludHJvZHVjZSBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpDb25zdHJhaW50c1BhaXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0Nv bnRleHQuY3BwCmluZGV4IGM2NjE3NGM3OGJmYTExODIxZDg5MjY2ZTJiNWNkZmMwNzUxZjE0MzAu LjcxODZhOGJiNWYzY2E2MzYzYTIyNDRjZTU2MzYyYTU4ZmM4ZDU0ZDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMjAwLDcgKzIwMCw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJveCYgbGF5b3V0 Qm94LCBGCiAgICAgYXV0byBhZGp1c3RlZEhvcml6b250YWxDb25zdHJhaW50cyA9IENvbnN0cmFp bnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+IHsgaG9yaXpvbnRhbENvbnN0cmFpbnRzLnJv b3QsIHsgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmNvbnRhaW5pbmdCbG9jay5sb2dpY2FsTGVmdCwg YXZhaWxhYmxlV2lkdGggfSB9OwogCiAgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcobGF5b3V0 Qm94LCBhZGp1c3RlZEhvcml6b250YWxDb25zdHJhaW50cy5jb250YWluaW5nQmxvY2spOwotICAg IGNvbXB1dGVTdGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94 LCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKKyAgICBjb21wdXRlU3RhdGljVmVydGljYWxQb3NpdGlv bihmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0 aWNhbENvbnN0cmFpbnRzKTsKICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4obGF5b3V0Qm94LCBh ZGp1c3RlZEhvcml6b250YWxDb25zdHJhaW50cyk7CiAgICAgY29tcHV0ZVN0YXRpY0hvcml6b250 YWxQb3NpdGlvbihsYXlvdXRCb3gsIGFkanVzdGVkSG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKIApA QCAtMjQxLDEzICsyNDEsMTMgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpwbGFjZUlu Rmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihjb25zdCBCb3gmIGxheW91dEJveCwKICAgICBMT0dfV0lU SF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiRW5kOiBtb3ZlIGlu LWZsb3cgcG9zaXRpb25lZCBjaGlsZHJlbiAtPiBwYXJlbnQ6ICIgPDwgJmxheW91dEJveCk7CiB9 CiAKLXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRpY1ZlcnRpY2FsUG9z aXRpb24oY29uc3QgRmxvYXRpbmdDb250ZXh0JiBmbG9hdGluZ0NvbnRleHQsIGNvbnN0IEJveCYg bGF5b3V0Qm94LCBjb25zdCBDb25zdHJhaW50c1BhaXI8VmVydGljYWxDb25zdHJhaW50cz4mIHZl cnRpY2FsQ29uc3RyYWludHMpCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVT dGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYgZmxvYXRpbmdDb250 ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgQ29uc3RyYWludHNQYWlyPEhvcml6b250 YWxDb25zdHJhaW50cz4mIGhvcml6b250YWxDb25zdHJhaW50cywgY29uc3QgQ29uc3RyYWludHNQ YWlyPFZlcnRpY2FsQ29uc3RyYWludHM+JiB2ZXJ0aWNhbENvbnN0cmFpbnRzKQogewogICAgIGZv cm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3gobGF5b3V0Qm94KS5zZXRUb3AoZ2VvbWV0cnkoKS5z dGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGxheW91dEJveCwgdmVydGljYWxDb25zdHJhaW50cy5jb250 YWluaW5nQmxvY2spKTsKICAgICBpZiAobGF5b3V0Qm94Lmhhc0Zsb2F0Q2xlYXIoKSkKLSAgICAg ICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGZsb2F0aW5n Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAgICAgICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9z aXRpb25Gb3JGbG9hdENsZWFyKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94LCBob3Jpem9udGFs Q29uc3RyYWludHMpOwogICAgIGVsc2UgaWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRp bmdDb250ZXh0KCkpCi0gICAgICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9y Rm9ybWF0dGluZ1Jvb3QobGF5b3V0Qm94KTsKKyAgICAgICAgY29tcHV0ZUVzdGltYXRlZFZlcnRp Y2FsUG9zaXRpb25Gb3JGb3JtYXR0aW5nUm9vdChsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJh aW50cyk7CiB9CiAKIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRpY0hv cml6b250YWxQb3NpdGlvbihjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgQ29uc3RyYWludHNQ YWlyPEhvcml6b250YWxDb25zdHJhaW50cz4mIGhvcml6b250YWxDb25zdHJhaW50cykKQEAgLTI1 NywxMyArMjU3LDEyIEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRp Y0hvcml6b250YWxQb3NpdGlvbihjb25zdCBCb3gmIGxheW91dEJvCiAKIHZvaWQgQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4 dCYgZmxvYXRpbmdDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgQ29uc3RyYWlu dHNQYWlyPEhvcml6b250YWxDb25zdHJhaW50cz4mIGhvcml6b250YWxDb25zdHJhaW50cywgY29u c3QgQ29uc3RyYWludHNQYWlyPFZlcnRpY2FsQ29uc3RyYWludHM+JiB2ZXJ0aWNhbENvbnN0cmFp bnRzKQogewotICAgIGNvbXB1dGVTdGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGZsb2F0aW5nQ29udGV4 dCwgbGF5b3V0Qm94LCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKKyAgICBjb21wdXRlU3RhdGljVmVy dGljYWxQb3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0 cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKICAgICBjb21wdXRlU3RhdGljSG9yaXpvbnRh bFBvc2l0aW9uKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKIH0KIAotdm9pZCBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbihj b25zdCBCb3gmIGxheW91dEJveCkKK3ZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb24oY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IEhv cml6b250YWxDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzKQogewotICAgIGF1dG8g aG9yaXpvbnRhbENvbnN0cmFpbnRzID0gR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0Zv ckluRmxvdyhnZW9tZXRyeUZvckJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKSk7CiAg ICAgYXV0byBjb21wdXRlZFZlcnRpY2FsTWFyZ2luID0gZ2VvbWV0cnkoKS5jb21wdXRlZFZlcnRp Y2FsTWFyZ2luKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICBhdXRvIHVz ZWROb25Db2xsYXBzZWRNYXJnaW4gPSBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZh bHVlcyB7IGNvbXB1dGVkVmVydGljYWxNYXJnaW4uYmVmb3JlLnZhbHVlT3IoMCksIGNvbXB1dGVk VmVydGljYWxNYXJnaW4uYWZ0ZXIudmFsdWVPcigwKSB9OwogICAgIGF1dG8gZXN0aW1hdGVkTWFy Z2luQmVmb3JlID0gbWFyZ2luQ29sbGFwc2UoKS5lc3RpbWF0ZWRNYXJnaW5CZWZvcmUobGF5b3V0 Qm94LCB1c2VkTm9uQ29sbGFwc2VkTWFyZ2luKTsKQEAgLTI4MCw3ICsyNzksNyBAQCB2b2lkIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uKGNv bnN0IEJveCYgbGF5b3V0QgogI2VuZGlmCiB9CiAKLXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMoY29uc3QgQm94 JiBsYXlvdXRCb3gpCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0 ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25z dCBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYgaG9yaXpvbnRhbENvbnN0 cmFpbnRzKQogewogICAgIC8vIFdlIG9ubHkgbmVlZCB0byBlc3RpbWF0ZSBtYXJnaW4gdG9wIGZv ciBmbG9hdCByZWxhdGVkIGxheW91dCAoZm9ybWF0dGluZyBjb250ZXh0IHJvb3RzIGF2b2lkIGZs b2F0cykuCiAgICAgQVNTRVJUKGxheW91dEJveC5pc0Zsb2F0QXZvaWRlcigpIHx8IGxheW91dEJv eC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpOwpAQCAtMjk4LDQwICsyOTcs NDMgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGlj YWxQb3NpdGlvbkZvckFuY2VzdG9ycyhjb25zdAogICAgICAgICAvLyBGSVhNRTogd2l0aCBpbmNy ZW1lbnRhbCBsYXlvdXQsIHdlIG1pZ2h0IGFjdHVhbGx5IGhhdmUgYSB2YWxpZCAobm9uLWVzdGlt YXRlZCkgbWFyZ2luIHRvcCBhcyB3ZWxsLgogICAgICAgICBpZiAoaGFzRXN0aW1hdGVkTWFyZ2lu QmVmb3JlKCphbmNlc3RvcikpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGNvbXB1dGVF c3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uKCphbmNlc3Rvcik7CisgICAgICAgIGF1dG8gaG9yaXpv bnRhbENvbnN0cmFpbnRzRm9yQW5jZXN0b3IgPSBob3Jpem9udGFsQ29uc3RyYWludHMucm9vdDsK KyAgICAgICAgaWYgKGFuY2VzdG9yLT5jb250YWluaW5nQmxvY2soKSAhPSAmcm9vdCgpKQorICAg ICAgICAgICAgaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yQW5jZXN0b3IgPSBHZW9tZXRyeTo6aG9y aXpvbnRhbENvbnN0cmFpbnRzRm9ySW5GbG93KGdlb21ldHJ5Rm9yQm94KCphbmNlc3Rvci0+Y29u dGFpbmluZ0Jsb2NrKCkpKTsKKyAgICAgICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRp b24oKmFuY2VzdG9yLCBob3Jpem9udGFsQ29uc3RyYWludHNGb3JBbmNlc3Rvcik7CiAgICAgfQog fQogCi12b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNh bFBvc2l0aW9uRm9yRm9ybWF0dGluZ1Jvb3QoY29uc3QgQm94JiBsYXlvdXRCb3gpCit2b2lkIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9y Rm9ybWF0dGluZ1Jvb3QoY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IENvbnN0cmFpbnRzUGFp cjxIb3Jpem9udGFsQ29uc3RyYWludHM+JiBob3Jpem9udGFsQ29uc3RyYWludHMpCiB7CiAgICAg QVNTRVJUKGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOwogICAgIEFT U0VSVCghbGF5b3V0Qm94Lmhhc0Zsb2F0Q2xlYXIoKSk7CiAKICAgICBpZiAobGF5b3V0Qm94Lmlz RmxvYXRpbmdQb3NpdGlvbmVkKCkpIHsKLSAgICAgICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2Fs UG9zaXRpb25Gb3JBbmNlc3RvcnMobGF5b3V0Qm94KTsKKyAgICAgICAgY29tcHV0ZUVzdGltYXRl ZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3Ry YWludHMpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgY29tcHV0ZUVzdGltYXRlZFZl cnRpY2FsUG9zaXRpb24obGF5b3V0Qm94KTsKLSAgICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQ b3NpdGlvbkZvckFuY2VzdG9ycyhsYXlvdXRCb3gpOworICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0 aWNhbFBvc2l0aW9uKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmNvbnRhaW5pbmdC bG9jayk7CisgICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMo bGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwogCiAgICAgLy8gSWYgdGhlIGlubGlu ZSBmb3JtYXR0aW5nIHJvb3QgaXMgYWxzbyB0aGUgcm9vdCBmb3IgdGhlIGZsb2F0cyAoaGFwcGVu cyB3aGVuIHRoZSByb290IGJveCBhbHNvIGVzdGFibGlzaGVzIGEgYmxvY2sgZm9ybWF0dGluZyBj b250ZXh0KQogICAgIC8vIHRoZSBmbG9hdHMgYXJlIGluIHRoZSBjb29yZGluYXRlIHN5c3RlbSBv ZiB0aGlzIHJvb3QuIE5vIG5lZWQgdG8gZmluZCB0aGUgZmluYWwgdmVydGljYWwgcG9zaXRpb24u CiAgICAgYXV0byBpbmxpbmVDb250ZXh0SW5oZXJpdHNGbG9hdHMgPSBsYXlvdXRCb3guZXN0YWJs aXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dE9ubHkoKTsKICAgICBpZiAoaW5saW5lQ29udGV4 dEluaGVyaXRzRmxvYXRzKSB7Ci0gICAgICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0 aW9uKGxheW91dEJveCk7Ci0gICAgICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9u Rm9yQW5jZXN0b3JzKGxheW91dEJveCk7CisgICAgICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNh bFBvc2l0aW9uKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmNvbnRhaW5pbmdCbG9j ayk7CisgICAgICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3Jz KGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICB9CiB9CiAKLXZvaWQgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JG bG9hdENsZWFyKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYgZmxvYXRpbmdDb250ZXh0LCBjb25zdCBC b3gmIGxheW91dEJveCkKK3ZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGlt YXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYg ZmxvYXRpbmdDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgQ29uc3RyYWludHNQ YWlyPEhvcml6b250YWxDb25zdHJhaW50cz4mIGhvcml6b250YWxDb25zdHJhaW50cykKIHsKICAg ICBBU1NFUlQobGF5b3V0Qm94Lmhhc0Zsb2F0Q2xlYXIoKSk7CiAgICAgaWYgKGZsb2F0aW5nQ29u dGV4dC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKICAgICAvLyBUaGUgc3RhdGljIHBvc2l0 aW9uIHdpdGggY2xlYXIgcmVxdWlyZXMgbWFyZ2luIGVzaXRtYXRpb24gdG8gc2VlIGlmIGNsZWFy YW5jZSBpcyBuZWVkZWQuCi0gICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb24obGF5 b3V0Qm94KTsKLSAgICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckFuY2VzdG9y cyhsYXlvdXRCb3gpOworICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uKGxheW91 dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmNvbnRhaW5pbmdCbG9jayk7CisgICAgY29tcHV0 ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMobGF5b3V0Qm94LCBob3Jpem9u dGFsQ29uc3RyYWludHMpOwogICAgIGF1dG8gdmVydGljYWxQb3NpdGlvbkFuZENsZWFyYW5jZSA9 IGZsb2F0aW5nQ29udGV4dC52ZXJ0aWNhbFBvc2l0aW9uV2l0aENsZWFyYW5jZShsYXlvdXRCb3gp OwogICAgIGlmICghdmVydGljYWxQb3NpdGlvbkFuZENsZWFyYW5jZS5wb3NpdGlvbikgewogICAg ICAgICBBU1NFUlQoIXZlcnRpY2FsUG9zaXRpb25BbmRDbGVhcmFuY2UuY2xlYXJhbmNlKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggYTIyMjdiNmNhMmVlMTE0MTlmODQ5M2JhNWM2 ZTQ0YzdjN2VjMzE2Yi4uODc3MTgzYWI0NzE1MzU4ZmEwNjQ2OGIyODdhODA2MzY4YWI0NzIxNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTY1LDE1ICs2NSwxNSBAQCBwcml2YXRl OgogICAgIHZvaWQgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBjb25zdCBDb25z dHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYpOwogCiAgICAgdm9pZCBjb21wdXRl U3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uKGNvbnN0IEJveCYsIGNvbnN0IENvbnN0cmFpbnRzUGFp cjxIb3Jpem9udGFsQ29uc3RyYWludHM+Jik7Ci0gICAgdm9pZCBjb21wdXRlU3RhdGljVmVydGlj YWxQb3NpdGlvbihjb25zdCBGbG9hdGluZ0NvbnRleHQmLCBjb25zdCBCb3gmLCBjb25zdCBDb25z dHJhaW50c1BhaXI8VmVydGljYWxDb25zdHJhaW50cz4mKTsKKyAgICB2b2lkIGNvbXB1dGVTdGF0 aWNWZXJ0aWNhbFBvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIGNvbnN0IEJveCYsIGNv bnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+JiwgY29uc3QgQ29uc3Ry YWludHNQYWlyPFZlcnRpY2FsQ29uc3RyYWludHM+Jik7CiAgICAgdm9pZCBjb21wdXRlU3RhdGlj UG9zaXRpb24oY29uc3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3QgQm94JiwgY29uc3QgQ29uc3Ry YWludHNQYWlyPEhvcml6b250YWxDb25zdHJhaW50cz4mLCBjb25zdCBDb25zdHJhaW50c1BhaXI8 VmVydGljYWxDb25zdHJhaW50cz4mKTsKICAgICB2b2lkIGNvbXB1dGVGbG9hdGluZ1Bvc2l0aW9u KGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIGNvbnN0IEJveCYpOwogICAgIHZvaWQgY29tcHV0ZVBv c2l0aW9uVG9Bdm9pZEZsb2F0cyhjb25zdCBGbG9hdGluZ0NvbnRleHQmLCBjb25zdCBCb3gmKTsK IAotICAgIHZvaWQgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb24oY29uc3QgQm94Jik7 Ci0gICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckFuY2VzdG9ycyhj b25zdCBCb3gmKTsKLSAgICB2b2lkIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9y Rm9ybWF0dGluZ1Jvb3QoY29uc3QgQm94Jik7Ci0gICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVy dGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIoY29uc3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3Qg Qm94Jik7CisgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbihjb25zdCBC b3gmLCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmKTsKKyAgICB2b2lkIGNvbXB1dGVFc3Rp bWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzKGNvbnN0IEJveCYsIGNvbnN0IENvbnN0 cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+Jik7CisgICAgdm9pZCBjb21wdXRlRXN0 aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290KGNvbnN0IEJveCYsIGNvbnN0 IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+Jik7CisgICAgdm9pZCBjb21w dXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIoY29uc3QgRmxvYXRpbmdD b250ZXh0JiwgY29uc3QgQm94JiwgY29uc3QgQ29uc3RyYWludHNQYWlyPEhvcml6b250YWxDb25z dHJhaW50cz4mKTsKIAogICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29tcHV0ZWRJbnRy aW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJpZGU7CiAgICAgTGF5b3V0VW5pdCB2ZXJ0aWNh bFBvc2l0aW9uV2l0aE1hcmdpbihjb25zdCBCb3gmLCBjb25zdCBVc2VkVmVydGljYWxNYXJnaW4m KSBjb25zdDsK