248342 2022-11-25 05:46:02 -0800 [MQ4] Use FeatureSchema::ValueType as a single value instead of an OptionSet 2022-11-25 09:42:42 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 180234 1 koivisto koivisto eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim jer.noble macpherson menard philipj sergio webkit-bug-importer youssefdevelops y_soliman zalan oldest_to_newest 1914678 0 koivisto 2022-11-25 05:46:02 -0800 It simplifies the code. 1914679 1 webkit-bug-importer 2022-11-25 05:46:24 -0800 <rdar://problem/102666156> 1914682 2 463728 koivisto 2022-11-25 05:50:55 -0800 Created attachment 463728 Patch 1914701 3 ews-feeder 2022-11-25 09:42:39 -0800 Committed 257024@main (ca05c552b202): <https://commits.webkit.org/257024@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 463728. 463728 2022-11-25 05:50:55 -0800 2022-11-25 09:42:40 -0800 Patch bug-248342-20221125155054.patch text/plain 18013 koivisto RnJvbSA4MTYxMGQ2Y2VmYWEwNjhhNzFkNTRhYzQ4ZDVhYmQ3OTlkMjBmYmQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBGcmksIDI1IE5vdiAyMDIyIDE1OjQ2OjM1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gW01RNF0g VXNlIEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZSBhcyBhIHNpbmdsZSB2YWx1ZSBpbnN0ZWFkCiBv ZiBhbiBPcHRpb25TZXQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0 ODM0MgogcmRhcjovLzEwMjY2NjE1NgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpUaGlz IHNpbXBsaWZpZXMgdmFsaWRhdGVGZWF0dXJlQWdhaW5zdFNjaGVtYSgpLgoKKiBTb3VyY2UvV2Vi Q29yZS9jc3MvcXVlcnkvQ29udGFpbmVyUXVlcnlGZWF0dXJlcy5jcHA6CihXZWJDb3JlOjpDUTo6 RmVhdHVyZXM6OlNpemVGZWF0dXJlU2NoZW1hOjpTaXplRmVhdHVyZVNjaGVtYSk6CihXZWJDb3Jl OjpDUTo6RmVhdHVyZXM6OndpZHRoKToKKFdlYkNvcmU6OkNROjpGZWF0dXJlczo6aGVpZ2h0KToK KFdlYkNvcmU6OkNROjpGZWF0dXJlczo6aW5saW5lU2l6ZSk6CihXZWJDb3JlOjpDUTo6RmVhdHVy ZXM6OmJsb2NrU2l6ZSk6CihXZWJDb3JlOjpDUTo6RmVhdHVyZXM6OmFzcGVjdFJhdGlvKToKKFdl YkNvcmU6OkNROjpGZWF0dXJlczo6b3JpZW50YXRpb24pOgoqIFNvdXJjZS9XZWJDb3JlL2Nzcy9x dWVyeS9HZW5lcmljTWVkaWFRdWVyeUV2YWx1YXRvci5jcHA6CihXZWJDb3JlOjpNUTo6ZXZhbHVh dGVSYXRpb0NvbXBhcmlzb24pOgoqIFNvdXJjZS9XZWJDb3JlL2Nzcy9xdWVyeS9HZW5lcmljTWVk aWFRdWVyeVBhcnNlci5jcHA6CihXZWJDb3JlOjpNUTo6R2VuZXJpY01lZGlhUXVlcnlQYXJzZXJC YXNlOjp2YWxpZGF0ZUZlYXR1cmVBZ2FpbnN0U2NoZW1hKToKClNpbXBsaWZ5LiBBbHNvIGNvbnZl cnQgcmF0aW8gdmFsdWVzIGludG8gQ1NTQXNwZWN0UmF0aW9WYWx1ZSB0byBkZWFsIHdpdGgKdGhl IHNpbmdsZSBudW1iZXIgY2FzZSBjb3JyZWN0bHkgKHdoZXJlIGRlbm9taW5hdG9yIGlzIGltcGxp Y2l0IDEpLgoKKiBTb3VyY2UvV2ViQ29yZS9jc3MvcXVlcnkvR2VuZXJpY01lZGlhUXVlcnlUeXBl cy5oOgooV2ViQ29yZTo6TVE6OkZlYXR1cmVTY2hlbWE6OkZlYXR1cmVTY2hlbWEpOgoqIFNvdXJj ZS9XZWJDb3JlL2Nzcy9xdWVyeS9NZWRpYVF1ZXJ5RmVhdHVyZXMuY3BwOgooV2ViQ29yZTo6TVE6 OkZlYXR1cmVzOjpCb29sZWFuU2NoZW1hOjpCb29sZWFuU2NoZW1hKToKKFdlYkNvcmU6Ok1ROjpG ZWF0dXJlczo6SW50ZWdlclNjaGVtYTo6SW50ZWdlclNjaGVtYSk6CihXZWJDb3JlOjpNUTo6RmVh dHVyZXM6Ok51bWJlclNjaGVtYTo6TnVtYmVyU2NoZW1hKToKKFdlYkNvcmU6Ok1ROjpGZWF0dXJl czo6TGVuZ3RoU2NoZW1hOjpMZW5ndGhTY2hlbWEpOgooV2ViQ29yZTo6TVE6OkZlYXR1cmVzOjpS YXRpb1NjaGVtYTo6UmF0aW9TY2hlbWEpOgooV2ViQ29yZTo6TVE6OkZlYXR1cmVzOjpSZXNvbHV0 aW9uU2NoZW1hOjpSZXNvbHV0aW9uU2NoZW1hKToKKFdlYkNvcmU6Ok1ROjpGZWF0dXJlczo6SWRl bnRpZmllclNjaGVtYTo6SWRlbnRpZmllclNjaGVtYSk6CihXZWJDb3JlOjpNUTo6RmVhdHVyZXM6 OkJvb2xlYW5TY2hlbWE6OnZhbHVlRnVuY3Rpb24pOiBEZWxldGVkLgooV2ViQ29yZTo6TVE6OkZl YXR1cmVzOjpJbnRlZ2VyU2NoZW1hOjp2YWx1ZUZ1bmN0aW9uKTogRGVsZXRlZC4KKFdlYkNvcmU6 Ok1ROjpGZWF0dXJlczo6TnVtYmVyU2NoZW1hOjp2YWx1ZUZ1bmN0aW9uKTogRGVsZXRlZC4KKFdl YkNvcmU6Ok1ROjpGZWF0dXJlczo6TGVuZ3RoU2NoZW1hOjp2YWx1ZUZ1bmN0aW9uKTogRGVsZXRl ZC4KKFdlYkNvcmU6Ok1ROjpGZWF0dXJlczo6UmF0aW9TY2hlbWE6OnZhbHVlRnVuY3Rpb24pOiBE ZWxldGVkLgooV2ViQ29yZTo6TVE6OkZlYXR1cmVzOjpSZXNvbHV0aW9uU2NoZW1hOjp2YWx1ZUZ1 bmN0aW9uKTogRGVsZXRlZC4KKFdlYkNvcmU6Ok1ROjpGZWF0dXJlczo6SWRlbnRpZmllclNjaGVt YTo6dmFsdWVGdW5jdGlvbik6IERlbGV0ZWQuCi0tLQogLi4uL2Nzcy9xdWVyeS9Db250YWluZXJR dWVyeUZlYXR1cmVzLmNwcCAgICAgIHwgMTYgKystLS0KIC4uLi9jc3MvcXVlcnkvR2VuZXJpY01l ZGlhUXVlcnlFdmFsdWF0b3IuY3BwICB8IDE2ICsrLS0tCiAuLi4vY3NzL3F1ZXJ5L0dlbmVyaWNN ZWRpYVF1ZXJ5UGFyc2VyLmNwcCAgICAgfCA2NyArKysrKysrKysrKy0tLS0tLS0tCiAuLi4vY3Nz L3F1ZXJ5L0dlbmVyaWNNZWRpYVF1ZXJ5VHlwZXMuaCAgICAgICAgfCAxNCArKy0tCiAuLi4vV2Vi Q29yZS9jc3MvcXVlcnkvTWVkaWFRdWVyeUZlYXR1cmVzLmNwcCAgfCAxNCArKy0tCiA1IGZpbGVz IGNoYW5nZWQsIDYxIGluc2VydGlvbnMoKyksIDY2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9xdWVyeS9Db250YWluZXJRdWVyeUZlYXR1cmVzLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9xdWVyeS9Db250YWluZXJRdWVyeUZlYXR1cmVzLmNwcAppbmRleCA0 ODBlODU2MGI0M2EuLmIzM2Y5Mzg5YjdhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L3F1ZXJ5L0NvbnRhaW5lclF1ZXJ5RmVhdHVyZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9xdWVyeS9Db250YWluZXJRdWVyeUZlYXR1cmVzLmNwcApAQCAtMzQsOCArMzQsOCBAQCBuYW1l c3BhY2UgV2ViQ29yZTo6Q1E6OkZlYXR1cmVzIHsKIHVzaW5nIG5hbWVzcGFjZSBNUTsKIAogc3Ry dWN0IFNpemVGZWF0dXJlU2NoZW1hIDogcHVibGljIEZlYXR1cmVTY2hlbWEgewotICAgIFNpemVG ZWF0dXJlU2NoZW1hKGNvbnN0IEF0b21TdHJpbmcmIG5hbWUsIFR5cGUgdHlwZSwgT3B0aW9uU2V0 PFZhbHVlVHlwZT4gdmFsdWVUeXBlcywgVmVjdG9yPENTU1ZhbHVlSUQ+JiYgdmFsdWVJZGVudGlm aWVycyA9IHsgfSkKLSAgICAgICAgOiBGZWF0dXJlU2NoZW1hKG5hbWUsIHR5cGUsIHZhbHVlVHlw ZXMsIFdURk1vdmUodmFsdWVJZGVudGlmaWVycykpCisgICAgU2l6ZUZlYXR1cmVTY2hlbWEoY29u c3QgQXRvbVN0cmluZyYgbmFtZSwgVHlwZSB0eXBlLCBWYWx1ZVR5cGUgdmFsdWVUeXBlLCBWZWN0 b3I8Q1NTVmFsdWVJRD4mJiB2YWx1ZUlkZW50aWZpZXJzID0geyB9KQorICAgICAgICA6IEZlYXR1 cmVTY2hlbWEobmFtZSwgdHlwZSwgdmFsdWVUeXBlLCBXVEZNb3ZlKHZhbHVlSWRlbnRpZmllcnMp KQogICAgIHsgfQogCiAgICAgRXZhbHVhdGlvblJlc3VsdCBldmFsdWF0ZShjb25zdCBNUTo6RmVh dHVyZSYgZmVhdHVyZSwgY29uc3QgRmVhdHVyZUV2YWx1YXRpb25Db250ZXh0JiBjb250ZXh0KSBj b25zdCBvdmVycmlkZQpAQCAtNzYsNyArNzYsNyBAQCBjb25zdCBGZWF0dXJlU2NoZW1hJiB3aWR0 aCgpCiB7CiAgICAgc3RydWN0IFNjaGVtYSA6IHB1YmxpYyBTaXplRmVhdHVyZVNjaGVtYSB7CiAg ICAgICAgIFNjaGVtYSgpCi0gICAgICAgICAgICA6IFNpemVGZWF0dXJlU2NoZW1hKCJ3aWR0aCJf cywgRmVhdHVyZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIHsgRmVhdHVyZVNjaGVtYTo6VmFsdWVUeXBl OjpMZW5ndGggfSApCisgICAgICAgICAgICA6IFNpemVGZWF0dXJlU2NoZW1hKCJ3aWR0aCJfcywg RmVhdHVyZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6TGVu Z3RoKQogICAgICAgICB7IH0KIAogICAgICAgICBFdmFsdWF0aW9uUmVzdWx0IGV2YWx1YXRlKGNv bnN0IE1ROjpGZWF0dXJlJiBmZWF0dXJlLCBjb25zdCBSZW5kZXJCb3gmIHJlbmRlcmVyLCBjb25z dCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiBjb252ZXJzaW9uRGF0YSkgY29uc3Qgb3ZlcnJp ZGUKQEAgLTkzLDcgKzkzLDcgQEAgY29uc3QgRmVhdHVyZVNjaGVtYSYgaGVpZ2h0KCkKIHsKICAg ICBzdHJ1Y3QgU2NoZW1hIDogcHVibGljIFNpemVGZWF0dXJlU2NoZW1hIHsKICAgICAgICAgU2No ZW1hKCkKLSAgICAgICAgICAgIDogU2l6ZUZlYXR1cmVTY2hlbWEoImhlaWdodCJfcywgRmVhdHVy ZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIHsgRmVhdHVyZVNjaGVtYTo6VmFsdWVUeXBlOjpMZW5ndGgg fSApCisgICAgICAgICAgICA6IFNpemVGZWF0dXJlU2NoZW1hKCJoZWlnaHQiX3MsIEZlYXR1cmVT Y2hlbWE6OlR5cGU6OlJhbmdlLCBGZWF0dXJlU2NoZW1hOjpWYWx1ZVR5cGU6Okxlbmd0aCkKICAg ICAgICAgeyB9CiAKICAgICAgICAgRXZhbHVhdGlvblJlc3VsdCBldmFsdWF0ZShjb25zdCBNUTo6 RmVhdHVyZSYgZmVhdHVyZSwgY29uc3QgUmVuZGVyQm94JiByZW5kZXJlciwgY29uc3QgQ1NTVG9M ZW5ndGhDb252ZXJzaW9uRGF0YSYgY29udmVyc2lvbkRhdGEpIGNvbnN0IG92ZXJyaWRlCkBAIC0x MTAsNyArMTEwLDcgQEAgY29uc3QgRmVhdHVyZVNjaGVtYSYgaW5saW5lU2l6ZSgpCiB7CiAgICAg c3RydWN0IFNjaGVtYSA6IHB1YmxpYyBTaXplRmVhdHVyZVNjaGVtYSB7CiAgICAgICAgIFNjaGVt YSgpCi0gICAgICAgICAgICA6IFNpemVGZWF0dXJlU2NoZW1hKCJpbmxpbmUtc2l6ZSJfcywgRmVh dHVyZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIHsgRmVhdHVyZVNjaGVtYTo6VmFsdWVUeXBlOjpMZW5n dGggfSApCisgICAgICAgICAgICA6IFNpemVGZWF0dXJlU2NoZW1hKCJpbmxpbmUtc2l6ZSJfcywg RmVhdHVyZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6TGVu Z3RoKQogICAgICAgICB7IH0KIAogICAgICAgICBFdmFsdWF0aW9uUmVzdWx0IGV2YWx1YXRlKGNv bnN0IE1ROjpGZWF0dXJlJiBmZWF0dXJlLCBjb25zdCBSZW5kZXJCb3gmIHJlbmRlcmVyLCBjb25z dCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiBjb252ZXJzaW9uRGF0YSkgY29uc3Qgb3ZlcnJp ZGUKQEAgLTEyNyw3ICsxMjcsNyBAQCBjb25zdCBGZWF0dXJlU2NoZW1hJiBibG9ja1NpemUoKQog ewogICAgIHN0cnVjdCBTY2hlbWEgOiBwdWJsaWMgU2l6ZUZlYXR1cmVTY2hlbWEgewogICAgICAg ICBTY2hlbWEoKQotICAgICAgICAgICAgOiBTaXplRmVhdHVyZVNjaGVtYSgiYmxvY2stc2l6ZSJf cywgRmVhdHVyZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIHsgRmVhdHVyZVNjaGVtYTo6VmFsdWVUeXBl OjpMZW5ndGggfSApCisgICAgICAgICAgICA6IFNpemVGZWF0dXJlU2NoZW1hKCJibG9jay1zaXpl Il9zLCBGZWF0dXJlU2NoZW1hOjpUeXBlOjpSYW5nZSwgRmVhdHVyZVNjaGVtYTo6VmFsdWVUeXBl OjpMZW5ndGgpCiAgICAgICAgIHsgfQogCiAgICAgICAgIEV2YWx1YXRpb25SZXN1bHQgZXZhbHVh dGUoY29uc3QgTVE6OkZlYXR1cmUmIGZlYXR1cmUsIGNvbnN0IFJlbmRlckJveCYgcmVuZGVyZXIs IGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcnNpb25EYXRhKSBjb25zdCBv dmVycmlkZQpAQCAtMTQ0LDcgKzE0NCw3IEBAIGNvbnN0IEZlYXR1cmVTY2hlbWEmIGFzcGVjdFJh dGlvKCkKIHsKICAgICBzdHJ1Y3QgU2NoZW1hIDogcHVibGljIFNpemVGZWF0dXJlU2NoZW1hIHsK ICAgICAgICAgU2NoZW1hKCkKLSAgICAgICAgICAgIDogU2l6ZUZlYXR1cmVTY2hlbWEoImFzcGVj dC1yYXRpbyJfcywgRmVhdHVyZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIHsgRmVhdHVyZVNjaGVtYTo6 VmFsdWVUeXBlOjpSYXRpbyB9ICkKKyAgICAgICAgICAgIDogU2l6ZUZlYXR1cmVTY2hlbWEoImFz cGVjdC1yYXRpbyJfcywgRmVhdHVyZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIEZlYXR1cmVTY2hlbWE6 OlZhbHVlVHlwZTo6UmF0aW8pCiAgICAgICAgIHsgfQogCiAgICAgICAgIEV2YWx1YXRpb25SZXN1 bHQgZXZhbHVhdGUoY29uc3QgTVE6OkZlYXR1cmUmIGZlYXR1cmUsIGNvbnN0IFJlbmRlckJveCYg cmVuZGVyZXIsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmKSBjb25zdCBvdmVycmlk ZQpAQCAtMTYyLDcgKzE2Miw3IEBAIGNvbnN0IEZlYXR1cmVTY2hlbWEmIG9yaWVudGF0aW9uKCkK IHsKICAgICBzdHJ1Y3QgU2NoZW1hIDogcHVibGljIFNpemVGZWF0dXJlU2NoZW1hIHsKICAgICAg ICAgU2NoZW1hKCkKLSAgICAgICAgICAgIDogU2l6ZUZlYXR1cmVTY2hlbWEoIm9yaWVudGF0aW9u Il9zLCBGZWF0dXJlU2NoZW1hOjpUeXBlOjpEaXNjcmV0ZSwgeyB9LCB7IENTU1ZhbHVlUG9ydHJh aXQsIENTU1ZhbHVlTGFuZHNjYXBlIH0pCisgICAgICAgICAgICA6IFNpemVGZWF0dXJlU2NoZW1h KCJvcmllbnRhdGlvbiJfcywgRmVhdHVyZVNjaGVtYTo6VHlwZTo6RGlzY3JldGUsIEZlYXR1cmVT Y2hlbWE6OlZhbHVlVHlwZTo6SWRlbnRpZmllciwgeyBDU1NWYWx1ZVBvcnRyYWl0LCBDU1NWYWx1 ZUxhbmRzY2FwZSB9KQogICAgICAgICB7IH0KIAogICAgICAgICBFdmFsdWF0aW9uUmVzdWx0IGV2 YWx1YXRlKGNvbnN0IE1ROjpGZWF0dXJlJiBmZWF0dXJlLCBjb25zdCBSZW5kZXJCb3gmIHJlbmRl cmVyLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJikgY29uc3Qgb3ZlcnJpZGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9xdWVyeS9HZW5lcmljTWVkaWFRdWVyeUV2YWx1 YXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcXVlcnkvR2VuZXJpY01lZGlhUXVlcnlFdmFs dWF0b3IuY3BwCmluZGV4IDY0ZjlkYzQ5OTlhOS4uOTFmYTBkZDYwYmU5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvcXVlcnkvR2VuZXJpY01lZGlhUXVlcnlFdmFsdWF0b3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9xdWVyeS9HZW5lcmljTWVkaWFRdWVyeUV2YWx1YXRvci5j cHAKQEAgLTI1LDYgKzI1LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJHZW5l cmljTWVkaWFRdWVyeUV2YWx1YXRvci5oIgogCisjaW5jbHVkZSAiQ1NTQXNwZWN0UmF0aW9WYWx1 ZS5oIgogI2luY2x1ZGUgIkNTU1ByaW1pdGl2ZVZhbHVlLmgiCiAjaW5jbHVkZSAiQ1NTVG9MZW5n dGhDb252ZXJzaW9uRGF0YS5oIgogI2luY2x1ZGUgIkNTU1ZhbHVlTGlzdC5oIgpAQCAtMTM4LDIw ICsxMzksMTEgQEAgc3RhdGljIEV2YWx1YXRpb25SZXN1bHQgZXZhbHVhdGVSYXRpb0NvbXBhcmlz b24oZG91YmxlIHJhdGlvLCBjb25zdCBzdGQ6Om9wdGlvbmEKICAgICBpZiAoIWNvbXBhcmlzb24p CiAgICAgICAgIHJldHVybiBFdmFsdWF0aW9uUmVzdWx0OjpUcnVlOwogCi0gICAgaWYgKCFpczxD U1NWYWx1ZUxpc3Q+KGNvbXBhcmlzb24tPnZhbHVlKSkKKyAgICBpZiAoIWlzPENTU0FzcGVjdFJh dGlvVmFsdWU+KGNvbXBhcmlzb24tPnZhbHVlKSkKICAgICAgICAgcmV0dXJuIEV2YWx1YXRpb25S ZXN1bHQ6OlVua25vd247CiAKLSAgICBhdXRvJiByYXRpb0xpc3QgPSBkb3duY2FzdDxDU1NWYWx1 ZUxpc3Q+KCpjb21wYXJpc29uLT52YWx1ZSk7Ci0gICAgaWYgKHJhdGlvTGlzdC5sZW5ndGgoKSAh PSAyKQotICAgICAgICByZXR1cm4gRXZhbHVhdGlvblJlc3VsdDo6VW5rbm93bjsKLQotICAgIGF1 dG8gZmlyc3QgPSBkeW5hbWljRG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KHJhdGlvTGlzdC5p dGVtKDApKTsKLSAgICBhdXRvIHNlY29uZCA9IGR5bmFtaWNEb3duY2FzdDxDU1NQcmltaXRpdmVW YWx1ZT4ocmF0aW9MaXN0Lml0ZW0oMSkpOwotCi0gICAgaWYgKCFmaXJzdCB8fCAhc2Vjb25kIHx8 ICFmaXJzdC0+aXNOdW1iZXJPckludGVnZXIoKSB8fCAhc2Vjb25kLT5pc051bWJlck9ySW50ZWdl cigpKQotICAgICAgICByZXR1cm4gRXZhbHVhdGlvblJlc3VsdDo6VW5rbm93bjsKLQotICAgIGF1 dG8gZXhwcmVzc2lvblJhdGlvID0gZmlyc3QtPmRvdWJsZVZhbHVlKCkgLyBzZWNvbmQtPmRvdWJs ZVZhbHVlKCk7CisgICAgYXV0byYgcmF0aW9WYWx1ZSA9IGRvd25jYXN0PENTU0FzcGVjdFJhdGlv VmFsdWU+KCpjb21wYXJpc29uLT52YWx1ZSk7CisgICAgYXV0byBleHByZXNzaW9uUmF0aW8gPSBy YXRpb1ZhbHVlLm51bWVyYXRvclZhbHVlKCkgLyByYXRpb1ZhbHVlLmRlbm9taW5hdG9yVmFsdWUo KTsKIAogICAgIGF1dG8gbGVmdCA9IHNpZGUgPT0gU2lkZTo6TGVmdCA/IGV4cHJlc3Npb25SYXRp byA6IHJhdGlvOwogICAgIGF1dG8gcmlnaHQgPSBzaWRlID09IFNpZGU6OkxlZnQgPyByYXRpbyA6 IGV4cHJlc3Npb25SYXRpbzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9xdWVyeS9H ZW5lcmljTWVkaWFRdWVyeVBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcXVlcnkvR2Vu ZXJpY01lZGlhUXVlcnlQYXJzZXIuY3BwCmluZGV4IDEwN2E0MGExOWU3OC4uNWFlMjE2N2E3NWE1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcXVlcnkvR2VuZXJpY01lZGlhUXVlcnlQ YXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9xdWVyeS9HZW5lcmljTWVkaWFRdWVy eVBhcnNlci5jcHAKQEAgLTI1LDYgKzI1LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJHZW5lcmljTWVkaWFRdWVyeVBhcnNlci5oIgogCisjaW5jbHVkZSAiQ1NTQXNwZWN0UmF0 aW9WYWx1ZS5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5UGFyc2VySGVscGVycy5oIgogI2luY2x1 ZGUgIkNTU1ZhbHVlLmgiCiAjaW5jbHVkZSAiTWVkaWFRdWVyeVBhcnNlckNvbnRleHQuaCIKQEAg LTIxNSwzOCArMjE2LDQ2IEBAIFJlZlB0cjxDU1NWYWx1ZT4gR2VuZXJpY01lZGlhUXVlcnlQYXJz ZXJCYXNlOjpjb25zdW1lVmFsdWUoQ1NTUGFyc2VyVG9rZW5SYW5nZSYKIAogYm9vbCBHZW5lcmlj TWVkaWFRdWVyeVBhcnNlckJhc2U6OnZhbGlkYXRlRmVhdHVyZUFnYWluc3RTY2hlbWEoRmVhdHVy ZSYgZmVhdHVyZSwgY29uc3QgRmVhdHVyZVNjaGVtYSYgc2NoZW1hKQogewotICAgIGF1dG8gdmFs dWVUeXBlRm9yVmFsdWUgPSBbXShhdXRvJiB2YWx1ZSkgLT4gc3RkOjpvcHRpb25hbDxGZWF0dXJl U2NoZW1hOjpWYWx1ZVR5cGU+IHsKLSAgICAgICAgaWYgKHZhbHVlLmlzSW50ZWdlcigpKQotICAg ICAgICAgICAgcmV0dXJuIEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6SW50ZWdlcjsKLSAgICAg ICAgaWYgKHZhbHVlLmlzTnVtYmVyKCkpCi0gICAgICAgICAgICByZXR1cm4gRmVhdHVyZVNjaGVt YTo6VmFsdWVUeXBlOjpOdW1iZXI7Ci0gICAgICAgIGlmICh2YWx1ZS5pc0xlbmd0aCgpKQotICAg ICAgICAgICAgcmV0dXJuIEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6TGVuZ3RoOwotICAgICAg ICBpZiAodmFsdWUuaXNSZXNvbHV0aW9uKCkpCi0gICAgICAgICAgICByZXR1cm4gRmVhdHVyZVNj aGVtYTo6VmFsdWVUeXBlOjpSZXNvbHV0aW9uOwotICAgICAgICByZXR1cm4geyB9OwotICAgIH07 Ci0KICAgICBhdXRvIHZhbGlkYXRlVmFsdWUgPSBbJl0oYXV0byYgdmFsdWUpIHsKLSAgICAgICAg aWYgKGF1dG8qIHByaW1pdGl2ZVZhbHVlID0gZHluYW1pY0Rvd25jYXN0PENTU1ByaW1pdGl2ZVZh bHVlPih2YWx1ZSkpIHsKLSAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNWYWx1ZUlE KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHNjaGVtYS52YWx1ZUlkZW50aWZpZXJzLmNvbnRh aW5zKHByaW1pdGl2ZVZhbHVlLT52YWx1ZUlEKCkpOworICAgICAgICBhdXRvKiBwcmltaXRpdmVW YWx1ZSA9IGR5bmFtaWNEb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4odmFsdWUuZ2V0KCkpOwor ICAgICAgICBzd2l0Y2ggKHNjaGVtYS52YWx1ZVR5cGUpIHsKKyAgICAgICAgY2FzZSBGZWF0dXJl U2NoZW1hOjpWYWx1ZVR5cGU6OkludGVnZXI6CisgICAgICAgICAgICByZXR1cm4gcHJpbWl0aXZl VmFsdWUgJiYgcHJpbWl0aXZlVmFsdWUtPmlzSW50ZWdlcigpOwogCi0gICAgICAgICAgICBpZiAo cHJpbWl0aXZlVmFsdWUtPmlzSW50ZWdlcigpICYmICFwcmltaXRpdmVWYWx1ZS0+aW50VmFsdWUo KSAmJiBzY2hlbWEudmFsdWVUeXBlcy5jb250YWlucyhGZWF0dXJlU2NoZW1hOjpWYWx1ZVR5cGU6 Okxlbmd0aCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGNhc2UgRmVh dHVyZVNjaGVtYTo6VmFsdWVUeXBlOjpOdW1iZXI6CisgICAgICAgICAgICByZXR1cm4gcHJpbWl0 aXZlVmFsdWUgJiYgcHJpbWl0aXZlVmFsdWUtPmlzTnVtYmVyT3JJbnRlZ2VyKCk7CiAKLSAgICAg ICAgICAgIGF1dG8gdmFsdWVUeXBlID0gdmFsdWVUeXBlRm9yVmFsdWUoKnByaW1pdGl2ZVZhbHVl KTsKLSAgICAgICAgICAgIHJldHVybiB2YWx1ZVR5cGUgJiYgc2NoZW1hLnZhbHVlVHlwZXMuY29u dGFpbnMoKnZhbHVlVHlwZSk7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGF1dG8qIGxpc3QgPSBk eW5hbWljRG93bmNhc3Q8Q1NTVmFsdWVMaXN0Pih2YWx1ZSkpIHsKLSAgICAgICAgICAgIGlmICgh c2NoZW1hLnZhbHVlVHlwZXMuY29udGFpbnMoRmVhdHVyZVNjaGVtYTo6VmFsdWVUeXBlOjpSYXRp bykpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgaWYgKGxpc3Qt Pmxlbmd0aCgpICE9IDIgfHwgbGlzdC0+c2VwYXJhdG9yKCkgIT0gQ1NTVmFsdWU6OlNsYXNoU2Vw YXJhdG9yKQorICAgICAgICBjYXNlIEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6TGVuZ3RoOgor ICAgICAgICAgICAgaWYgKCFwcmltaXRpdmVWYWx1ZSkKICAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgICAgICAgICBhdXRvIGZpcnN0ID0gZHluYW1pY0Rvd25jYXN0PENTU1ByaW1p dGl2ZVZhbHVlPihsaXN0LT5pdGVtKDApKTsKLSAgICAgICAgICAgIGF1dG8gc2Vjb25kID0gZHlu YW1pY0Rvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihsaXN0LT5pdGVtKDEpKTsKLSAgICAgICAg ICAgIHJldHVybiBmaXJzdCAmJiBzZWNvbmQgJiYgZmlyc3QtPmlzTnVtYmVyT3JJbnRlZ2VyKCkg JiYgc2Vjb25kLT5pc051bWJlck9ySW50ZWdlcigpOworICAgICAgICAgICAgaWYgKHByaW1pdGl2 ZVZhbHVlLT5pc0ludGVnZXIoKSAmJiAhcHJpbWl0aXZlVmFsdWUtPmludFZhbHVlKCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICByZXR1cm4gcHJpbWl0aXZlVmFs dWUtPmlzTGVuZ3RoKCk7CisKKyAgICAgICAgY2FzZSBGZWF0dXJlU2NoZW1hOjpWYWx1ZVR5cGU6 OlJlc29sdXRpb246CisgICAgICAgICAgICByZXR1cm4gcHJpbWl0aXZlVmFsdWUgJiYgcHJpbWl0 aXZlVmFsdWUtPmlzUmVzb2x1dGlvbigpOworCisgICAgICAgIGNhc2UgRmVhdHVyZVNjaGVtYTo6 VmFsdWVUeXBlOjpJZGVudGlmaWVyOgorICAgICAgICAgICAgcmV0dXJuIHByaW1pdGl2ZVZhbHVl ICYmIHByaW1pdGl2ZVZhbHVlLT5pc1ZhbHVlSUQoKSAmJiBzY2hlbWEudmFsdWVJZGVudGlmaWVy cy5jb250YWlucyhwcmltaXRpdmVWYWx1ZS0+dmFsdWVJRCgpKTsKKworICAgICAgICBjYXNlIEZl YXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6UmF0aW86CisgICAgICAgICAgICBpZiAocHJpbWl0aXZl VmFsdWUgJiYgcHJpbWl0aXZlVmFsdWUtPmlzTnVtYmVyT3JJbnRlZ2VyKCkpIHsKKyAgICAgICAg ICAgICAgICB2YWx1ZSA9IENTU0FzcGVjdFJhdGlvVmFsdWU6OmNyZWF0ZShwcmltaXRpdmVWYWx1 ZS0+ZmxvYXRWYWx1ZSgpLCAxKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIGlmIChhdXRvKiBsaXN0ID0gZHluYW1pY0Rvd25jYXN0PENT U1ZhbHVlTGlzdD4odmFsdWUuZ2V0KCkpKSB7CisgICAgICAgICAgICAgICAgaWYgKGxpc3QtPmxl bmd0aCgpICE9IDIgfHwgbGlzdC0+c2VwYXJhdG9yKCkgIT0gQ1NTVmFsdWU6OlNsYXNoU2VwYXJh dG9yKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgICAg YXV0byBmaXJzdCA9IGR5bmFtaWNEb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4obGlzdC0+aXRl bSgwKSk7CisgICAgICAgICAgICAgICAgYXV0byBzZWNvbmQgPSBkeW5hbWljRG93bmNhc3Q8Q1NT UHJpbWl0aXZlVmFsdWU+KGxpc3QtPml0ZW0oMSkpOworICAgICAgICAgICAgICAgIGlmIChmaXJz dCAmJiBzZWNvbmQgJiYgZmlyc3QtPmlzTnVtYmVyT3JJbnRlZ2VyKCkgJiYgc2Vjb25kLT5pc051 bWJlck9ySW50ZWdlcigpKSB7CisgICAgICAgICAgICAgICAgICAgIHZhbHVlID0gQ1NTQXNwZWN0 UmF0aW9WYWx1ZTo6Y3JlYXRlKGZpcnN0LT5mbG9hdFZhbHVlKCksIHNlY29uZC0+ZmxvYXRWYWx1 ZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9Cisg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg fTsKIApAQCAtMjU5LDExICsyNjgsMTEgQEAgYm9vbCBHZW5lcmljTWVkaWFRdWVyeVBhcnNlckJh c2U6OnZhbGlkYXRlRmVhdHVyZUFnYWluc3RTY2hlbWEoRmVhdHVyZSYgZmVhdHVyZSwKICAgICAg ICAgfQogCiAgICAgICAgIGlmIChmZWF0dXJlLmxlZnRDb21wYXJpc29uKSB7Ci0gICAgICAgICAg ICBpZiAoIXZhbGlkYXRlVmFsdWUoKmZlYXR1cmUubGVmdENvbXBhcmlzb24tPnZhbHVlKSkKKyAg ICAgICAgICAgIGlmICghdmFsaWRhdGVWYWx1ZShmZWF0dXJlLmxlZnRDb21wYXJpc29uLT52YWx1 ZSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgICAgIGlm IChmZWF0dXJlLnJpZ2h0Q29tcGFyaXNvbikgewotICAgICAgICAgICAgaWYgKCF2YWxpZGF0ZVZh bHVlKCpmZWF0dXJlLnJpZ2h0Q29tcGFyaXNvbi0+dmFsdWUpKQorICAgICAgICAgICAgaWYgKCF2 YWxpZGF0ZVZhbHVlKGZlYXR1cmUucmlnaHRDb21wYXJpc29uLT52YWx1ZSkpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiB0cnVlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3F1ZXJ5L0dlbmVyaWNNZWRpYVF1ZXJ5VHlwZXMu aCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9xdWVyeS9HZW5lcmljTWVkaWFRdWVyeVR5cGVzLmgKaW5k ZXggYzE4OWQ2NjIwNzJhLi43ZTZiMGEwYWI3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9xdWVyeS9HZW5lcmljTWVkaWFRdWVyeVR5cGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL3F1ZXJ5L0dlbmVyaWNNZWRpYVF1ZXJ5VHlwZXMuaApAQCAtODEsMjUgKzgxLDE5IEBAIHN0 cnVjdCBGZWF0dXJlU2NoZW1hIHsKICAgICBXVEZfTUFLRV9TVFJVQ1RfRkFTVF9BTExPQ0FURUQ7 CiAKICAgICBlbnVtIGNsYXNzIFR5cGUgOiB1aW50OF90IHsgRGlzY3JldGUsIFJhbmdlIH07Ci0g ICAgZW51bSBjbGFzcyBWYWx1ZVR5cGUgOiB1aW50OF90IHsKLSAgICAgICAgSW50ZWdlciA9ICAg ICAgIDEgPDwgMCwKLSAgICAgICAgTnVtYmVyID0gICAgICAgIDEgPDwgMSwKLSAgICAgICAgTGVu Z3RoID0gICAgICAgIDEgPDwgMiwKLSAgICAgICAgUmF0aW8gPSAgICAgICAgIDEgPDwgMywKLSAg ICAgICAgUmVzb2x1dGlvbiA9ICAgIDEgPDwgNCwKLSAgICB9OworICAgIGVudW0gY2xhc3MgVmFs dWVUeXBlIDogdWludDhfdCB7IEludGVnZXIsIE51bWJlciwgTGVuZ3RoLCBSYXRpbywgUmVzb2x1 dGlvbiwgSWRlbnRpZmllciB9OwogCiAgICAgQXRvbVN0cmluZyBuYW1lOwogICAgIFR5cGUgdHlw ZTsKLSAgICBPcHRpb25TZXQ8VmFsdWVUeXBlPiB2YWx1ZVR5cGVzOworICAgIFZhbHVlVHlwZSB2 YWx1ZVR5cGU7CiAgICAgVmVjdG9yPENTU1ZhbHVlSUQ+IHZhbHVlSWRlbnRpZmllcnM7CiAKICAg ICB2aXJ0dWFsIEV2YWx1YXRpb25SZXN1bHQgZXZhbHVhdGUoY29uc3QgRmVhdHVyZSYsIGNvbnN0 IEZlYXR1cmVFdmFsdWF0aW9uQ29udGV4dCYpIGNvbnN0IHsgcmV0dXJuIEV2YWx1YXRpb25SZXN1 bHQ6OlVua25vd247IH0KIAotICAgIEZlYXR1cmVTY2hlbWEoY29uc3QgQXRvbVN0cmluZyYgbmFt ZSwgVHlwZSB0eXBlLCBPcHRpb25TZXQ8VmFsdWVUeXBlPiB2YWx1ZVR5cGVzLCBWZWN0b3I8Q1NT VmFsdWVJRD4mJiB2YWx1ZUlkZW50aWZpZXJzID0geyB9KQorICAgIEZlYXR1cmVTY2hlbWEoY29u c3QgQXRvbVN0cmluZyYgbmFtZSwgVHlwZSB0eXBlLCBWYWx1ZVR5cGUgdmFsdWVUeXBlLCBWZWN0 b3I8Q1NTVmFsdWVJRD4mJiB2YWx1ZUlkZW50aWZpZXJzID0geyB9KQogICAgICAgICA6IG5hbWUo bmFtZSkKICAgICAgICAgLCB0eXBlKHR5cGUpCi0gICAgICAgICwgdmFsdWVUeXBlcyh2YWx1ZVR5 cGVzKQorICAgICAgICAsIHZhbHVlVHlwZSh2YWx1ZVR5cGUpCiAgICAgICAgICwgdmFsdWVJZGVu dGlmaWVycyhXVEZNb3ZlKHZhbHVlSWRlbnRpZmllcnMpKQogICAgIHsgfQogICAgIHZpcnR1YWwg fkZlYXR1cmVTY2hlbWEoKSA9IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvcXVlcnkvTWVkaWFRdWVyeUZlYXR1cmVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9xdWVy eS9NZWRpYVF1ZXJ5RmVhdHVyZXMuY3BwCmluZGV4IDM3OTZhZGVjOTFjNS4uMTU5NzBlYjcxMTg4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcXVlcnkvTWVkaWFRdWVyeUZlYXR1cmVz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcXVlcnkvTWVkaWFRdWVyeUZlYXR1cmVzLmNw cApAQCAtNDUsNyArNDUsNyBAQCBzdHJ1Y3QgQm9vbGVhblNjaGVtYSA6IHB1YmxpYyBGZWF0dXJl U2NoZW1hIHsKICAgICB1c2luZyBWYWx1ZUZ1bmN0aW9uID0gRnVuY3Rpb248Ym9vbChjb25zdCBG ZWF0dXJlRXZhbHVhdGlvbkNvbnRleHQmKT47CiAKICAgICBCb29sZWFuU2NoZW1hKGNvbnN0IEF0 b21TdHJpbmcmIG5hbWUsIFZhbHVlRnVuY3Rpb24mJiB2YWx1ZUZ1bmN0aW9uKQotICAgICAgICA6 IEZlYXR1cmVTY2hlbWEobmFtZSwgRmVhdHVyZVNjaGVtYTo6VHlwZTo6RGlzY3JldGUsIHsgRmVh dHVyZVNjaGVtYTo6VmFsdWVUeXBlOjpJbnRlZ2VyIH0pCisgICAgICAgIDogRmVhdHVyZVNjaGVt YShuYW1lLCBGZWF0dXJlU2NoZW1hOjpUeXBlOjpEaXNjcmV0ZSwgRmVhdHVyZVNjaGVtYTo6VmFs dWVUeXBlOjpJbnRlZ2VyKQogICAgICAgICAsIHZhbHVlRnVuY3Rpb24oV1RGTW92ZSh2YWx1ZUZ1 bmN0aW9uKSkKICAgICB7IH0KIApAQCAtNjIsNyArNjIsNyBAQCBzdHJ1Y3QgSW50ZWdlclNjaGVt YSA6IHB1YmxpYyBGZWF0dXJlU2NoZW1hIHsKICAgICB1c2luZyBWYWx1ZUZ1bmN0aW9uID0gRnVu Y3Rpb248aW50KGNvbnN0IEZlYXR1cmVFdmFsdWF0aW9uQ29udGV4dCYpPjsKIAogICAgIEludGVn ZXJTY2hlbWEoY29uc3QgQXRvbVN0cmluZyYgbmFtZSwgVmFsdWVGdW5jdGlvbiYmIHZhbHVlRnVu Y3Rpb24pCi0gICAgICAgIDogRmVhdHVyZVNjaGVtYShuYW1lLCBGZWF0dXJlU2NoZW1hOjpUeXBl OjpSYW5nZSwgeyBGZWF0dXJlU2NoZW1hOjpWYWx1ZVR5cGU6OkludGVnZXIgfSkKKyAgICAgICAg OiBGZWF0dXJlU2NoZW1hKG5hbWUsIEZlYXR1cmVTY2hlbWE6OlR5cGU6OlJhbmdlLCBGZWF0dXJl U2NoZW1hOjpWYWx1ZVR5cGU6OkludGVnZXIpCiAgICAgICAgICwgdmFsdWVGdW5jdGlvbihXVEZN b3ZlKHZhbHVlRnVuY3Rpb24pKQogICAgIHsgfQogCkBAIC03OSw3ICs3OSw3IEBAIHN0cnVjdCBO dW1iZXJTY2hlbWEgOiBwdWJsaWMgRmVhdHVyZVNjaGVtYSB7CiAgICAgdXNpbmcgVmFsdWVGdW5j dGlvbiA9IEZ1bmN0aW9uPGRvdWJsZShjb25zdCBGZWF0dXJlRXZhbHVhdGlvbkNvbnRleHQmKT47 CiAKICAgICBOdW1iZXJTY2hlbWEoY29uc3QgQXRvbVN0cmluZyYgbmFtZSwgVmFsdWVGdW5jdGlv biYmIHZhbHVlRnVuY3Rpb24pCi0gICAgICAgIDogRmVhdHVyZVNjaGVtYShuYW1lLCBGZWF0dXJl U2NoZW1hOjpUeXBlOjpSYW5nZSwgeyBGZWF0dXJlU2NoZW1hOjpWYWx1ZVR5cGU6OkludGVnZXIs IEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6TnVtYmVyIH0pCisgICAgICAgIDogRmVhdHVyZVNj aGVtYShuYW1lLCBGZWF0dXJlU2NoZW1hOjpUeXBlOjpSYW5nZSwgRmVhdHVyZVNjaGVtYTo6VmFs dWVUeXBlOjpOdW1iZXIpCiAgICAgICAgICwgdmFsdWVGdW5jdGlvbihXVEZNb3ZlKHZhbHVlRnVu Y3Rpb24pKQogICAgIHsgfQogCkBAIC05Niw3ICs5Niw3IEBAIHN0cnVjdCBMZW5ndGhTY2hlbWEg OiBwdWJsaWMgRmVhdHVyZVNjaGVtYSB7CiAgICAgdXNpbmcgVmFsdWVGdW5jdGlvbiA9IEZ1bmN0 aW9uPExheW91dFVuaXQoY29uc3QgRmVhdHVyZUV2YWx1YXRpb25Db250ZXh0Jik+OwogCiAgICAg TGVuZ3RoU2NoZW1hKGNvbnN0IEF0b21TdHJpbmcmIG5hbWUsIFZhbHVlRnVuY3Rpb24mJiB2YWx1 ZUZ1bmN0aW9uKQotICAgICAgICA6IEZlYXR1cmVTY2hlbWEobmFtZSwgRmVhdHVyZVNjaGVtYTo6 VHlwZTo6UmFuZ2UsIHsgRmVhdHVyZVNjaGVtYTo6VmFsdWVUeXBlOjpMZW5ndGggfSkKKyAgICAg ICAgOiBGZWF0dXJlU2NoZW1hKG5hbWUsIEZlYXR1cmVTY2hlbWE6OlR5cGU6OlJhbmdlLCBGZWF0 dXJlU2NoZW1hOjpWYWx1ZVR5cGU6Okxlbmd0aCkKICAgICAgICAgLCB2YWx1ZUZ1bmN0aW9uKFdU Rk1vdmUodmFsdWVGdW5jdGlvbikpCiAgICAgeyB9CiAKQEAgLTExMyw3ICsxMTMsNyBAQCBzdHJ1 Y3QgUmF0aW9TY2hlbWEgOiBwdWJsaWMgRmVhdHVyZVNjaGVtYSB7CiAgICAgdXNpbmcgVmFsdWVG dW5jdGlvbiA9IEZ1bmN0aW9uPGRvdWJsZShjb25zdCBGZWF0dXJlRXZhbHVhdGlvbkNvbnRleHQm KT47CiAKICAgICBSYXRpb1NjaGVtYShjb25zdCBBdG9tU3RyaW5nJiBuYW1lLCBWYWx1ZUZ1bmN0 aW9uJiYgdmFsdWVGdW5jdGlvbikKLSAgICAgICAgOiBGZWF0dXJlU2NoZW1hKG5hbWUsIEZlYXR1 cmVTY2hlbWE6OlR5cGU6OlJhbmdlLCB7IEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6UmF0aW8g fSkKKyAgICAgICAgOiBGZWF0dXJlU2NoZW1hKG5hbWUsIEZlYXR1cmVTY2hlbWE6OlR5cGU6OlJh bmdlLCBGZWF0dXJlU2NoZW1hOjpWYWx1ZVR5cGU6OlJhdGlvKQogICAgICAgICAsIHZhbHVlRnVu Y3Rpb24oV1RGTW92ZSh2YWx1ZUZ1bmN0aW9uKSkKICAgICB7IH0KIApAQCAtMTMwLDcgKzEzMCw3 IEBAIHN0cnVjdCBSZXNvbHV0aW9uU2NoZW1hIDogcHVibGljIEZlYXR1cmVTY2hlbWEgewogICAg IHVzaW5nIFZhbHVlRnVuY3Rpb24gPSBGdW5jdGlvbjxkb3VibGUoY29uc3QgRmVhdHVyZUV2YWx1 YXRpb25Db250ZXh0Jik+OwogCiAgICAgUmVzb2x1dGlvblNjaGVtYShjb25zdCBBdG9tU3RyaW5n JiBuYW1lLCBWYWx1ZUZ1bmN0aW9uJiYgdmFsdWVGdW5jdGlvbikKLSAgICAgICAgOiBGZWF0dXJl U2NoZW1hKG5hbWUsIEZlYXR1cmVTY2hlbWE6OlR5cGU6OlJhbmdlLCB7IEZlYXR1cmVTY2hlbWE6 OlZhbHVlVHlwZTo6UmVzb2x1dGlvbiB9KQorICAgICAgICA6IEZlYXR1cmVTY2hlbWEobmFtZSwg RmVhdHVyZVNjaGVtYTo6VHlwZTo6UmFuZ2UsIEZlYXR1cmVTY2hlbWE6OlZhbHVlVHlwZTo6UmVz b2x1dGlvbikKICAgICAgICAgLCB2YWx1ZUZ1bmN0aW9uKFdURk1vdmUodmFsdWVGdW5jdGlvbikp CiAgICAgeyB9CiAKQEAgLTE0OSw3ICsxNDksNyBAQCBzdHJ1Y3QgSWRlbnRpZmllclNjaGVtYSA6 IHB1YmxpYyBGZWF0dXJlU2NoZW1hIHsKICAgICB1c2luZyBWYWx1ZUZ1bmN0aW9uID0gRnVuY3Rp b248TWF0Y2hpbmdJZGVudGlmaWVycyhjb25zdCBGZWF0dXJlRXZhbHVhdGlvbkNvbnRleHQmKT47 CiAKICAgICBJZGVudGlmaWVyU2NoZW1hKGNvbnN0IEF0b21TdHJpbmcmIG5hbWUsIFZlY3RvcjxD U1NWYWx1ZUlEPiYmIHZhbHVlSWRlbnRpZmllcnMsIFZhbHVlRnVuY3Rpb24mJiB2YWx1ZUZ1bmN0 aW9uKQotICAgICAgICA6IEZlYXR1cmVTY2hlbWEobmFtZSwgRmVhdHVyZVNjaGVtYTo6VHlwZTo6 RGlzY3JldGUsIHsgfSwgV1RGTW92ZSh2YWx1ZUlkZW50aWZpZXJzKSkKKyAgICAgICAgOiBGZWF0 dXJlU2NoZW1hKG5hbWUsIEZlYXR1cmVTY2hlbWE6OlR5cGU6OkRpc2NyZXRlLCBGZWF0dXJlU2No ZW1hOjpWYWx1ZVR5cGU6OklkZW50aWZpZXIsIFdURk1vdmUodmFsdWVJZGVudGlmaWVycykpCiAg ICAgICAgICwgdmFsdWVGdW5jdGlvbihXVEZNb3ZlKHZhbHVlRnVuY3Rpb24pKQogICAgIHsgfQog Cg==