229064 2021-08-12 18:54:13 -0700 GlyphBuffer can become inconsistent with its backing string 2021-08-20 01:05:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215643 1 mmaxfield mmaxfield webkit-bug-importer zalan oldest_to_newest 1784018 0 mmaxfield 2021-08-12 18:54:13 -0700 GlyphBuffer can become inconsistent with its backing string 1784019 1 435463 mmaxfield 2021-08-12 18:56:54 -0700 Created attachment 435463 Patch 1784022 2 435465 mmaxfield 2021-08-12 19:08:39 -0700 Created attachment 435465 Patch 1785669 3 webkit-bug-importer 2021-08-19 18:55:15 -0700 <rdar://problem/82152161> 1785691 4 ews-feeder 2021-08-19 21:57:23 -0700 Tools/Scripts/svn-apply failed to apply attachment 435465 to trunk. Please resolve the conflicts and upload a new patch. 1785730 5 mmaxfield 2021-08-20 01:05:11 -0700 Committed r281300 (240724@main): <https://commits.webkit.org/240724@main> 435463 2021-08-12 18:56:54 -0700 2021-08-12 19:59:50 -0700 Patch bug-229064-20210812185653.patch text/plain 9825 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwOTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTEzMDk4YWY2N2M5YzY4 OGIzZjIwY2YzZmJmZDAwMTc5ZjM0NWE1OS4uM2RlNmFkYzQ0ZDM5NGEzY2EyMjhkZGU2MzU5YWQx MDIxMDNiOGVjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA4LTEyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgR2x5cGhCdWZm ZXIgY2FuIGJlY29tZSBpbmNvbnNpc3RlbnQgd2l0aCBpdHMgYmFja2luZyBzdHJpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTA2NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgc3BsaXQg b3V0IGZyb20gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTY0My4K KworICAgICAgICBCZWZvcmUgc2hhcGluZywgdGhlIGdseXBocyBpbiB0aGUgR2x5cGhCdWZmZXIg bmVlZCB0byBtYXRjaCBvbmUtdG8tb25lIHdpdGggY29kZSB1bml0cyBpbiB0aGUgc3RyaW5nLgor ICAgICAgICBXZSBpdGVyYXRlIG92ZXIgdGhlIHN0cmluZywgYWRkaW5nIGdseXBocyBpbnRvIHRo ZSBHbHlwaEJ1ZmZlciwgYnV0IHRoZXJlIHdhcyBvbmUgZWFybHkgImNvbnRpbnVlIgorICAgICAg ICBpbiB0aGUgbG9vcCB0aGF0IHNraXBzIHRoZSBhZGQoKSBjYWxsLgorCisgICAgICAgIEJlY2F1 c2UgdGhpcyBwYXRjaCBhZGRzIEFTU0VSVCgpcywgdGhpcyBpcyBhY3R1YWxseSBjb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVy YXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjpjb21taXRDdXJyZW50 Rm9udFJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OmFkZFRvR2x5cGhCdWZmZXIpOgorICAgICAg ICAoV2ViQ29yZTo6V2lkdGhJdGVyYXRvcjo6YWR2YW5jZUludGVybmFsKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmg6CisKIDIwMjEtMDgtMTEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICA8YSByZWw9Im9wZW5lciBub29wZW5l ciIgdGFyZ2V0PSJfYmxhbmsiPiBzaG91bGQgY3JlYXRlIGEgd2luZG93IHdpdGhvdXQgb3BlbmVy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJh dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3Iu Y3BwCmluZGV4IGI3Y2MwZmI1MjVmNjg1MjdjOTFjZTFhYmQ2M2UyNDQ3NDRlZjM3YmIuLjQwYWJm ZDU5OWU4ZTA0YmVhNjIyOGYxOTQ0NWFkMzcyNmVlYjA4MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwCkBAIC0xODYsMjQgKzE4 NiwzNCBAQCBzdGF0aWMgaW5saW5lIHN0ZDo6cGFpcjxib29sLCBib29sPiBleHBhbnNpb25Mb2Nh dGlvbihib29sIGlkZW9ncmFwaCwgYm9vbCB0cmVhdAogICAgIHJldHVybiBzdGQ6Om1ha2VfcGFp cihleHBhbmRMZWZ0LCBleHBhbmRSaWdodCk7CiB9CiAKLXZvaWQgV2lkdGhJdGVyYXRvcjo6Y29t bWl0Q3VycmVudEZvbnRSYW5nZShHbHlwaEJ1ZmZlciYgZ2x5cGhCdWZmZXIsIHVuc2lnbmVkIGxh c3RHbHlwaENvdW50LCB1bnNpZ25lZCBjdXJyZW50Q2hhcmFjdGVySW5kZXgsIGNvbnN0IEZvbnQm IGZvbnQsIGNvbnN0IEZvbnQmIHByaW1hcnlGb250LCBVQ2hhcjMyIGNoYXJhY3RlciwgZmxvYXQg d2lkdGhPZkN1cnJlbnRGb250UmFuZ2UsIENoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSYgY2hhcmFj dGVyc1RyZWF0ZWRBc1NwYWNlKQordm9pZCBXaWR0aEl0ZXJhdG9yOjpjb21taXRDdXJyZW50Rm9u dFJhbmdlKEdseXBoQnVmZmVyJiBnbHlwaEJ1ZmZlciwgdW5zaWduZWQmIGxhc3RHbHlwaENvdW50 LCB1bnNpZ25lZCBjdXJyZW50Q2hhcmFjdGVySW5kZXgsIGNvbnN0IEZvbnQqJiBmb250LCBjb25z dCBGb250JiBuZXdGb250LCBjb25zdCBGb250JiBwcmltYXJ5Rm9udCwgVUNoYXIzMiBjaGFyYWN0 ZXIsIGZsb2F0JiB3aWR0aE9mQ3VycmVudEZvbnRSYW5nZSwgZmxvYXQgbmV4dENoYXJhY3Rlcldp ZHRoLCBDaGFyYWN0ZXJzVHJlYXRlZEFzU3BhY2UmIGNoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSkK IHsKKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIEFTU0VSVChmb250KTsKKyAgICBmb3IgKHVuc2ln bmVkIGkgPSBsYXN0R2x5cGhDb3VudDsgaSA8IGdseXBoQnVmZmVyLnNpemUoKTsgKytpKQorICAg ICAgICBBU1NFUlQoJmdseXBoQnVmZmVyLmZvbnRBdChpKSA9PSBmb250KTsKKyNlbmRpZgorCiAg ICAgYXV0byB0cmFuc2Zvcm1zVHlwZSA9IHNob3VsZEFwcGx5Rm9udFRyYW5zZm9ybXMoZ2x5cGhC dWZmZXIsIGxhc3RHbHlwaENvdW50LCBjdXJyZW50Q2hhcmFjdGVySW5kZXgpOwogICAgIGlmICh0 cmFuc2Zvcm1zVHlwZSAhPSBUcmFuc2Zvcm1zVHlwZTo6Tm9uZSkKLSAgICAgICAgbV9ydW5XaWR0 aFNvRmFyICs9IGFwcGx5Rm9udFRyYW5zZm9ybXMoZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50 LCBjdXJyZW50Q2hhcmFjdGVySW5kZXgsIGZvbnQsIHRyYW5zZm9ybXNUeXBlID09IFRyYW5zZm9y bXNUeXBlOjpGb3JjZWQsIGNoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSk7CisgICAgICAgIG1fcnVu V2lkdGhTb0ZhciArPSBhcHBseUZvbnRUcmFuc2Zvcm1zKGdseXBoQnVmZmVyLCBsYXN0R2x5cGhD b3VudCwgY3VycmVudENoYXJhY3RlckluZGV4LCAqZm9udCwgdHJhbnNmb3Jtc1R5cGUgPT0gVHJh bnNmb3Jtc1R5cGU6OkZvcmNlZCwgY2hhcmFjdGVyc1RyZWF0ZWRBc1NwYWNlKTsKICAgICBtX2N1 cnJlbnRDaGFyYWN0ZXJJbmRleCA9IGN1cnJlbnRDaGFyYWN0ZXJJbmRleDsKIAotICAgIGlmICh3 aWR0aE9mQ3VycmVudEZvbnRSYW5nZSAmJiBtX2ZhbGxiYWNrRm9udHMgJiYgJmZvbnQgIT0gJnBy aW1hcnlGb250KSB7CisgICAgaWYgKHdpZHRoT2ZDdXJyZW50Rm9udFJhbmdlICYmIG1fZmFsbGJh Y2tGb250cyAmJiBmb250ICE9ICZwcmltYXJ5Rm9udCkgewogICAgICAgICAvLyBGSVhNRTogVGhp cyBkb2VzIGEgbGl0dGxlIGV4dHJhIHdvcmsgdGhhdCBjb3VsZCBiZSBhdm9pZGVkIGlmCiAgICAg ICAgIC8vIGdseXBoRGF0YUZvckNoYXJhY3RlcigpIHJldHVybmVkIHdoZXRoZXIgaXQgY2hvc2Ug dG8gdXNlIGEgc21hbGwgY2FwcyBmb250LgogICAgICAgICBpZiAoIW1fZm9udC5pc1NtYWxsQ2Fw cygpIHx8IGNoYXJhY3RlciA9PSB1X3RvdXBwZXIoY2hhcmFjdGVyKSkKLSAgICAgICAgICAgIG1f ZmFsbGJhY2tGb250cy0+YWRkKCZmb250KTsKKyAgICAgICAgICAgIG1fZmFsbGJhY2tGb250cy0+ YWRkKGZvbnQpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGF1dG8gZ2x5cGhGb250ID0g bV9mb250LmdseXBoRGF0YUZvckNoYXJhY3Rlcih1X3RvdXBwZXIoY2hhcmFjdGVyKSwgbV9ydW4u cnRsKCkpLmZvbnQ7CiAgICAgICAgICAgICBpZiAoZ2x5cGhGb250ICE9ICZwcmltYXJ5Rm9udCkK ICAgICAgICAgICAgICAgICBtX2ZhbGxiYWNrRm9udHMtPmFkZChnbHlwaEZvbnQpOwogICAgICAg ICB9CiAgICAgfQorCisgICAgbGFzdEdseXBoQ291bnQgPSBnbHlwaEJ1ZmZlci5zaXplKCk7Cisg ICAgZm9udCA9ICZuZXdGb250OworICAgIHdpZHRoT2ZDdXJyZW50Rm9udFJhbmdlID0gbmV4dENo YXJhY3RlcldpZHRoOwogfQogCiBib29sIFdpZHRoSXRlcmF0b3I6Omhhc0V4dHJhU3BhY2luZygp IGNvbnN0CkBAIC0yMTEsNiArMjIxLDE5IEBAIGJvb2wgV2lkdGhJdGVyYXRvcjo6aGFzRXh0cmFT cGFjaW5nKCkgY29uc3QKICAgICByZXR1cm4gKG1fZm9udC5sZXR0ZXJTcGFjaW5nKCkgfHwgbV9m b250LndvcmRTcGFjaW5nKCkgfHwgbV9leHBhbnNpb24pICYmICFtX3J1bi5zcGFjaW5nRGlzYWJs ZWQoKTsKIH0KIAorc3RhdGljIHZvaWQgYWRkVG9HbHlwaEJ1ZmZlcihHbHlwaEJ1ZmZlciYgZ2x5 cGhCdWZmZXIsIEdseXBoIGdseXBoLCBjb25zdCBGb250JiBmb250LCBmbG9hdCB3aWR0aCwgR2x5 cGhCdWZmZXJTdHJpbmdPZmZzZXQgY3VycmVudENoYXJhY3RlckluZGV4LCBVQ2hhcjMyIGNoYXJh Y3RlcikKK3sKKyAgICBnbHlwaEJ1ZmZlci5hZGQoZ2x5cGgsIGZvbnQsIHdpZHRoLCBjdXJyZW50 Q2hhcmFjdGVySW5kZXgpOworI2lmIFVTRShDVEZPTlRTSEFQRUdMWVBIUykKKyAgICAvLyBUaGVz ZSAwIGdseXBocyBhcmUgbmVlZGVkIGJ5IHNoYXBlcnMgaWYgdGhlIHNvdXJjZSB0ZXh0IGhhcyBz dXJyb2dhdGUgcGFpcnMuCisgICAgLy8gSG93ZXZlciwgQ1RGb250VHJhbnNmb3JtR2x5cGhzKCkg Y2FuJ3QgZGVsZXRlIHRoZXNlIDAgZ2x5cGhzIGZyb20gdGhlIHNoYXBlZCB0ZXh0LAorICAgIC8v IHNvIHdlIHNob3VsZG4ndCBhZGQgdGhlbSBpbiB0aGUgZmlyc3QgcGxhY2UgaWYgd2UncmUgdXNp bmcgdGhhdCBzaGFwaW5nIHJvdXRpbmUuCisgICAgLy8gQW55IG90aGVyIHNoYXBpbmcgcm91dGlu ZSBzaG91bGQgZGVsZXRlIHRoZXNlIGdseXBocyBmcm9tIHRoZSBzaGFwZWQgdGV4dC4KKyAgICBp ZiAoIVVfSVNfQk1QKGNoYXJhY3RlcikpCisgICAgICAgIGdseXBoQnVmZmVyLmFkZCgwLCBmb250 LCAwLCBjdXJyZW50Q2hhcmFjdGVySW5kZXggKyAxKTsKKyNlbmRpZgorfQorCiB0ZW1wbGF0ZSA8 dHlwZW5hbWUgVGV4dEl0ZXJhdG9yPgogaW5saW5lIHZvaWQgV2lkdGhJdGVyYXRvcjo6YWR2YW5j ZUludGVybmFsKFRleHRJdGVyYXRvciYgdGV4dEl0ZXJhdG9yLCBHbHlwaEJ1ZmZlciYgZ2x5cGhC dWZmZXIpCiB7CkBAIC0yNTAsNiArMjczLDExIEBAIGlubGluZSB2b2lkIFdpZHRoSXRlcmF0b3I6 OmFkdmFuY2VJbnRlcm5hbChUZXh0SXRlcmF0b3ImIHRleHRJdGVyYXRvciwgR2x5cGhCdWZmCiAg ICAgICAgIGNvbnN0IEdseXBoRGF0YSYgZ2x5cGhEYXRhID0gbV9mb250LmdseXBoRGF0YUZvckNo YXJhY3RlcihjaGFyYWN0ZXIsIHJ0bCk7CiAgICAgICAgIEdseXBoIGdseXBoID0gZ2x5cGhEYXRh LmdseXBoOwogICAgICAgICBpZiAoIWdseXBoICYmICFjaGFyYWN0ZXJNdXN0RHJhd1NvbWV0aGlu ZykgeworICAgICAgICAgICAgY29tbWl0Q3VycmVudEZvbnRSYW5nZShnbHlwaEJ1ZmZlciwgbGFz dEdseXBoQ291bnQsIGN1cnJlbnRDaGFyYWN0ZXJJbmRleCwgbGFzdEZvbnREYXRhLCBwcmltYXJ5 Rm9udCwgcHJpbWFyeUZvbnQsIGNoYXJhY3Rlciwgd2lkdGhPZkN1cnJlbnRGb250UmFuZ2UsIHdp ZHRoLCBjaGFyYWN0ZXJzVHJlYXRlZEFzU3BhY2UpOworCisgICAgICAgICAgICBHbHlwaCBkZWxl dGVkR2x5cGggPSAweEZGRkY7CisgICAgICAgICAgICBhZGRUb0dseXBoQnVmZmVyKGdseXBoQnVm ZmVyLCBkZWxldGVkR2x5cGgsIHByaW1hcnlGb250LCAwLCBjdXJyZW50Q2hhcmFjdGVySW5kZXgs IGNoYXJhY3Rlcik7CisKICAgICAgICAgICAgIHRleHRJdGVyYXRvci5hZHZhbmNlKGFkdmFuY2VM ZW5ndGgpOwogICAgICAgICAgICAgY3VycmVudENoYXJhY3RlckluZGV4ID0gdGV4dEl0ZXJhdG9y LmN1cnJlbnRJbmRleCgpOwogICAgICAgICAgICAgY29udGludWU7CkBAIC0yNTksMTIgKzI4Nyw5 IEBAIGlubGluZSB2b2lkIFdpZHRoSXRlcmF0b3I6OmFkdmFuY2VJbnRlcm5hbChUZXh0SXRlcmF0 b3ImIHRleHRJdGVyYXRvciwgR2x5cGhCdWZmCiAgICAgICAgIHByZXZpb3VzV2lkdGggPSB3aWR0 aDsKICAgICAgICAgd2lkdGggPSBmb250LndpZHRoRm9yR2x5cGgoZ2x5cGgpOwogCi0gICAgICAg IGlmICgmZm9udCAhPSBsYXN0Rm9udERhdGEpIHsKLSAgICAgICAgICAgIGNvbW1pdEN1cnJlbnRG b250UmFuZ2UoZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50LCBjdXJyZW50Q2hhcmFjdGVySW5k ZXgsICpsYXN0Rm9udERhdGEsIHByaW1hcnlGb250LCBjaGFyYWN0ZXIsIHdpZHRoT2ZDdXJyZW50 Rm9udFJhbmdlLCBjaGFyYWN0ZXJzVHJlYXRlZEFzU3BhY2UpOwotICAgICAgICAgICAgbGFzdEds eXBoQ291bnQgPSBnbHlwaEJ1ZmZlci5zaXplKCk7Ci0gICAgICAgICAgICBsYXN0Rm9udERhdGEg PSAmZm9udDsKLSAgICAgICAgICAgIHdpZHRoT2ZDdXJyZW50Rm9udFJhbmdlID0gd2lkdGg7Ci0g ICAgICAgIH0gZWxzZQorICAgICAgICBpZiAoJmZvbnQgIT0gbGFzdEZvbnREYXRhKQorICAgICAg ICAgICAgY29tbWl0Q3VycmVudEZvbnRSYW5nZShnbHlwaEJ1ZmZlciwgbGFzdEdseXBoQ291bnQs IGN1cnJlbnRDaGFyYWN0ZXJJbmRleCwgbGFzdEZvbnREYXRhLCBmb250LCBwcmltYXJ5Rm9udCwg Y2hhcmFjdGVyLCB3aWR0aE9mQ3VycmVudEZvbnRSYW5nZSwgd2lkdGgsIGNoYXJhY3RlcnNUcmVh dGVkQXNTcGFjZSk7CisgICAgICAgIGVsc2UKICAgICAgICAgICAgIHdpZHRoT2ZDdXJyZW50Rm9u dFJhbmdlICs9IHdpZHRoOwogCiAgICAgICAgIGF1dG8gdHJhbnNmb3Jtc1R5cGUgPSBzaG91bGRB cHBseUZvbnRUcmFuc2Zvcm1zKGdseXBoQnVmZmVyLCBsYXN0R2x5cGhDb3VudCwgY3VycmVudENo YXJhY3RlckluZGV4KTsKQEAgLTI4NSwxNSArMzEwLDcgQEAgaW5saW5lIHZvaWQgV2lkdGhJdGVy YXRvcjo6YWR2YW5jZUludGVybmFsKFRleHRJdGVyYXRvciYgdGV4dEl0ZXJhdG9yLCBHbHlwaEJ1 ZmYKICAgICAgICAgaWYgKG1fZm9yVGV4dEVtcGhhc2lzICYmICFGb250Q2FzY2FkZTo6Y2FuUmVj ZWl2ZVRleHRFbXBoYXNpcyhjaGFyYWN0ZXIpKQogICAgICAgICAgICAgZ2x5cGggPSAwOwogCi0g ICAgICAgIGdseXBoQnVmZmVyLmFkZChnbHlwaCwgZm9udCwgd2lkdGgsIGN1cnJlbnRDaGFyYWN0 ZXJJbmRleCk7Ci0jaWYgVVNFKENURk9OVFNIQVBFR0xZUEhTKQotICAgICAgICAvLyBUaGVzZSAw IGdseXBocyBhcmUgbmVlZGVkIGJ5IHNoYXBlcnMgaWYgdGhlIHNvdXJjZSB0ZXh0IGhhcyBzdXJy b2dhdGUgcGFpcnMuCi0gICAgICAgIC8vIEhvd2V2ZXIsIENURm9udFRyYW5zZm9ybUdseXBocygp IGNhbid0IGRlbGV0ZSB0aGVzZSAwIGdseXBocyBmcm9tIHRoZSBzaGFwZWQgdGV4dCwKLSAgICAg ICAgLy8gc28gd2Ugc2hvdWxkbid0IGFkZCB0aGVtIGluIHRoZSBmaXJzdCBwbGFjZSBpZiB3ZSdy ZSB1c2luZyB0aGF0IHNoYXBpbmcgcm91dGluZS4KLSAgICAgICAgLy8gQW55IG90aGVyIHNoYXBp bmcgcm91dGluZSBzaG91bGQgZGVsZXRlIHRoZXNlIGdseXBocyBmcm9tIHRoZSBzaGFwZWQgdGV4 dC4KLSAgICAgICAgaWYgKCFVX0lTX0JNUChjaGFyYWN0ZXIpKQotICAgICAgICAgICAgZ2x5cGhC dWZmZXIuYWRkKDAsIGZvbnQsIDAsIGN1cnJlbnRDaGFyYWN0ZXJJbmRleCArIDEpOwotI2VuZGlm CisgICAgICAgIGFkZFRvR2x5cGhCdWZmZXIoZ2x5cGhCdWZmZXIsIGdseXBoLCBmb250LCB3aWR0 aCwgY3VycmVudENoYXJhY3RlckluZGV4LCBjaGFyYWN0ZXIpOwogCiAgICAgICAgIC8vIEFkdmFu Y2UgcGFzdCB0aGUgY2hhcmFjdGVyIHdlIGp1c3QgZGVhbHQgd2l0aC4KICAgICAgICAgdGV4dEl0 ZXJhdG9yLmFkdmFuY2UoYWR2YW5jZUxlbmd0aCk7CkBAIC0zMDgsNyArMzI1LDcgQEAgaW5saW5l IHZvaWQgV2lkdGhJdGVyYXRvcjo6YWR2YW5jZUludGVybmFsKFRleHRJdGVyYXRvciYgdGV4dEl0 ZXJhdG9yLCBHbHlwaEJ1ZmYKICAgICAgICAgfQogICAgIH0KIAotICAgIGNvbW1pdEN1cnJlbnRG b250UmFuZ2UoZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50LCBjdXJyZW50Q2hhcmFjdGVySW5k ZXgsICpsYXN0Rm9udERhdGEsIHByaW1hcnlGb250LCBjaGFyYWN0ZXIsIHdpZHRoT2ZDdXJyZW50 Rm9udFJhbmdlLCBjaGFyYWN0ZXJzVHJlYXRlZEFzU3BhY2UpOworICAgIGNvbW1pdEN1cnJlbnRG b250UmFuZ2UoZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50LCBjdXJyZW50Q2hhcmFjdGVySW5k ZXgsIGxhc3RGb250RGF0YSwgcHJpbWFyeUZvbnQsIHByaW1hcnlGb250LCBjaGFyYWN0ZXIsIHdp ZHRoT2ZDdXJyZW50Rm9udFJhbmdlLCB3aWR0aCwgY2hhcmFjdGVyc1RyZWF0ZWRBc1NwYWNlKTsK IH0KIAogYXV0byBXaWR0aEl0ZXJhdG9yOjpjYWxjdWxhdGVBZGRpdGlvbmFsV2lkdGgoR2x5cGhC dWZmZXImIGdseXBoQnVmZmVyLCBHbHlwaEJ1ZmZlclN0cmluZ09mZnNldCBjdXJyZW50Q2hhcmFj dGVySW5kZXgsIHVuc2lnbmVkIGxlYWRpbmdHbHlwaEluZGV4LCB1bnNpZ25lZCB0cmFpbGluZ0ds eXBoSW5kZXgsIGZsb2F0IHBvc2l0aW9uKSBjb25zdCAtPiBBZGRpdGlvbmFsV2lkdGgKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaAppbmRleCBm NjA2ZmEyMzI0OWE2YzExYWZmOWYwMzljYjI2OTY1OTdlNmVmZmVhLi44MDg1Y2I5ZGIxMzQxMzU0 ZWFjY2U4OWUxOWJhMWNlNzQxZWU3N2U5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCkBAIC02NCw3ICs2NCw3IEBAIHByaXZhdGU6CiAg ICAgZW51bSBjbGFzcyBUcmFuc2Zvcm1zVHlwZSB7IE5vbmUsIEZvcmNlZCwgTm90Rm9yY2VkIH07 CiAgICAgVHJhbnNmb3Jtc1R5cGUgc2hvdWxkQXBwbHlGb250VHJhbnNmb3Jtcyhjb25zdCBHbHlw aEJ1ZmZlciYsIHVuc2lnbmVkIGxhc3RHbHlwaENvdW50LCB1bnNpZ25lZCBjdXJyZW50Q2hhcmFj dGVySW5kZXgpIGNvbnN0OwogICAgIGZsb2F0IGFwcGx5Rm9udFRyYW5zZm9ybXMoR2x5cGhCdWZm ZXImLCB1bnNpZ25lZCBsYXN0R2x5cGhDb3VudCwgdW5zaWduZWQgY3VycmVudENoYXJhY3Rlcklu ZGV4LCBjb25zdCBGb250JiwgYm9vbCBmb3JjZSwgQ2hhcmFjdGVyc1RyZWF0ZWRBc1NwYWNlJik7 Ci0gICAgdm9pZCBjb21taXRDdXJyZW50Rm9udFJhbmdlKEdseXBoQnVmZmVyJiwgdW5zaWduZWQg bGFzdEdseXBoQ291bnQsIHVuc2lnbmVkIGN1cnJlbnRDaGFyYWN0ZXJJbmRleCwgY29uc3QgRm9u dCYsIGNvbnN0IEZvbnQmIHByaW1hcnlGb250LCBVQ2hhcjMyIGNoYXJhY3RlciwgZmxvYXQgd2lk dGhPZkN1cnJlbnRGb250UmFuZ2UsIENoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSYpOworICAgIHZv aWQgY29tbWl0Q3VycmVudEZvbnRSYW5nZShHbHlwaEJ1ZmZlciYsIHVuc2lnbmVkJiBsYXN0R2x5 cGhDb3VudCwgdW5zaWduZWQgY3VycmVudENoYXJhY3RlckluZGV4LCBjb25zdCBGb250KiYsIGNv bnN0IEZvbnQmIG5ld0ZvbnQsIGNvbnN0IEZvbnQmIHByaW1hcnlGb250LCBVQ2hhcjMyIGNoYXJh Y3RlciwgZmxvYXQmIHdpZHRoT2ZDdXJyZW50Rm9udFJhbmdlLCBmbG9hdCBuZXh0Q2hhcmFjdGVy V2lkdGgsIENoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSYpOwogCiAgICAgYm9vbCBoYXNFeHRyYVNw YWNpbmcoKSBjb25zdDsKICAgICB2b2lkIGFwcGx5RXh0cmFTcGFjaW5nQWZ0ZXJTaGFwaW5nKEds eXBoQnVmZmVyJiwgdW5zaWduZWQgY2hhcmFjdGVyU3RhcnRJbmRleCwgdW5zaWduZWQgZ2x5cGhC dWZmZXJTdGFydEluZGV4LCB1bnNpZ25lZCBjaGFyYWN0ZXJEZXN0aW5hdGlvbkluZGV4LCBmbG9h dCBzdGFydGluZ1J1bldpZHRoKTsK 435465 2021-08-12 19:08:39 -0700 2021-08-19 21:57:24 -0700 Patch bug-229064-20210812190838.patch text/plain 9862 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwOTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTEzMDk4YWY2N2M5YzY4 OGIzZjIwY2YzZmJmZDAwMTc5ZjM0NWE1OS4uM2RlNmFkYzQ0ZDM5NGEzY2EyMjhkZGU2MzU5YWQx MDIxMDNiOGVjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA4LTEyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgR2x5cGhCdWZm ZXIgY2FuIGJlY29tZSBpbmNvbnNpc3RlbnQgd2l0aCBpdHMgYmFja2luZyBzdHJpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTA2NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgc3BsaXQg b3V0IGZyb20gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTY0My4K KworICAgICAgICBCZWZvcmUgc2hhcGluZywgdGhlIGdseXBocyBpbiB0aGUgR2x5cGhCdWZmZXIg bmVlZCB0byBtYXRjaCBvbmUtdG8tb25lIHdpdGggY29kZSB1bml0cyBpbiB0aGUgc3RyaW5nLgor ICAgICAgICBXZSBpdGVyYXRlIG92ZXIgdGhlIHN0cmluZywgYWRkaW5nIGdseXBocyBpbnRvIHRo ZSBHbHlwaEJ1ZmZlciwgYnV0IHRoZXJlIHdhcyBvbmUgZWFybHkgImNvbnRpbnVlIgorICAgICAg ICBpbiB0aGUgbG9vcCB0aGF0IHNraXBzIHRoZSBhZGQoKSBjYWxsLgorCisgICAgICAgIEJlY2F1 c2UgdGhpcyBwYXRjaCBhZGRzIEFTU0VSVCgpcywgdGhpcyBpcyBhY3R1YWxseSBjb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVy YXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjpjb21taXRDdXJyZW50 Rm9udFJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OmFkZFRvR2x5cGhCdWZmZXIpOgorICAgICAg ICAoV2ViQ29yZTo6V2lkdGhJdGVyYXRvcjo6YWR2YW5jZUludGVybmFsKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmg6CisKIDIwMjEtMDgtMTEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICA8YSByZWw9Im9wZW5lciBub29wZW5l ciIgdGFyZ2V0PSJfYmxhbmsiPiBzaG91bGQgY3JlYXRlIGEgd2luZG93IHdpdGhvdXQgb3BlbmVy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJh dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3Iu Y3BwCmluZGV4IGI3Y2MwZmI1MjVmNjg1MjdjOTFjZTFhYmQ2M2UyNDQ3NDRlZjM3YmIuLmFjOTY1 M2FjYmZhOGM0YmJkZjQ4ZWZiZTg2OGZmNDUyNjJmZTY0MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwCkBAIC0xODYsMjQgKzE4 NiwzNCBAQCBzdGF0aWMgaW5saW5lIHN0ZDo6cGFpcjxib29sLCBib29sPiBleHBhbnNpb25Mb2Nh dGlvbihib29sIGlkZW9ncmFwaCwgYm9vbCB0cmVhdAogICAgIHJldHVybiBzdGQ6Om1ha2VfcGFp cihleHBhbmRMZWZ0LCBleHBhbmRSaWdodCk7CiB9CiAKLXZvaWQgV2lkdGhJdGVyYXRvcjo6Y29t bWl0Q3VycmVudEZvbnRSYW5nZShHbHlwaEJ1ZmZlciYgZ2x5cGhCdWZmZXIsIHVuc2lnbmVkIGxh c3RHbHlwaENvdW50LCB1bnNpZ25lZCBjdXJyZW50Q2hhcmFjdGVySW5kZXgsIGNvbnN0IEZvbnQm IGZvbnQsIGNvbnN0IEZvbnQmIHByaW1hcnlGb250LCBVQ2hhcjMyIGNoYXJhY3RlciwgZmxvYXQg d2lkdGhPZkN1cnJlbnRGb250UmFuZ2UsIENoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSYgY2hhcmFj dGVyc1RyZWF0ZWRBc1NwYWNlKQordm9pZCBXaWR0aEl0ZXJhdG9yOjpjb21taXRDdXJyZW50Rm9u dFJhbmdlKEdseXBoQnVmZmVyJiBnbHlwaEJ1ZmZlciwgdW5zaWduZWQmIGxhc3RHbHlwaENvdW50 LCB1bnNpZ25lZCBjdXJyZW50Q2hhcmFjdGVySW5kZXgsIGNvbnN0IEZvbnQqJiBmb250LCBjb25z dCBGb250JiBuZXdGb250LCBjb25zdCBGb250JiBwcmltYXJ5Rm9udCwgVUNoYXIzMiBjaGFyYWN0 ZXIsIGZsb2F0JiB3aWR0aE9mQ3VycmVudEZvbnRSYW5nZSwgZmxvYXQgbmV4dENoYXJhY3Rlcldp ZHRoLCBDaGFyYWN0ZXJzVHJlYXRlZEFzU3BhY2UmIGNoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSkK IHsKKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIEFTU0VSVChmb250KTsKKyAgICBmb3IgKHVuc2ln bmVkIGkgPSBsYXN0R2x5cGhDb3VudDsgaSA8IGdseXBoQnVmZmVyLnNpemUoKTsgKytpKQorICAg ICAgICBBU1NFUlQoJmdseXBoQnVmZmVyLmZvbnRBdChpKSA9PSBmb250KTsKKyNlbmRpZgorCiAg ICAgYXV0byB0cmFuc2Zvcm1zVHlwZSA9IHNob3VsZEFwcGx5Rm9udFRyYW5zZm9ybXMoZ2x5cGhC dWZmZXIsIGxhc3RHbHlwaENvdW50LCBjdXJyZW50Q2hhcmFjdGVySW5kZXgpOwogICAgIGlmICh0 cmFuc2Zvcm1zVHlwZSAhPSBUcmFuc2Zvcm1zVHlwZTo6Tm9uZSkKLSAgICAgICAgbV9ydW5XaWR0 aFNvRmFyICs9IGFwcGx5Rm9udFRyYW5zZm9ybXMoZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50 LCBjdXJyZW50Q2hhcmFjdGVySW5kZXgsIGZvbnQsIHRyYW5zZm9ybXNUeXBlID09IFRyYW5zZm9y bXNUeXBlOjpGb3JjZWQsIGNoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSk7CisgICAgICAgIG1fcnVu V2lkdGhTb0ZhciArPSBhcHBseUZvbnRUcmFuc2Zvcm1zKGdseXBoQnVmZmVyLCBsYXN0R2x5cGhD b3VudCwgY3VycmVudENoYXJhY3RlckluZGV4LCAqZm9udCwgdHJhbnNmb3Jtc1R5cGUgPT0gVHJh bnNmb3Jtc1R5cGU6OkZvcmNlZCwgY2hhcmFjdGVyc1RyZWF0ZWRBc1NwYWNlKTsKICAgICBtX2N1 cnJlbnRDaGFyYWN0ZXJJbmRleCA9IGN1cnJlbnRDaGFyYWN0ZXJJbmRleDsKIAotICAgIGlmICh3 aWR0aE9mQ3VycmVudEZvbnRSYW5nZSAmJiBtX2ZhbGxiYWNrRm9udHMgJiYgJmZvbnQgIT0gJnBy aW1hcnlGb250KSB7CisgICAgaWYgKHdpZHRoT2ZDdXJyZW50Rm9udFJhbmdlICYmIG1fZmFsbGJh Y2tGb250cyAmJiBmb250ICE9ICZwcmltYXJ5Rm9udCkgewogICAgICAgICAvLyBGSVhNRTogVGhp cyBkb2VzIGEgbGl0dGxlIGV4dHJhIHdvcmsgdGhhdCBjb3VsZCBiZSBhdm9pZGVkIGlmCiAgICAg ICAgIC8vIGdseXBoRGF0YUZvckNoYXJhY3RlcigpIHJldHVybmVkIHdoZXRoZXIgaXQgY2hvc2Ug dG8gdXNlIGEgc21hbGwgY2FwcyBmb250LgogICAgICAgICBpZiAoIW1fZm9udC5pc1NtYWxsQ2Fw cygpIHx8IGNoYXJhY3RlciA9PSB1X3RvdXBwZXIoY2hhcmFjdGVyKSkKLSAgICAgICAgICAgIG1f ZmFsbGJhY2tGb250cy0+YWRkKCZmb250KTsKKyAgICAgICAgICAgIG1fZmFsbGJhY2tGb250cy0+ YWRkKGZvbnQpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGF1dG8gZ2x5cGhGb250ID0g bV9mb250LmdseXBoRGF0YUZvckNoYXJhY3Rlcih1X3RvdXBwZXIoY2hhcmFjdGVyKSwgbV9ydW4u cnRsKCkpLmZvbnQ7CiAgICAgICAgICAgICBpZiAoZ2x5cGhGb250ICE9ICZwcmltYXJ5Rm9udCkK ICAgICAgICAgICAgICAgICBtX2ZhbGxiYWNrRm9udHMtPmFkZChnbHlwaEZvbnQpOwogICAgICAg ICB9CiAgICAgfQorCisgICAgbGFzdEdseXBoQ291bnQgPSBnbHlwaEJ1ZmZlci5zaXplKCk7Cisg ICAgZm9udCA9ICZuZXdGb250OworICAgIHdpZHRoT2ZDdXJyZW50Rm9udFJhbmdlID0gbmV4dENo YXJhY3RlcldpZHRoOwogfQogCiBib29sIFdpZHRoSXRlcmF0b3I6Omhhc0V4dHJhU3BhY2luZygp IGNvbnN0CkBAIC0yMTEsNiArMjIxLDIxIEBAIGJvb2wgV2lkdGhJdGVyYXRvcjo6aGFzRXh0cmFT cGFjaW5nKCkgY29uc3QKICAgICByZXR1cm4gKG1fZm9udC5sZXR0ZXJTcGFjaW5nKCkgfHwgbV9m b250LndvcmRTcGFjaW5nKCkgfHwgbV9leHBhbnNpb24pICYmICFtX3J1bi5zcGFjaW5nRGlzYWJs ZWQoKTsKIH0KIAorc3RhdGljIHZvaWQgYWRkVG9HbHlwaEJ1ZmZlcihHbHlwaEJ1ZmZlciYgZ2x5 cGhCdWZmZXIsIEdseXBoIGdseXBoLCBjb25zdCBGb250JiBmb250LCBmbG9hdCB3aWR0aCwgR2x5 cGhCdWZmZXJTdHJpbmdPZmZzZXQgY3VycmVudENoYXJhY3RlckluZGV4LCBVQ2hhcjMyIGNoYXJh Y3RlcikKK3sKKyAgICBnbHlwaEJ1ZmZlci5hZGQoZ2x5cGgsIGZvbnQsIHdpZHRoLCBjdXJyZW50 Q2hhcmFjdGVySW5kZXgpOworI2lmIFVTRShDVEZPTlRTSEFQRUdMWVBIUykKKyAgICAvLyBUaGVz ZSAwIGdseXBocyBhcmUgbmVlZGVkIGJ5IHNoYXBlcnMgaWYgdGhlIHNvdXJjZSB0ZXh0IGhhcyBz dXJyb2dhdGUgcGFpcnMuCisgICAgLy8gSG93ZXZlciwgQ1RGb250VHJhbnNmb3JtR2x5cGhzKCkg Y2FuJ3QgZGVsZXRlIHRoZXNlIDAgZ2x5cGhzIGZyb20gdGhlIHNoYXBlZCB0ZXh0LAorICAgIC8v IHNvIHdlIHNob3VsZG4ndCBhZGQgdGhlbSBpbiB0aGUgZmlyc3QgcGxhY2UgaWYgd2UncmUgdXNp bmcgdGhhdCBzaGFwaW5nIHJvdXRpbmUuCisgICAgLy8gQW55IG90aGVyIHNoYXBpbmcgcm91dGlu ZSBzaG91bGQgZGVsZXRlIHRoZXNlIGdseXBocyBmcm9tIHRoZSBzaGFwZWQgdGV4dC4KKyAgICBp ZiAoIVVfSVNfQk1QKGNoYXJhY3RlcikpCisgICAgICAgIGdseXBoQnVmZmVyLmFkZCgwLCBmb250 LCAwLCBjdXJyZW50Q2hhcmFjdGVySW5kZXggKyAxKTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFN KGNoYXJhY3Rlcik7CisjZW5kaWYKK30KKwogdGVtcGxhdGUgPHR5cGVuYW1lIFRleHRJdGVyYXRv cj4KIGlubGluZSB2b2lkIFdpZHRoSXRlcmF0b3I6OmFkdmFuY2VJbnRlcm5hbChUZXh0SXRlcmF0 b3ImIHRleHRJdGVyYXRvciwgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyKQogewpAQCAtMjUwLDYg KzI3NSwxMSBAQCBpbmxpbmUgdm9pZCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlSW50ZXJuYWwoVGV4 dEl0ZXJhdG9yJiB0ZXh0SXRlcmF0b3IsIEdseXBoQnVmZgogICAgICAgICBjb25zdCBHbHlwaERh dGEmIGdseXBoRGF0YSA9IG1fZm9udC5nbHlwaERhdGFGb3JDaGFyYWN0ZXIoY2hhcmFjdGVyLCBy dGwpOwogICAgICAgICBHbHlwaCBnbHlwaCA9IGdseXBoRGF0YS5nbHlwaDsKICAgICAgICAgaWYg KCFnbHlwaCAmJiAhY2hhcmFjdGVyTXVzdERyYXdTb21ldGhpbmcpIHsKKyAgICAgICAgICAgIGNv bW1pdEN1cnJlbnRGb250UmFuZ2UoZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50LCBjdXJyZW50 Q2hhcmFjdGVySW5kZXgsIGxhc3RGb250RGF0YSwgcHJpbWFyeUZvbnQsIHByaW1hcnlGb250LCBj aGFyYWN0ZXIsIHdpZHRoT2ZDdXJyZW50Rm9udFJhbmdlLCB3aWR0aCwgY2hhcmFjdGVyc1RyZWF0 ZWRBc1NwYWNlKTsKKworICAgICAgICAgICAgR2x5cGggZGVsZXRlZEdseXBoID0gMHhGRkZGOwor ICAgICAgICAgICAgYWRkVG9HbHlwaEJ1ZmZlcihnbHlwaEJ1ZmZlciwgZGVsZXRlZEdseXBoLCBw cmltYXJ5Rm9udCwgMCwgY3VycmVudENoYXJhY3RlckluZGV4LCBjaGFyYWN0ZXIpOworCiAgICAg ICAgICAgICB0ZXh0SXRlcmF0b3IuYWR2YW5jZShhZHZhbmNlTGVuZ3RoKTsKICAgICAgICAgICAg IGN1cnJlbnRDaGFyYWN0ZXJJbmRleCA9IHRleHRJdGVyYXRvci5jdXJyZW50SW5kZXgoKTsKICAg ICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMjU5LDEyICsyODksOSBAQCBpbmxpbmUgdm9pZCBXaWR0 aEl0ZXJhdG9yOjphZHZhbmNlSW50ZXJuYWwoVGV4dEl0ZXJhdG9yJiB0ZXh0SXRlcmF0b3IsIEds eXBoQnVmZgogICAgICAgICBwcmV2aW91c1dpZHRoID0gd2lkdGg7CiAgICAgICAgIHdpZHRoID0g Zm9udC53aWR0aEZvckdseXBoKGdseXBoKTsKIAotICAgICAgICBpZiAoJmZvbnQgIT0gbGFzdEZv bnREYXRhKSB7Ci0gICAgICAgICAgICBjb21taXRDdXJyZW50Rm9udFJhbmdlKGdseXBoQnVmZmVy LCBsYXN0R2x5cGhDb3VudCwgY3VycmVudENoYXJhY3RlckluZGV4LCAqbGFzdEZvbnREYXRhLCBw cmltYXJ5Rm9udCwgY2hhcmFjdGVyLCB3aWR0aE9mQ3VycmVudEZvbnRSYW5nZSwgY2hhcmFjdGVy c1RyZWF0ZWRBc1NwYWNlKTsKLSAgICAgICAgICAgIGxhc3RHbHlwaENvdW50ID0gZ2x5cGhCdWZm ZXIuc2l6ZSgpOwotICAgICAgICAgICAgbGFzdEZvbnREYXRhID0gJmZvbnQ7Ci0gICAgICAgICAg ICB3aWR0aE9mQ3VycmVudEZvbnRSYW5nZSA9IHdpZHRoOwotICAgICAgICB9IGVsc2UKKyAgICAg ICAgaWYgKCZmb250ICE9IGxhc3RGb250RGF0YSkKKyAgICAgICAgICAgIGNvbW1pdEN1cnJlbnRG b250UmFuZ2UoZ2x5cGhCdWZmZXIsIGxhc3RHbHlwaENvdW50LCBjdXJyZW50Q2hhcmFjdGVySW5k ZXgsIGxhc3RGb250RGF0YSwgZm9udCwgcHJpbWFyeUZvbnQsIGNoYXJhY3Rlciwgd2lkdGhPZkN1 cnJlbnRGb250UmFuZ2UsIHdpZHRoLCBjaGFyYWN0ZXJzVHJlYXRlZEFzU3BhY2UpOworICAgICAg ICBlbHNlCiAgICAgICAgICAgICB3aWR0aE9mQ3VycmVudEZvbnRSYW5nZSArPSB3aWR0aDsKIAog ICAgICAgICBhdXRvIHRyYW5zZm9ybXNUeXBlID0gc2hvdWxkQXBwbHlGb250VHJhbnNmb3Jtcyhn bHlwaEJ1ZmZlciwgbGFzdEdseXBoQ291bnQsIGN1cnJlbnRDaGFyYWN0ZXJJbmRleCk7CkBAIC0y ODUsMTUgKzMxMiw3IEBAIGlubGluZSB2b2lkIFdpZHRoSXRlcmF0b3I6OmFkdmFuY2VJbnRlcm5h bChUZXh0SXRlcmF0b3ImIHRleHRJdGVyYXRvciwgR2x5cGhCdWZmCiAgICAgICAgIGlmIChtX2Zv clRleHRFbXBoYXNpcyAmJiAhRm9udENhc2NhZGU6OmNhblJlY2VpdmVUZXh0RW1waGFzaXMoY2hh cmFjdGVyKSkKICAgICAgICAgICAgIGdseXBoID0gMDsKIAotICAgICAgICBnbHlwaEJ1ZmZlci5h ZGQoZ2x5cGgsIGZvbnQsIHdpZHRoLCBjdXJyZW50Q2hhcmFjdGVySW5kZXgpOwotI2lmIFVTRShD VEZPTlRTSEFQRUdMWVBIUykKLSAgICAgICAgLy8gVGhlc2UgMCBnbHlwaHMgYXJlIG5lZWRlZCBi eSBzaGFwZXJzIGlmIHRoZSBzb3VyY2UgdGV4dCBoYXMgc3Vycm9nYXRlIHBhaXJzLgotICAgICAg ICAvLyBIb3dldmVyLCBDVEZvbnRUcmFuc2Zvcm1HbHlwaHMoKSBjYW4ndCBkZWxldGUgdGhlc2Ug MCBnbHlwaHMgZnJvbSB0aGUgc2hhcGVkIHRleHQsCi0gICAgICAgIC8vIHNvIHdlIHNob3VsZG4n dCBhZGQgdGhlbSBpbiB0aGUgZmlyc3QgcGxhY2UgaWYgd2UncmUgdXNpbmcgdGhhdCBzaGFwaW5n IHJvdXRpbmUuCi0gICAgICAgIC8vIEFueSBvdGhlciBzaGFwaW5nIHJvdXRpbmUgc2hvdWxkIGRl bGV0ZSB0aGVzZSBnbHlwaHMgZnJvbSB0aGUgc2hhcGVkIHRleHQuCi0gICAgICAgIGlmICghVV9J U19CTVAoY2hhcmFjdGVyKSkKLSAgICAgICAgICAgIGdseXBoQnVmZmVyLmFkZCgwLCBmb250LCAw LCBjdXJyZW50Q2hhcmFjdGVySW5kZXggKyAxKTsKLSNlbmRpZgorICAgICAgICBhZGRUb0dseXBo QnVmZmVyKGdseXBoQnVmZmVyLCBnbHlwaCwgZm9udCwgd2lkdGgsIGN1cnJlbnRDaGFyYWN0ZXJJ bmRleCwgY2hhcmFjdGVyKTsKIAogICAgICAgICAvLyBBZHZhbmNlIHBhc3QgdGhlIGNoYXJhY3Rl ciB3ZSBqdXN0IGRlYWx0IHdpdGguCiAgICAgICAgIHRleHRJdGVyYXRvci5hZHZhbmNlKGFkdmFu Y2VMZW5ndGgpOwpAQCAtMzA4LDcgKzMyNyw3IEBAIGlubGluZSB2b2lkIFdpZHRoSXRlcmF0b3I6 OmFkdmFuY2VJbnRlcm5hbChUZXh0SXRlcmF0b3ImIHRleHRJdGVyYXRvciwgR2x5cGhCdWZmCiAg ICAgICAgIH0KICAgICB9CiAKLSAgICBjb21taXRDdXJyZW50Rm9udFJhbmdlKGdseXBoQnVmZmVy LCBsYXN0R2x5cGhDb3VudCwgY3VycmVudENoYXJhY3RlckluZGV4LCAqbGFzdEZvbnREYXRhLCBw cmltYXJ5Rm9udCwgY2hhcmFjdGVyLCB3aWR0aE9mQ3VycmVudEZvbnRSYW5nZSwgY2hhcmFjdGVy c1RyZWF0ZWRBc1NwYWNlKTsKKyAgICBjb21taXRDdXJyZW50Rm9udFJhbmdlKGdseXBoQnVmZmVy LCBsYXN0R2x5cGhDb3VudCwgY3VycmVudENoYXJhY3RlckluZGV4LCBsYXN0Rm9udERhdGEsIHBy aW1hcnlGb250LCBwcmltYXJ5Rm9udCwgY2hhcmFjdGVyLCB3aWR0aE9mQ3VycmVudEZvbnRSYW5n ZSwgd2lkdGgsIGNoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSk7CiB9CiAKIGF1dG8gV2lkdGhJdGVy YXRvcjo6Y2FsY3VsYXRlQWRkaXRpb25hbFdpZHRoKEdseXBoQnVmZmVyJiBnbHlwaEJ1ZmZlciwg R2x5cGhCdWZmZXJTdHJpbmdPZmZzZXQgY3VycmVudENoYXJhY3RlckluZGV4LCB1bnNpZ25lZCBs ZWFkaW5nR2x5cGhJbmRleCwgdW5zaWduZWQgdHJhaWxpbmdHbHlwaEluZGV4LCBmbG9hdCBwb3Np dGlvbikgY29uc3QgLT4gQWRkaXRpb25hbFdpZHRoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmgKaW5kZXggZjYwNmZhMjMyNDlhNmMxMWFmZjlm MDM5Y2IyNjk2NTk3ZTZlZmZlYS4uODA4NWNiOWRiMTM0MTM1NGVhY2NlODllMTliYTFjZTc0MWVl NzdlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJ dGVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRl cmF0b3IuaApAQCAtNjQsNyArNjQsNyBAQCBwcml2YXRlOgogICAgIGVudW0gY2xhc3MgVHJhbnNm b3Jtc1R5cGUgeyBOb25lLCBGb3JjZWQsIE5vdEZvcmNlZCB9OwogICAgIFRyYW5zZm9ybXNUeXBl IHNob3VsZEFwcGx5Rm9udFRyYW5zZm9ybXMoY29uc3QgR2x5cGhCdWZmZXImLCB1bnNpZ25lZCBs YXN0R2x5cGhDb3VudCwgdW5zaWduZWQgY3VycmVudENoYXJhY3RlckluZGV4KSBjb25zdDsKICAg ICBmbG9hdCBhcHBseUZvbnRUcmFuc2Zvcm1zKEdseXBoQnVmZmVyJiwgdW5zaWduZWQgbGFzdEds eXBoQ291bnQsIHVuc2lnbmVkIGN1cnJlbnRDaGFyYWN0ZXJJbmRleCwgY29uc3QgRm9udCYsIGJv b2wgZm9yY2UsIENoYXJhY3RlcnNUcmVhdGVkQXNTcGFjZSYpOwotICAgIHZvaWQgY29tbWl0Q3Vy cmVudEZvbnRSYW5nZShHbHlwaEJ1ZmZlciYsIHVuc2lnbmVkIGxhc3RHbHlwaENvdW50LCB1bnNp Z25lZCBjdXJyZW50Q2hhcmFjdGVySW5kZXgsIGNvbnN0IEZvbnQmLCBjb25zdCBGb250JiBwcmlt YXJ5Rm9udCwgVUNoYXIzMiBjaGFyYWN0ZXIsIGZsb2F0IHdpZHRoT2ZDdXJyZW50Rm9udFJhbmdl LCBDaGFyYWN0ZXJzVHJlYXRlZEFzU3BhY2UmKTsKKyAgICB2b2lkIGNvbW1pdEN1cnJlbnRGb250 UmFuZ2UoR2x5cGhCdWZmZXImLCB1bnNpZ25lZCYgbGFzdEdseXBoQ291bnQsIHVuc2lnbmVkIGN1 cnJlbnRDaGFyYWN0ZXJJbmRleCwgY29uc3QgRm9udComLCBjb25zdCBGb250JiBuZXdGb250LCBj b25zdCBGb250JiBwcmltYXJ5Rm9udCwgVUNoYXIzMiBjaGFyYWN0ZXIsIGZsb2F0JiB3aWR0aE9m Q3VycmVudEZvbnRSYW5nZSwgZmxvYXQgbmV4dENoYXJhY3RlcldpZHRoLCBDaGFyYWN0ZXJzVHJl YXRlZEFzU3BhY2UmKTsKIAogICAgIGJvb2wgaGFzRXh0cmFTcGFjaW5nKCkgY29uc3Q7CiAgICAg dm9pZCBhcHBseUV4dHJhU3BhY2luZ0FmdGVyU2hhcGluZyhHbHlwaEJ1ZmZlciYsIHVuc2lnbmVk IGNoYXJhY3RlclN0YXJ0SW5kZXgsIHVuc2lnbmVkIGdseXBoQnVmZmVyU3RhcnRJbmRleCwgdW5z aWduZWQgY2hhcmFjdGVyRGVzdGluYXRpb25JbmRleCwgZmxvYXQgc3RhcnRpbmdSdW5XaWR0aCk7 Cg==