128076 2014-02-02 12:09:29 -0800 Still more characters -> deprecatedCharacters (EWS keeps finding more) 2014-02-02 16:33:56 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin commit-queue d-r oldest_to_newest 974803 0 darin 2014-02-02 12:09:29 -0800 Still more characters -> deprecatedCharacters (EWS keeps finding more) 974804 1 222931 darin 2014-02-02 12:10:09 -0800 Created attachment 222931 Patch 974860 2 222931 commit-queue 2014-02-02 16:33:54 -0800 Comment on attachment 222931 Patch Clearing flags on attachment: 222931 Committed r163275: <http://trac.webkit.org/changeset/163275> 974861 3 commit-queue 2014-02-02 16:33:56 -0800 All reviewed patches have been landed. Closing bug. 222931 2014-02-02 12:10:09 -0800 2014-02-02 16:33:54 -0800 Patch bug-128076-20140202121008.patch text/plain 22079 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNjNzVhZmFjYTM1ODVh OGZjNDliY2E1MTdiZmMxNmIwMmM5ZWQxYi4uNGQ1YjVhNWNjNmZjYzJiYTA1ZTRiN2JkNjI3MDc5 ZmMxNDI4YWJkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAyLTAyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBTdGlsbCBtb3JlIGNoYXJhY3Rl cnMgLT4gZGVwcmVjYXRlZENoYXJhY3RlcnMgKEVXUyBrZWVwcyBmaW5kaW5nIG1vcmUpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgwNzYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhh cmZCdXp6U2hhcGVyOjpzZXRGb250RmVhdHVyZXMpOgorICAgICAgICAoV2ViQ29yZTo6SGFyZkJ1 enpTaGFwZXI6OnNoYXBlSGFyZkJ1enpSdW5zKToKKyAgICAgICAgVXNlIGRlcHJlY2F0ZWRDaGFy YWN0ZXJzLgorCiAyMDE0LTAyLTAyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgU3VicGl4ZWwgcmVuZGVyaW5nOiBJbnRyb2R1Y2UgZGV2aWNlIHBpeGVsIHNuYXBw aW5nIGhlbHBlciBmdW5jdGlvbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggMWQ1NzA1ODQ0NjU5Njdi YjA1NTM5NjkzMzM2Yzc4MTU0ZTU1OTAwZi4uNWNkNGM1NGE0ZGQwMmFlYzgyZGIzMGM3MDhiNmY4 NmQzODkyMjlhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE0LTAyLTAy ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBTdGlsbCBtb3JlIGNo YXJhY3RlcnMgLT4gZGVwcmVjYXRlZENoYXJhY3RlcnMgKEVXUyBrZWVwcyBmaW5kaW5nIG1vcmUp CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgwNzYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFjY2Vz c2libGVUZXh0SW1wbC5jcHA6CisgICAgICAgIChBY2Nlc3NpYmxlVGV4dDo6Z2V0X3RleHQpOgor ICAgICAgICAoQWNjZXNzaWJsZVRleHQ6OmdldF90ZXh0QmVmb3JlT2Zmc2V0KToKKyAgICAgICAg KEFjY2Vzc2libGVUZXh0OjpnZXRfdGV4dEFmdGVyT2Zmc2V0KToKKyAgICAgICAgKEFjY2Vzc2li bGVUZXh0OjpnZXRfdGV4dEF0T2Zmc2V0KToKKyAgICAgICAgKEFjY2Vzc2libGVUZXh0OjpnZXRf YXR0cmlidXRlcyk6CisgICAgICAgICogRE9NQ1NTQ2xhc3Nlcy5jcHA6CisgICAgICAgIChET01D U1NTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eVZhbHVlKToKKyAgICAgICAgKiBET01Db3Jl Q2xhc3Nlcy5jcHA6CisgICAgICAgIChET01Ob2RlOjpub2RlVmFsdWUpOgorICAgICAgICAoRE9N RWxlbWVudDo6Z2V0QXR0cmlidXRlKToKKyAgICAgICAgKERPTUVsZW1lbnQ6OmZvbnQpOgorICAg ICAgICAqIERPTUhUTUxDbGFzc2VzLmNwcDoKKyAgICAgICAgKERPTUhUTUxFbGVtZW50Ojppbm5l clRleHQpOgorICAgICAgICAoRE9NSFRNTEZvcm1FbGVtZW50OjphY3Rpb24pOgorICAgICAgICAo RE9NSFRNTEZvcm1FbGVtZW50OjptZXRob2QpOgorICAgICAgICAoRE9NSFRNTElucHV0RWxlbWVu dDo6dmFsdWUpOgorICAgICAgICAoRE9NSFRNTFRleHRBcmVhRWxlbWVudDo6dmFsdWUpOgorICAg ICAgICAqIE1hcnNoYWxsaW5nSGVscGVycy5jcHA6CisgICAgICAgIChNYXJzaGFsbGluZ0hlbHBl cnM6OlBhdGhTdHJpbmdUb0ZpbGVDRlVSTFJlZik6CisgICAgICAgICogV2ViRGF0YVNvdXJjZS5j cHA6CisgICAgICAgIChXZWJEYXRhU291cmNlOjp1bnJlYWNoYWJsZVVSTCk6CisgICAgICAgICog V2ViRG93bmxvYWQuY3BwOgorICAgICAgICAoV2ViRG93bmxvYWQ6OmJ1bmRsZVBhdGhGb3JUYXJn ZXRQYXRoKToKKyAgICAgICAgKiBXZWJEb3dubG9hZENGTmV0LmNwcDoKKyAgICAgICAgKFdlYkRv d25sb2FkOjpkaWRGaW5pc2gpOgorICAgICAgICAqIFdlYkVsZW1lbnRQcm9wZXJ0eUJhZy5jcHA6 CisgICAgICAgIChjb252ZXJ0U3RyaW5nVG9WYXJpYW50KToKKyAgICAgICAgKiBXZWJGcmFtZS5j cHA6CisgICAgICAgIChXZWJGcmFtZTo6c2VhcmNoRm9yTGFiZWxzQmVmb3JlRWxlbWVudCk6Cisg ICAgICAgIChXZWJGcmFtZTo6bWF0Y2hMYWJlbHNBZ2FpbnN0RWxlbWVudCk6CisgICAgICAgICog V2ViSGlzdG9yeS5jcHA6CisgICAgICAgIChXZWJIaXN0b3J5OjphZGRWaXNpdGVkTGlua3NUb1Bh Z2VHcm91cCk6CisgICAgICAgICogV2ViS2l0R3JhcGhpY3MuY3BwOgorICAgICAgICAoQ2VudGVy VHJ1bmNhdGVTdHJpbmdUb1dpZHRoKToKKyAgICAgICAgKFJpZ2h0VHJ1bmNhdGVTdHJpbmdUb1dp ZHRoKToKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OmFwcGxpY2F0 aW9uTmFtZUZvclVzZXJBZ2VudCk6CisgICAgICAgIChXZWJWaWV3OjpjdXN0b21Vc2VyQWdlbnQp OgorICAgICAgICAoV2ViVmlldzo6Z3JvdXBOYW1lKToKKyAgICAgICAgKFdlYlZpZXc6OnNlbGVj dGVkVGV4dCk6CisgICAgICAgIChXZWJWaWV3OjpvbklNRVJlcXVlc3RSZWNvbnZlcnRTdHJpbmcp OgorICAgICAgICBVc2UgZGVwcmVjYXRlZENoYXJhY3RlcnMuCisKIDIwMTQtMDEtMzAgIEFuZHJl aSBCdWN1ciAgPGFidWN1ckBhZG9iZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHRoZSBBQ0NFTEVS QVRFRF9DT01QT1NJVElORyBmbGFnCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAKaW5kZXggZDQ5ODVj N2EyNjFkNGZkMGU2OTU1YzdmZjRmYmIxYjY4N2QyMTEzOC4uYzAzOWYyMWRlNjhmMzA4NTc2OWZi MmE2ZjExNDA1YWQ4NGU4ZDZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyLmNwcApAQCAtMzcxLDcg KzM3MSw3IEBAIHZvaWQgSGFyZkJ1enpTaGFwZXI6OnNldEZvbnRGZWF0dXJlcygpCiAgICAgdW5z aWduZWQgbnVtRmVhdHVyZXMgPSBzZXR0aW5ncy0+c2l6ZSgpOwogICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBudW1GZWF0dXJlczsgKytpKSB7CiAgICAgICAgIGhiX2ZlYXR1cmVfdCBmZWF0 dXJlOwotICAgICAgICBjb25zdCBVQ2hhciogdGFnID0gc2V0dGluZ3MtPmF0KGkpLnRhZygpLmNo YXJhY3RlcnMoKTsKKyAgICAgICAgY29uc3QgVUNoYXIqIHRhZyA9IHNldHRpbmdzLT5hdChpKS50 YWcoKS5zdHJpbmcoKS5kZXByZWNhdGVkQ2hhcmFjdGVycygpOwogICAgICAgICBmZWF0dXJlLnRh ZyA9IEhCX1RBRyh0YWdbMF0sIHRhZ1sxXSwgdGFnWzJdLCB0YWdbM10pOwogICAgICAgICBmZWF0 dXJlLnZhbHVlID0gc2V0dGluZ3MtPmF0KGkpLnZhbHVlKCk7CiAgICAgICAgIGZlYXR1cmUuc3Rh cnQgPSAwOwpAQCAtNDk2LDcgKzQ5Niw3IEBAIGJvb2wgSGFyZkJ1enpTaGFwZXI6OnNoYXBlSGFy ZkJ1enpSdW5zKGJvb2wgc2hvdWxkU2V0RGlyZWN0aW9uKQogICAgICAgICBpZiAobV9mb250LT5p c1NtYWxsQ2FwcygpICYmIHVfaXNsb3dlcihtX25vcm1hbGl6ZWRCdWZmZXJbY3VycmVudFJ1bi0+ c3RhcnRJbmRleCgpXSkpIHsKICAgICAgICAgICAgIFN0cmluZyB1cHBlclRleHQgPSBTdHJpbmco bV9ub3JtYWxpemVkQnVmZmVyLmdldCgpICsgY3VycmVudFJ1bi0+c3RhcnRJbmRleCgpLCBjdXJy ZW50UnVuLT5udW1DaGFyYWN0ZXJzKCkpLnVwcGVyKCk7CiAgICAgICAgICAgICBjdXJyZW50Rm9u dERhdGEgPSBtX2ZvbnQtPmdseXBoRGF0YUZvckNoYXJhY3Rlcih1cHBlclRleHRbMF0sIGZhbHNl LCBTbWFsbENhcHNWYXJpYW50KS5mb250RGF0YTsKLSAgICAgICAgICAgIGhiX2J1ZmZlcl9hZGRf dXRmMTYoaGFyZkJ1enpCdWZmZXIuZ2V0KCksIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDE2 X3QqPih1cHBlclRleHQuY2hhcmFjdGVycygpKSwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVycygp LCAwLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCkpOworICAgICAgICAgICAgaGJfYnVmZmVy X2FkZF91dGYxNihoYXJmQnV6ekJ1ZmZlci5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB1 aW50MTZfdCo+KHVwcGVyVGV4dC5kZXByZWNhdGVkQ2hhcmFjdGVycygpKSwgY3VycmVudFJ1bi0+ bnVtQ2hhcmFjdGVycygpLCAwLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCkpOwogICAgICAg ICB9IGVsc2UKICAgICAgICAgICAgIGhiX2J1ZmZlcl9hZGRfdXRmMTYoaGFyZkJ1enpCdWZmZXIu Z2V0KCksIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDE2X3QqPihtX25vcm1hbGl6ZWRCdWZm ZXIuZ2V0KCkgKyBjdXJyZW50UnVuLT5zdGFydEluZGV4KCkpLCBjdXJyZW50UnVuLT5udW1DaGFy YWN0ZXJzKCksIDAsIGN1cnJlbnRSdW4tPm51bUNoYXJhY3RlcnMoKSk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvd2luL0FjY2Vzc2libGVUZXh0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L3dpbi9BY2Nlc3NpYmxlVGV4dEltcGwuY3BwCmluZGV4IDk4ODQ4OGFlYmRhNjBmY2MzMTA2ZTk1 NmFhOGQzNjhhYWIwN2ZlOTkuLjJlZGMzNjZkYWZkZWNkMDJkZDEwZmYyNzJhMTc1NTQ2OTE4Y2Zm MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0FjY2Vzc2libGVUZXh0SW1wbC5jcHAK KysrIGIvU291cmNlL1dlYktpdC93aW4vQWNjZXNzaWJsZVRleHRJbXBsLmNwcApAQCAtMTkyLDcg KzE5Miw3IEBAIEhSRVNVTFQgQWNjZXNzaWJsZVRleHQ6OmdldF90ZXh0KGxvbmcgc3RhcnRPZmZz ZXQsIGxvbmcgZW5kT2Zmc2V0LCBCU1RSKiB0ZXh0KQogICAgIGVuZE9mZnNldCA9IGNvbnZlcnRT cGVjaWFsT2Zmc2V0KGVuZE9mZnNldCk7CiAgICAgV1RGOjpTdHJpbmcgc3Vic3RyaW5nVGV4dCA9 IG1fb2JqZWN0LT5zdHJpbmdWYWx1ZSgpLnN1YnN0cmluZyhzdGFydE9mZnNldCwgZW5kT2Zmc2V0 IC0gc3RhcnRPZmZzZXQpOwogCi0gICAgKnRleHQgPSBTeXNBbGxvY1N0cmluZ0xlbihzdWJzdHJp bmdUZXh0LmNoYXJhY3RlcnMoKSwgc3Vic3RyaW5nVGV4dC5sZW5ndGgoKSk7CisgICAgKnRleHQg PSBTeXNBbGxvY1N0cmluZ0xlbihzdWJzdHJpbmdUZXh0LmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCks IHN1YnN0cmluZ1RleHQubGVuZ3RoKCkpOwogICAgIGlmIChzdWJzdHJpbmdUZXh0Lmxlbmd0aCgp ICYmICEqdGV4dCkKICAgICAgICAgcmV0dXJuIEVfT1VUT0ZNRU1PUlk7CiAKQEAgLTI1Niw3ICsy NTYsNyBAQCBIUkVTVUxUIEFjY2Vzc2libGVUZXh0OjpnZXRfdGV4dEJlZm9yZU9mZnNldChsb25n IG9mZnNldCwgZW51bSBJQTJUZXh0Qm91bmRhcnlUeQogICAgICAgICByZXR1cm4gU19GQUxTRTsK IAogICAgIFdURjo6U3RyaW5nIHN1YnN0cmluZ1RleHQgPSBtX29iamVjdC0+dGV4dCgpLnN1YnN0 cmluZygqc3RhcnRPZmZzZXQsICplbmRPZmZzZXQgLSAqc3RhcnRPZmZzZXQpOwotICAgICp0ZXh0 ID0gU3lzQWxsb2NTdHJpbmdMZW4oc3Vic3RyaW5nVGV4dC5jaGFyYWN0ZXJzKCksIHN1YnN0cmlu Z1RleHQubGVuZ3RoKCkpOworICAgICp0ZXh0ID0gU3lzQWxsb2NTdHJpbmdMZW4oc3Vic3RyaW5n VGV4dC5kZXByZWNhdGVkQ2hhcmFjdGVycygpLCBzdWJzdHJpbmdUZXh0Lmxlbmd0aCgpKTsKIAog ICAgIGlmIChzdWJzdHJpbmdUZXh0Lmxlbmd0aCgpICYmICEqdGV4dCkKICAgICAgICAgcmV0dXJu IEVfT1VUT0ZNRU1PUlk7CkBAIC0zMjQsNyArMzI0LDcgQEAgSFJFU1VMVCBBY2Nlc3NpYmxlVGV4 dDo6Z2V0X3RleHRBZnRlck9mZnNldChsb25nIG9mZnNldCwgZW51bSBJQTJUZXh0Qm91bmRhcnlU eXAKICAgICAgICAgcmV0dXJuIFNfRkFMU0U7CiAKICAgICBXVEY6OlN0cmluZyBzdWJzdHJpbmdU ZXh0ID0gbV9vYmplY3QtPnRleHQoKS5zdWJzdHJpbmcoKnN0YXJ0T2Zmc2V0LCAqZW5kT2Zmc2V0 IC0gKnN0YXJ0T2Zmc2V0KTsKLSAgICAqdGV4dCA9IFN5c0FsbG9jU3RyaW5nTGVuKHN1YnN0cmlu Z1RleHQuY2hhcmFjdGVycygpLCBzdWJzdHJpbmdUZXh0Lmxlbmd0aCgpKTsKKyAgICAqdGV4dCA9 IFN5c0FsbG9jU3RyaW5nTGVuKHN1YnN0cmluZ1RleHQuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwg c3Vic3RyaW5nVGV4dC5sZW5ndGgoKSk7CiAgICAgaWYgKHN1YnN0cmluZ1RleHQubGVuZ3RoKCkg JiYgISp0ZXh0KQogICAgICAgICByZXR1cm4gRV9PVVRPRk1FTU9SWTsKIApAQCAtMzg0LDcgKzM4 NCw3IEBAIEhSRVNVTFQgQWNjZXNzaWJsZVRleHQ6OmdldF90ZXh0QXRPZmZzZXQobG9uZyBvZmZz ZXQsIGVudW0gSUEyVGV4dEJvdW5kYXJ5VHlwZSBiCiAgICAgICAgIHJldHVybiBTX0ZBTFNFOwog CiAgICAgV1RGOjpTdHJpbmcgc3Vic3RyaW5nVGV4dCA9IG1fb2JqZWN0LT50ZXh0KCkuc3Vic3Ry aW5nKCpzdGFydE9mZnNldCwgKmVuZE9mZnNldCAtICpzdGFydE9mZnNldCk7Ci0gICAgKnRleHQg PSBTeXNBbGxvY1N0cmluZ0xlbihzdWJzdHJpbmdUZXh0LmNoYXJhY3RlcnMoKSwgc3Vic3RyaW5n VGV4dC5sZW5ndGgoKSk7CisgICAgKnRleHQgPSBTeXNBbGxvY1N0cmluZ0xlbihzdWJzdHJpbmdU ZXh0LmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIHN1YnN0cmluZ1RleHQubGVuZ3RoKCkpOwogCiAg ICAgaWYgKHN1YnN0cmluZ1RleHQubGVuZ3RoKCkgJiYgISp0ZXh0KQogICAgICAgICByZXR1cm4g RV9PVVRPRk1FTU9SWTsKQEAgLTY3NCw3ICs2NzQsNyBAQCBIUkVTVUxUIEFjY2Vzc2libGVUZXh0 OjpzZXRBdHRyaWJ1dGVzKGxvbmcgc3RhcnRPZmZzZXQsIGxvbmcgZW5kT2Zmc2V0LCBCU1RSKiBh dAogSFJFU1VMVCBBY2Nlc3NpYmxlVGV4dDo6Z2V0X2F0dHJpYnV0ZXMoQlNUUiogYXR0cmlidXRl cykKIHsKICAgICBXVEY6OlN0cmluZyB0ZXh0KCJ0ZXh0LW1vZGVsOmExIik7Ci0gICAgKmF0dHJp YnV0ZXMgPSBTeXNBbGxvY1N0cmluZ0xlbih0ZXh0LmNoYXJhY3RlcnMoKSwgdGV4dC5sZW5ndGgo KSk7CisgICAgKmF0dHJpYnV0ZXMgPSBTeXNBbGxvY1N0cmluZ0xlbih0ZXh0LmRlcHJlY2F0ZWRD aGFyYWN0ZXJzKCksIHRleHQubGVuZ3RoKCkpOwogICAgIHJldHVybiBTX09LOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9ET01DU1NDbGFzc2VzLmNwcCBiL1NvdXJjZS9XZWJL aXQvd2luL0RPTUNTU0NsYXNzZXMuY3BwCmluZGV4IDJjZWI5MTY1NDRiMzIyZjAzMWZjZTVhMzJk YzE5OGU1NzUwZjg0ZjAuLmY1MzdiMWYzYWNiNzhmN2MyMDA4NjRmNDA2OTFkMTE4NDEzYzQ0MmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0RPTUNTU0NsYXNzZXMuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvd2luL0RPTUNTU0NsYXNzZXMuY3BwCkBAIC0xMDIsNyArMTAyLDcgQEAgSFJF U1VMVCBTVERNRVRIT0RDQUxMVFlQRSBET01DU1NTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0 eVZhbHVlKAogewogICAgIFdURjo6U3RyaW5nIHByb3BlcnR5TmFtZVN0cmluZyhwcm9wZXJ0eU5h bWUpOwogICAgIFdURjo6U3RyaW5nIHZhbHVlID0gbV9zdHlsZS0+Z2V0UHJvcGVydHlWYWx1ZShw cm9wZXJ0eU5hbWVTdHJpbmcpOwotICAgICpyZXN1bHQgPSBTeXNBbGxvY1N0cmluZ0xlbih2YWx1 ZS5jaGFyYWN0ZXJzKCksIHZhbHVlLmxlbmd0aCgpKTsKKyAgICAqcmVzdWx0ID0gU3lzQWxsb2NT dHJpbmdMZW4odmFsdWUuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgdmFsdWUubGVuZ3RoKCkpOwog ICAgIGlmICh2YWx1ZS5sZW5ndGgoKSAmJiAhKnJlc3VsdCkKICAgICAgICAgcmV0dXJuIEVfT1VU T0ZNRU1PUlk7CiAgICAgcmV0dXJuIFNfT0s7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9ET01Db3JlQ2xhc3Nlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9ET01Db3JlQ2xhc3Nlcy5j cHAKaW5kZXggYjgxZDRhN2Q3MzQ3N2FkZjhiZGI3ODNiMjUxZGUxZGM5ZmZkOTMwNy4uNjg2ZGYz ODZjMzgxNGRkZjE5ZjE5YjUzNjU4N2Q1N2QwZmRjM2UwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93aW4vRE9NQ29yZUNsYXNzZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0RPTUNv cmVDbGFzc2VzLmNwcApAQCAtMTIyLDcgKzEyMiw3IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZ UEUgRE9NTm9kZTo6bm9kZVZhbHVlKAogICAgIGlmICghbV9ub2RlKQogICAgICAgICByZXR1cm4g RV9GQUlMOwogICAgIFdURjo6U3RyaW5nIG5vZGVWYWx1ZVN0ciA9IG1fbm9kZS0+bm9kZVZhbHVl KCk7Ci0gICAgKnJlc3VsdCA9IFN5c0FsbG9jU3RyaW5nTGVuKG5vZGVWYWx1ZVN0ci5jaGFyYWN0 ZXJzKCksIG5vZGVWYWx1ZVN0ci5sZW5ndGgoKSk7CisgICAgKnJlc3VsdCA9IFN5c0FsbG9jU3Ry aW5nTGVuKG5vZGVWYWx1ZVN0ci5kZXByZWNhdGVkQ2hhcmFjdGVycygpLCBub2RlVmFsdWVTdHIu bGVuZ3RoKCkpOwogICAgIGlmIChub2RlVmFsdWVTdHIubGVuZ3RoKCkgJiYgISpyZXN1bHQpCiAg ICAgICAgIHJldHVybiBFX09VVE9GTUVNT1JZOwogICAgIHJldHVybiBTX09LOwpAQCAtMTAzMyw3 ICsxMDMzLDcgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBET01FbGVtZW50OjpnZXRBdHRy aWJ1dGUoCiAgICAgICAgIHJldHVybiBFX0ZBSUw7CiAgICAgV1RGOjpTdHJpbmcgbmFtZVN0cmlu ZyhuYW1lLCBTeXNTdHJpbmdMZW4obmFtZSkpOwogICAgIFdURjo6U3RyaW5nJiBhdHRyVmFsdWVT dHJpbmcgPSAoV1RGOjpTdHJpbmcmKSBtX2VsZW1lbnQtPmdldEF0dHJpYnV0ZShuYW1lU3RyaW5n KTsKLSAgICAqcmVzdWx0ID0gU3lzQWxsb2NTdHJpbmdMZW4oYXR0clZhbHVlU3RyaW5nLmNoYXJh Y3RlcnMoKSwgYXR0clZhbHVlU3RyaW5nLmxlbmd0aCgpKTsKKyAgICAqcmVzdWx0ID0gU3lzQWxs b2NTdHJpbmdMZW4oYXR0clZhbHVlU3RyaW5nLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIGF0dHJW YWx1ZVN0cmluZy5sZW5ndGgoKSk7CiAgICAgaWYgKGF0dHJWYWx1ZVN0cmluZy5sZW5ndGgoKSAm JiAhKnJlc3VsdCkKICAgICAgICAgcmV0dXJuIEVfT1VUT0ZNRU1PUlk7CiAgICAgcmV0dXJuIFNf T0s7CkBAIC0xMjU3LDcgKzEyNTcsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIERPTUVs ZW1lbnQ6OmZvbnQoV2ViRm9udERlc2NyaXB0aW9uKiB3ZWJGb250RGVzY3JpcHRpbwogCiAgICAg Rm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IHJlbmRlcmVyLT5zdHlsZSgpLmZvbnQo KS5mb250RGVzY3JpcHRpb24oKTsKICAgICBBdG9taWNTdHJpbmcgZmFtaWx5ID0gZm9udERlc2Ny aXB0aW9uLmZpcnN0RmFtaWx5KCk7Ci0gICAgd2ViRm9udERlc2NyaXB0aW9uLT5mYW1pbHkgPSBm YW1pbHkuY2hhcmFjdGVycygpOworICAgIHdlYkZvbnREZXNjcmlwdGlvbi0+ZmFtaWx5ID0gZmFt aWx5LnN0cmluZygpLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCk7CiAgICAgd2ViRm9udERlc2NyaXB0 aW9uLT5mYW1pbHlMZW5ndGggPSBmYW1pbHkubGVuZ3RoKCk7CiAgICAgd2ViRm9udERlc2NyaXB0 aW9uLT5zaXplID0gZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkU2l6ZSgpOwogICAgIHdlYkZvbnRE ZXNjcmlwdGlvbi0+Ym9sZCA9IGZvbnREZXNjcmlwdGlvbi53ZWlnaHQoKSA+PSBXZWJDb3JlOjpG b250V2VpZ2h0NjAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vRE9NSFRNTENsYXNz ZXMuY3BwIGIvU291cmNlL1dlYktpdC93aW4vRE9NSFRNTENsYXNzZXMuY3BwCmluZGV4IGU0M2Jm MTU5ZGRhNGZhMDllYWM1YWU0Y2E2Mjg2NWM4MjI0ZTJlMDMuLjNmYWNkZmI0NDE4MWE0NTQ1YTQ2 MzFiODM5OGU2OTkxNDBkOGRjMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0RPTUhU TUxDbGFzc2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9ET01IVE1MQ2xhc3Nlcy5jcHAK QEAgLTQ4Myw3ICs0ODMsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIERPTUhUTUxFbGVt ZW50Ojppbm5lclRleHQoCiB7CiAgICAgQVNTRVJUKG1fZWxlbWVudCAmJiBtX2VsZW1lbnQtPmlz SFRNTEVsZW1lbnQoKSk7CiAgICAgV1RGOjpTdHJpbmcgaW5uZXJUZXh0U3RyaW5nID0gdG9IVE1M RWxlbWVudChtX2VsZW1lbnQpLT5pbm5lclRleHQoKTsKLSAgICAqcmVzdWx0ID0gQlN0cmluZyhp bm5lclRleHRTdHJpbmcuY2hhcmFjdGVycygpLCBpbm5lclRleHRTdHJpbmcubGVuZ3RoKCkpLnJl bGVhc2UoKTsKKyAgICAqcmVzdWx0ID0gQlN0cmluZyhpbm5lclRleHRTdHJpbmcuZGVwcmVjYXRl ZENoYXJhY3RlcnMoKSwgaW5uZXJUZXh0U3RyaW5nLmxlbmd0aCgpKS5yZWxlYXNlKCk7CiAgICAg cmV0dXJuIFNfT0s7CiB9CiAgICAgICAgIApAQCAtNTYxLDcgKzU2MSw3IEBAIEhSRVNVTFQgU1RE TUVUSE9EQ0FMTFRZUEUgRE9NSFRNTEZvcm1FbGVtZW50OjphY3Rpb24oCiB7CiAgICAgQVNTRVJU KG1fZWxlbWVudCAmJiBpc0hUTUxGb3JtRWxlbWVudChtX2VsZW1lbnQpKTsKICAgICBXVEY6OlN0 cmluZyBhY3Rpb25TdHJpbmcgPSB0b0hUTUxGb3JtRWxlbWVudChtX2VsZW1lbnQpLT5hY3Rpb24o KTsKLSAgICAqcmVzdWx0ID0gQlN0cmluZyhhY3Rpb25TdHJpbmcuY2hhcmFjdGVycygpLCBhY3Rp b25TdHJpbmcubGVuZ3RoKCkpLnJlbGVhc2UoKTsKKyAgICAqcmVzdWx0ID0gQlN0cmluZyhhY3Rp b25TdHJpbmcuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgYWN0aW9uU3RyaW5nLmxlbmd0aCgpKS5y ZWxlYXNlKCk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAgICAgCkBAIC01OTEsNyArNTkxLDcgQEAg SFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBET01IVE1MRm9ybUVsZW1lbnQ6Om1ldGhvZCgKIHsK ICAgICBBU1NFUlQobV9lbGVtZW50ICYmIGlzSFRNTEZvcm1FbGVtZW50KG1fZWxlbWVudCkpOwog ICAgIFdURjo6U3RyaW5nIG1ldGhvZFN0cmluZyA9IHRvSFRNTEZvcm1FbGVtZW50KG1fZWxlbWVu dCktPm1ldGhvZCgpOwotICAgICpyZXN1bHQgPSBCU3RyaW5nKG1ldGhvZFN0cmluZy5jaGFyYWN0 ZXJzKCksIG1ldGhvZFN0cmluZy5sZW5ndGgoKSkucmVsZWFzZSgpOworICAgICpyZXN1bHQgPSBC U3RyaW5nKG1ldGhvZFN0cmluZy5kZXByZWNhdGVkQ2hhcmFjdGVycygpLCBtZXRob2RTdHJpbmcu bGVuZ3RoKCkpLnJlbGVhc2UoKTsKICAgICByZXR1cm4gU19PSzsKIH0KICAgICAKQEAgLTEyMTAs NyArMTIxMCw3IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgRE9NSFRNTElucHV0RWxlbWVu dDo6dmFsdWUoCiAgICAgQVNTRVJUKG1fZWxlbWVudCAmJiBpc0hUTUxJbnB1dEVsZW1lbnQobV9l bGVtZW50KSk7CiAgICAgSFRNTElucHV0RWxlbWVudCogaW5wdXRFbGVtZW50ID0gdG9IVE1MSW5w dXRFbGVtZW50KG1fZWxlbWVudCk7CiAgICAgV1RGOjpTdHJpbmcgdmFsdWVTdHJpbmcgPSBpbnB1 dEVsZW1lbnQtPnZhbHVlKCk7Ci0gICAgKnJlc3VsdCA9IEJTdHJpbmcodmFsdWVTdHJpbmcuY2hh cmFjdGVycygpLCB2YWx1ZVN0cmluZy5sZW5ndGgoKSkucmVsZWFzZSgpOworICAgICpyZXN1bHQg PSBCU3RyaW5nKHZhbHVlU3RyaW5nLmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIHZhbHVlU3RyaW5n Lmxlbmd0aCgpKS5yZWxlYXNlKCk7CiAgICAgaWYgKHZhbHVlU3RyaW5nLmxlbmd0aCgpICYmICEq cmVzdWx0KQogICAgICAgICByZXR1cm4gRV9PVVRPRk1FTU9SWTsKICAgICByZXR1cm4gU19PSzsK QEAgLTE1NDcsNyArMTU0Nyw3IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgRE9NSFRNTFRl eHRBcmVhRWxlbWVudDo6dmFsdWUoCiAgICAgQVNTRVJUKG1fZWxlbWVudCAmJiBpc0hUTUxUZXh0 QXJlYUVsZW1lbnQobV9lbGVtZW50KSk7CiAgICAgSFRNTFRleHRBcmVhRWxlbWVudCogdGV4dGFy ZWFFbGVtZW50ID0gdG9IVE1MVGV4dEFyZWFFbGVtZW50KG1fZWxlbWVudCk7CiAgICAgV1RGOjpT dHJpbmcgdmFsdWVTdHJpbmcgPSB0ZXh0YXJlYUVsZW1lbnQtPnZhbHVlKCk7Ci0gICAgKnJlc3Vs dCA9IEJTdHJpbmcodmFsdWVTdHJpbmcuY2hhcmFjdGVycygpLCB2YWx1ZVN0cmluZy5sZW5ndGgo KSkucmVsZWFzZSgpOworICAgICpyZXN1bHQgPSBCU3RyaW5nKHZhbHVlU3RyaW5nLmRlcHJlY2F0 ZWRDaGFyYWN0ZXJzKCksIHZhbHVlU3RyaW5nLmxlbmd0aCgpKS5yZWxlYXNlKCk7CiAgICAgaWYg KHZhbHVlU3RyaW5nLmxlbmd0aCgpICYmICEqcmVzdWx0KQogICAgICAgICByZXR1cm4gRV9PVVRP Rk1FTU9SWTsKICAgICByZXR1cm4gU19PSzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2lu L01hcnNoYWxsaW5nSGVscGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9NYXJzaGFsbGluZ0hl bHBlcnMuY3BwCmluZGV4IDQyZjZkMTliNDE3ZGMxNzBlODQ4ZGNiZWU1NWRmYzFiMmE1MzMyNmYu Ljg0NjgxNGUyNzlmMzdlNDJjNjZjMGMzMDM3ZjVhZWZjMTA4MjEwYTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvd2luL01hcnNoYWxsaW5nSGVscGVycy5jcHAKKysrIGIvU291cmNlL1dlYktp dC93aW4vTWFyc2hhbGxpbmdIZWxwZXJzLmNwcApAQCAtNTEsNyArNTEsNyBAQCBCU1RSIE1hcnNo YWxsaW5nSGVscGVyczo6VVJMVG9CU1RSKGNvbnN0IFVSTCYgdXJsKQogCiBDRlVSTFJlZiBNYXJz aGFsbGluZ0hlbHBlcnM6OlBhdGhTdHJpbmdUb0ZpbGVDRlVSTFJlZihjb25zdCBTdHJpbmcmIHN0 cmluZykKIHsKLSAgICBDRlN0cmluZ1JlZiBjZlBhdGggPSBDRlN0cmluZ0NyZWF0ZVdpdGhDaGFy YWN0ZXJzTm9Db3B5KDAsIChjb25zdCBVbmlDaGFyKilzdHJpbmcuY2hhcmFjdGVycygpLCBzdHJp bmcubGVuZ3RoKCksIGtDRkFsbG9jYXRvck51bGwpOworICAgIENGU3RyaW5nUmVmIGNmUGF0aCA9 IENGU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3RlcnNOb0NvcHkoMCwgKGNvbnN0IFVuaUNoYXIqKXN0 cmluZy5kZXByZWNhdGVkQ2hhcmFjdGVycygpLCBzdHJpbmcubGVuZ3RoKCksIGtDRkFsbG9jYXRv ck51bGwpOwogICAgIENGVVJMUmVmIHBhdGhVUkwgPSBDRlVSTENyZWF0ZVdpdGhGaWxlU3lzdGVt UGF0aCgwLCBjZlBhdGgsIGtDRlVSTFdpbmRvd3NQYXRoU3R5bGUsIGZhbHNlKTsKICAgICBDRlJl bGVhc2UoY2ZQYXRoKTsKICAgICByZXR1cm4gcGF0aFVSTDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvd2luL1dlYkRhdGFTb3VyY2UuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViRGF0YVNv dXJjZS5jcHAKaW5kZXggM2FhZTg1MmVlZDNhNjc2NDBlYTMxNzY1ZmVjMmNmMzI5NzcyN2FmZS4u M2E2OTcxMGFhNzY2OTUyZjBjYjgxNmNiYmQyMzVlODk4MWMzMWU2YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC93aW4vV2ViRGF0YVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4v V2ViRGF0YVNvdXJjZS5jcHAKQEAgLTI1NSw3ICsyNTUsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENB TExUWVBFIFdlYkRhdGFTb3VyY2U6OnVucmVhY2hhYmxlVVJMKAogICAgIC8qIFtyZXR2YWxdW291 dF0gKi8gQlNUUiogdXJsKQogewogICAgIFVSTCB1bnJlYWNoYWJsZVVSTCA9IG1fbG9hZGVyLT51 bnJlYWNoYWJsZVVSTCgpOwotICAgIEJTdHJpbmcgdXJsU3RyaW5nKChMUE9MRVNUUil1bnJlYWNo YWJsZVVSTC5zdHJpbmcoKS5jaGFyYWN0ZXJzKCksIHVucmVhY2hhYmxlVVJMLnN0cmluZygpLmxl bmd0aCgpKTsKKyAgICBCU3RyaW5nIHVybFN0cmluZygoTFBPTEVTVFIpdW5yZWFjaGFibGVVUkwu c3RyaW5nKCkuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgdW5yZWFjaGFibGVVUkwuc3RyaW5nKCku bGVuZ3RoKCkpOwogCiAgICAgKnVybCA9IHVybFN0cmluZy5yZWxlYXNlKCk7CiAgICAgcmV0dXJu IFNfT0s7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJEb3dubG9hZC5jcHAgYi9T b3VyY2UvV2ViS2l0L3dpbi9XZWJEb3dubG9hZC5jcHAKaW5kZXggM2QxYjJkNmI4YjRhMDVhZWU5 OTRkOTkxZjk1MDE4MTJhMTE0MmNkNi4uZDY5YTYzNzg0NjNiMjQxYWFhZmU1ZDljNGJiNjgxMmQw ZTU4NzAxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkRvd25sb2FkLmNwcApAQCAtMTQ5LDcgKzE0OSw3IEBA IEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViRG93bmxvYWQ6OmJ1bmRsZVBhdGhGb3JUYXJn ZXRQYXRoKAogICAgICAgICBidW5kbGUudHJ1bmNhdGUoMSk7CiAKICAgICBidW5kbGUuYXBwZW5k KERvd25sb2FkQnVuZGxlOjpmaWxlRXh0ZW5zaW9uKCkpOwotICAgICpidW5kbGVQYXRoID0gU3lz QWxsb2NTdHJpbmdMZW4oYnVuZGxlLmNoYXJhY3RlcnMoKSwgYnVuZGxlLmxlbmd0aCgpKTsKKyAg ICAqYnVuZGxlUGF0aCA9IFN5c0FsbG9jU3RyaW5nTGVuKGJ1bmRsZS5kZXByZWNhdGVkQ2hhcmFj dGVycygpLCBidW5kbGUubGVuZ3RoKCkpOwogICAgIGlmICghKmJ1bmRsZVBhdGgpCiAgICAgICAg cmV0dXJuIEVfRkFJTDsKICAgICByZXR1cm4gU19PSzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvd2luL1dlYkRvd25sb2FkQ0ZOZXQuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxv YWRDRk5ldC5jcHAKaW5kZXggMDA4MjZhYTUyNTIxZGY0YmMwYjk0NTU3MTMxYjAzNmVjMGJmNGZi MC4uNmU5OTJiYTE0OWI2N2VjNzU2ODI0ZTNjZmE0ZjE4NDZmYjdmNTAwMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWRDRk5ldC5jcHAKKysrIGIvU291cmNlL1dlYktp dC93aW4vV2ViRG93bmxvYWRDRk5ldC5jcHAKQEAgLTQ4Myw3ICs0ODMsNyBAQCB2b2lkIFdlYkRv d25sb2FkOjpkaWRGaW5pc2goKQogICAgICAgICAKICAgICAgICAgYm9vbCByZXBvcnRCdW5kbGVQ YXRoQXNGaW5hbFBhdGggPSB0cnVlOwogCi0gICAgICAgIEJTdHJpbmcgZGVzdGluYXRpb25CU1RS KG1fZGVzdGluYXRpb24uY2hhcmFjdGVycygpLCBtX2Rlc3RpbmF0aW9uLmxlbmd0aCgpKTsKKyAg ICAgICAgQlN0cmluZyBkZXN0aW5hdGlvbkJTVFIobV9kZXN0aW5hdGlvbi5kZXByZWNhdGVkQ2hh cmFjdGVycygpLCBtX2Rlc3RpbmF0aW9uLmxlbmd0aCgpKTsKICAgICAgICAgaWYgKEZBSUxFRCht X2RlbGVnYXRlLT5kZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFtZSh0aGlzLCBk ZXN0aW5hdGlvbkJTVFIpKSkKICAgICAgICAgICAgIExPR19FUlJPUigiZGVsZWdhdGUtPmRlY2lk ZURlc3RpbmF0aW9uV2l0aFN1Z2dlc3RlZEZpbGVuYW1lKCkgZmFpbGVkIik7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkVsZW1lbnRQcm9wZXJ0eUJhZy5jcHAgYi9Tb3VyY2Uv V2ViS2l0L3dpbi9XZWJFbGVtZW50UHJvcGVydHlCYWcuY3BwCmluZGV4IDYxOTVmYmZkMzk0NDNk ODU2YjU5MmU3ZTdiNjFiNDY2NmNlM2FhZjAuLjAzNjI4OTYxYzRiNTVjMDMzMmRjNGU0NzZlZjI0 ZGU1ZTlmZWRhNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkVsZW1lbnRQcm9w ZXJ0eUJhZy5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViRWxlbWVudFByb3BlcnR5QmFn LmNwcApAQCAtMTAyLDcgKzEwMiw3IEBAIHN0YXRpYyBib29sIGlzRXF1YWwoTFBDV1NUUiBzMSwg TFBDV1NUUiBzMikKIHN0YXRpYyBIUkVTVUxUIGNvbnZlcnRTdHJpbmdUb1ZhcmlhbnQoVkFSSUFO VCogcFZhciwgY29uc3QgU3RyaW5nJiBzdHJpbmcpCiB7CiAgICAgVl9WVChwVmFyKSA9IFZUX0JT VFI7Ci0gICAgVl9CU1RSKHBWYXIpID0gU3lzQWxsb2NTdHJpbmdMZW4oc3RyaW5nLmNoYXJhY3Rl cnMoKSwgc3RyaW5nLmxlbmd0aCgpKTsKKyAgICBWX0JTVFIocFZhcikgPSBTeXNBbGxvY1N0cmlu Z0xlbihzdHJpbmcuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgc3RyaW5nLmxlbmd0aCgpKTsKICAg ICBpZiAoc3RyaW5nLmxlbmd0aCgpICYmICFWX0JTVFIocFZhcikpCiAgICAgICAgIHJldHVybiBF X09VVE9GTUVNT1JZOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJGcmFtZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKaW5kZXggMzNiNGQwZTNlYTM1MmZl OGZhZTBkNWFmZGFiYWRlMTJlY2QyMzc0MS4uYjUzMTc5ZmIyNGZmZGQ2MzhkNGIxOTFhZjk0ZDFl OTVmOGE2YjBlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViRnJhbWUuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkZyYW1lLmNwcApAQCAtMTM4Myw3ICsxMzgzLDcgQEAg SFJFU1VMVCBXZWJGcmFtZTo6c2VhcmNoRm9yTGFiZWxzQmVmb3JlRWxlbWVudChjb25zdCBCU1RS KiBsYWJlbHMsIHVuc2lnbmVkIGNMYWIKICAgICBib29sIHJlc3VsdElzSW5DZWxsQWJvdmU7CiAg ICAgU3RyaW5nIGxhYmVsID0gY29yZUZyYW1lLT5zZWFyY2hGb3JMYWJlbHNCZWZvcmVFbGVtZW50 KGxhYmVsU3RyaW5ncywgY29yZUVsZW1lbnQsICZyZXN1bHREaXN0YW5jZSwgJnJlc3VsdElzSW5D ZWxsQWJvdmUpOwogICAgIAotICAgICpyZXN1bHQgPSBTeXNBbGxvY1N0cmluZ0xlbihsYWJlbC5j aGFyYWN0ZXJzKCksIGxhYmVsLmxlbmd0aCgpKTsKKyAgICAqcmVzdWx0ID0gU3lzQWxsb2NTdHJp bmdMZW4obGFiZWwuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgbGFiZWwubGVuZ3RoKCkpOwogICAg IGlmIChsYWJlbC5sZW5ndGgoKSAmJiAhKnJlc3VsdCkKICAgICAgICAgcmV0dXJuIEVfT1VUT0ZN RU1PUlk7CiAgICAgaWYgKG91dFJlc3VsdERpc3RhbmNlKQpAQCAtMTQyMSw3ICsxNDIxLDcgQEAg SFJFU1VMVCBXZWJGcmFtZTo6bWF0Y2hMYWJlbHNBZ2FpbnN0RWxlbWVudChjb25zdCBCU1RSKiBs YWJlbHMsIGludCBjTGFiZWxzLCBJRE8KIAogICAgIFN0cmluZyBsYWJlbCA9IGNvcmVGcmFtZS0+ bWF0Y2hMYWJlbHNBZ2FpbnN0RWxlbWVudChsYWJlbFN0cmluZ3MsIGNvcmVFbGVtZW50KTsKICAg ICAKLSAgICAqcmVzdWx0ID0gU3lzQWxsb2NTdHJpbmdMZW4obGFiZWwuY2hhcmFjdGVycygpLCBs YWJlbC5sZW5ndGgoKSk7CisgICAgKnJlc3VsdCA9IFN5c0FsbG9jU3RyaW5nTGVuKGxhYmVsLmRl cHJlY2F0ZWRDaGFyYWN0ZXJzKCksIGxhYmVsLmxlbmd0aCgpKTsKICAgICBpZiAobGFiZWwubGVu Z3RoKCkgJiYgISpyZXN1bHQpCiAgICAgICAgIHJldHVybiBFX09VVE9GTUVNT1JZOwogICAgIHJl dHVybiBTX09LOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViSGlzdG9yeS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5LmNwcAppbmRleCA5ZTAzNDhlNTA1ZWI4MzRi NzRlNDVlM2M4YTY3ZDhlM2ViYTA5ZDBjLi43MWQxZTZkNmQzZDVhMjdjNDAxZmI3NjFhOTBiNTNk Njc5NzM1MjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5LmNwcApAQCAtNTY3LDYgKzU2Nyw2IEBA IHZvaWQgV2ViSGlzdG9yeTo6YWRkVmlzaXRlZExpbmtzVG9QYWdlR3JvdXAoUGFnZUdyb3VwJiBn cm91cCkKIHsKICAgICBmb3IgKGF1dG8gaXQgPSBtX2VudHJpZXNCeVVSTC5iZWdpbigpOyBpdCAh PSBtX2VudHJpZXNCeVVSTC5lbmQoKTsgKytpdCkgewogICAgICAgICBjb25zdCBTdHJpbmcmIHVy bCA9IGl0LT5rZXk7Ci0gICAgICAgIGdyb3VwLmFkZFZpc2l0ZWRMaW5rKHVybC5jaGFyYWN0ZXJz KCksIHVybC5sZW5ndGgoKSk7CisgICAgICAgIGdyb3VwLmFkZFZpc2l0ZWRMaW5rKHVybC5kZXBy ZWNhdGVkQ2hhcmFjdGVycygpLCB1cmwubGVuZ3RoKCkpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2lu L1dlYktpdEdyYXBoaWNzLmNwcAppbmRleCA0YzJmYjYzMjYzODkwMTlkMTBmNTk1MTVmNTU1ZWFh MWM1ZDk2NzUyLi5lYTNhZWFmMzNhMGYyYTdhZGI5OWE0NWY4ZWJlYTYxN2U0NjExNjYxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5jcHAKKysrIGIvU291cmNl L1dlYktpdC93aW4vV2ViS2l0R3JhcGhpY3MuY3BwCkBAIC0xMTcsNyArMTE3LDcgQEAgdW5zaWdu ZWQgQ2VudGVyVHJ1bmNhdGVTdHJpbmdUb1dpZHRoKExQQ1RTVFIgdGV4dCwgaW50IGxlbmd0aCwg Y29uc3QgV2ViRm9udERlc2MKICAgICBGb250Q2FjaGVQdXJnZVByZXZlbnRlciBmb250Q2FjaGVQ dXJnZVByZXZlbnRlcjsKIAogICAgIFN0cmluZyByZXN1bHQgPSBTdHJpbmdUcnVuY2F0b3I6OmNl bnRlclRydW5jYXRlKFN0cmluZyh0ZXh0LCBsZW5ndGgpLCB3aWR0aCwgbWFrZUZvbnQoZGVzY3Jp cHRpb24pLCBTdHJpbmdUcnVuY2F0b3I6OkVuYWJsZVJvdW5kaW5nSGFja3MpOwotICAgIG1lbWNw eShidWZmZXIsIHJlc3VsdC5jaGFyYWN0ZXJzKCksIHJlc3VsdC5sZW5ndGgoKSAqIHNpemVvZihV Q2hhcikpOworICAgIG1lbWNweShidWZmZXIsIHJlc3VsdC5kZXByZWNhdGVkQ2hhcmFjdGVycygp LCByZXN1bHQubGVuZ3RoKCkgKiBzaXplb2YoVUNoYXIpKTsKICAgICBidWZmZXJbcmVzdWx0Lmxl bmd0aCgpXSA9ICdcMCc7CiAgICAgcmV0dXJuIHJlc3VsdC5sZW5ndGgoKTsKIH0KQEAgLTEyOSw3 ICsxMjksNyBAQCB1bnNpZ25lZCBSaWdodFRydW5jYXRlU3RyaW5nVG9XaWR0aChMUENUU1RSIHRl eHQsIGludCBsZW5ndGgsIGNvbnN0IFdlYkZvbnREZXNjcgogICAgIEZvbnRDYWNoZVB1cmdlUHJl dmVudGVyIGZvbnRDYWNoZVB1cmdlUHJldmVudGVyOwogCiAgICAgU3RyaW5nIHJlc3VsdCA9IFN0 cmluZ1RydW5jYXRvcjo6cmlnaHRUcnVuY2F0ZShTdHJpbmcodGV4dCwgbGVuZ3RoKSwgd2lkdGgs IG1ha2VGb250KGRlc2NyaXB0aW9uKSwgU3RyaW5nVHJ1bmNhdG9yOjpFbmFibGVSb3VuZGluZ0hh Y2tzKTsKLSAgICBtZW1jcHkoYnVmZmVyLCByZXN1bHQuY2hhcmFjdGVycygpLCByZXN1bHQubGVu Z3RoKCkgKiBzaXplb2YoVUNoYXIpKTsKKyAgICBtZW1jcHkoYnVmZmVyLCByZXN1bHQuZGVwcmVj YXRlZENoYXJhY3RlcnMoKSwgcmVzdWx0Lmxlbmd0aCgpICogc2l6ZW9mKFVDaGFyKSk7CiAgICAg YnVmZmVyW3Jlc3VsdC5sZW5ndGgoKV0gPSAnXDAnOwogICAgIHJldHVybiByZXN1bHQubGVuZ3Ro KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IDllY2I0ZTcxYTI1N2QyMzdkOTM3YzMxN2I4 ZDFjYjkwZjcxNTA4ZmEuLjk3MDc0OWRmNjJmOWEyZTY4YWZhMzc4YzJmMDQ3ZTVhNjNkZjUwNDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvd2luL1dlYlZpZXcuY3BwCkBAIC0zMTczLDcgKzMxNzMsNyBAQCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIFdlYlZpZXc6OnNldEFwcGxpY2F0aW9uTmFtZUZvclVzZXJBZ2VudCgKIEhS RVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6YXBwbGljYXRpb25OYW1lRm9yVXNlckFn ZW50KCAKICAgICAvKiBbcmV0dmFsXVtvdXRdICovIEJTVFIqIGFwcGxpY2F0aW9uTmFtZSkKIHsK LSAgICAqYXBwbGljYXRpb25OYW1lID0gU3lzQWxsb2NTdHJpbmdMZW4obV9hcHBsaWNhdGlvbk5h bWUuY2hhcmFjdGVycygpLCBtX2FwcGxpY2F0aW9uTmFtZS5sZW5ndGgoKSk7CisgICAgKmFwcGxp Y2F0aW9uTmFtZSA9IFN5c0FsbG9jU3RyaW5nTGVuKG1fYXBwbGljYXRpb25OYW1lLmRlcHJlY2F0 ZWRDaGFyYWN0ZXJzKCksIG1fYXBwbGljYXRpb25OYW1lLmxlbmd0aCgpKTsKICAgICBpZiAoISph cHBsaWNhdGlvbk5hbWUgJiYgbV9hcHBsaWNhdGlvbk5hbWUubGVuZ3RoKCkpCiAgICAgICAgIHJl dHVybiBFX09VVE9GTUVNT1JZOwogICAgIHJldHVybiBTX09LOwpAQCAtMzE5Myw3ICszMTkzLDcg QEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpjdXN0b21Vc2VyQWdlbnQoCiAg ICAgKnVzZXJBZ2VudFN0cmluZyA9IDA7CiAgICAgaWYgKCFtX3VzZXJBZ2VudE92ZXJyaWRkZW4p CiAgICAgICAgIHJldHVybiBTX09LOwotICAgICp1c2VyQWdlbnRTdHJpbmcgPSBTeXNBbGxvY1N0 cmluZ0xlbihtX3VzZXJBZ2VudEN1c3RvbS5jaGFyYWN0ZXJzKCksIG1fdXNlckFnZW50Q3VzdG9t Lmxlbmd0aCgpKTsKKyAgICAqdXNlckFnZW50U3RyaW5nID0gU3lzQWxsb2NTdHJpbmdMZW4obV91 c2VyQWdlbnRDdXN0b20uZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgbV91c2VyQWdlbnRDdXN0b20u bGVuZ3RoKCkpOwogICAgIGlmICghKnVzZXJBZ2VudFN0cmluZyAmJiBtX3VzZXJBZ2VudEN1c3Rv bS5sZW5ndGgoKSkKICAgICAgICAgcmV0dXJuIEVfT1VUT0ZNRU1PUlk7CiAgICAgcmV0dXJuIFNf T0s7CkBAIC0zNjQxLDcgKzM2NDEsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZp ZXc6Omdyb3VwTmFtZSgKICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuIFNfT0s7CiAg ICAgU3RyaW5nIGdyb3VwTmFtZVN0cmluZyA9IG1fcGFnZS0+Z3JvdXBOYW1lKCk7Ci0gICAgKmdy b3VwTmFtZSA9IFN5c0FsbG9jU3RyaW5nTGVuKGdyb3VwTmFtZVN0cmluZy5jaGFyYWN0ZXJzKCks IGdyb3VwTmFtZVN0cmluZy5sZW5ndGgoKSk7CisgICAgKmdyb3VwTmFtZSA9IFN5c0FsbG9jU3Ry aW5nTGVuKGdyb3VwTmFtZVN0cmluZy5kZXByZWNhdGVkQ2hhcmFjdGVycygpLCBncm91cE5hbWVT dHJpbmcubGVuZ3RoKCkpOwogICAgIGlmICghKmdyb3VwTmFtZSAmJiBncm91cE5hbWVTdHJpbmcu bGVuZ3RoKCkpCiAgICAgICAgIHJldHVybiBFX09VVE9GTUVNT1JZOwogICAgIHJldHVybiBTX09L OwpAQCAtMzc1MSw3ICszNzUxLDcgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3 OjpzZWxlY3RlZFRleHQoCiAgICAgICAgIHJldHVybiBFX0ZBSUw7CiAKICAgICBTdHJpbmcgZnJh bWVTZWxlY3RlZFRleHQgPSBmb2N1c2VkRnJhbWUtPmVkaXRvcigpLnNlbGVjdGVkVGV4dCgpOwot ICAgICp0ZXh0ID0gU3lzQWxsb2NTdHJpbmdMZW4oZnJhbWVTZWxlY3RlZFRleHQuY2hhcmFjdGVy cygpLCBmcmFtZVNlbGVjdGVkVGV4dC5sZW5ndGgoKSk7CisgICAgKnRleHQgPSBTeXNBbGxvY1N0 cmluZ0xlbihmcmFtZVNlbGVjdGVkVGV4dC5kZXByZWNhdGVkQ2hhcmFjdGVycygpLCBmcmFtZVNl bGVjdGVkVGV4dC5sZW5ndGgoKSk7CiAgICAgaWYgKCEqdGV4dCAmJiBmcmFtZVNlbGVjdGVkVGV4 dC5sZW5ndGgoKSkKICAgICAgICAgcmV0dXJuIEVfT1VUT0ZNRU1PUlk7CiAgICAgcmV0dXJuIFNf T0s7CkBAIC01ODIzLDcgKzU4MjMsNyBAQCBMUkVTVUxUIFdlYlZpZXc6Om9uSU1FUmVxdWVzdFJl Y29udmVydFN0cmluZyhGcmFtZSogdGFyZ2V0RnJhbWUsIFJFQ09OVkVSVFNUUklORwogICAgIHJl Y29udmVydFN0cmluZy0+ZHdTdHJMZW4gPSB0ZXh0Lmxlbmd0aCgpOwogICAgIHJlY29udmVydFN0 cmluZy0+ZHdUYXJnZXRTdHJMZW4gPSB0ZXh0Lmxlbmd0aCgpOwogICAgIHJlY29udmVydFN0cmlu Zy0+ZHdTdHJPZmZzZXQgPSBzaXplb2YoUkVDT05WRVJUU1RSSU5HKTsKLSAgICBtZW1jcHkocmVj b252ZXJ0U3RyaW5nICsgMSwgdGV4dC5jaGFyYWN0ZXJzKCksIHRleHQubGVuZ3RoKCkgKiBzaXpl b2YoVUNoYXIpKTsKKyAgICBtZW1jcHkocmVjb252ZXJ0U3RyaW5nICsgMSwgdGV4dC5kZXByZWNh dGVkQ2hhcmFjdGVycygpLCB0ZXh0Lmxlbmd0aCgpICogc2l6ZW9mKFVDaGFyKSk7CiAgICAgcmV0 dXJuIHRvdGFsU2l6ZTsKIH0KIAo=