96468 2012-09-11 22:18:40 -0700 Don't allocate a backing store just for a function's name 2012-09-11 23:14:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 717919 0 ggaren 2012-09-11 22:18:40 -0700 Don't allocate a backing store just for a function's name 717924 1 163519 ggaren 2012-09-11 22:22:04 -0700 Created attachment 163519 Patch 717945 2 ggaren 2012-09-11 23:14:26 -0700 Committed r128265: <http://trac.webkit.org/changeset/128265> 163519 2012-09-11 22:22:04 -0700 2012-09-11 22:28:04 -0700 Patch bug-96468-20120911222138.patch text/plain 12797 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI4MjYzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBA CisyMDEyLTA5LTExICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgRG9uJ3QgYWxsb2NhdGUgYSBiYWNraW5nIHN0b3JlIGp1c3QgZm9yIGEgZnVuY3Rpb24ncyBu YW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjQ2 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRyZWF0 IGZ1bmN0aW9uLm5hbWUgbGlrZSBmdW5jdGlvbi5sZW5ndGggZXRjLiwgYW5kIHVzZSBhIGN1c3Rv bSBnZXR0ZXIuCisgICAgICAgIFRoaXMgc2F2ZXMgc3BhY2UgaW4gY2xvc3VyZXMuCisKKyAgICAg ICAgKiBkZWJ1Z2dlci9EZWJ1Z2dlckNhbGxGcmFtZS5jcHA6CisgICAgICAgIChKU0M6OkRlYnVn Z2VyQ2FsbEZyYW1lOjpmdW5jdGlvbk5hbWUpOgorICAgICAgICAqIGRlYnVnZ2VyL0RlYnVnZ2Vy Q2FsbEZyYW1lLmg6CisgICAgICAgIChEZWJ1Z2dlckNhbGxGcmFtZSk6IFVwZGF0ZWQgZm9yIGlu dGVyZmFjZSBjaGFuZ2UuCisKKyAgICAgICAgKiBydW50aW1lL0V4ZWN1dGFibGUuaDoKKyAgICAg ICAgKEpTQzo6SlNGdW5jdGlvbjo6SlNGdW5jdGlvbik6IERvIGEgbGl0dGxlIGlubGluaW5nLgor CisgICAgICAgICogcnVudGltZS9KU0Z1bmN0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6SlNGdW5j dGlvbjo6ZmluaXNoQ3JlYXRpb24pOiBHb25lIG5vdy4gVGhhdCdzIHRoZSBwb2ludCBvZiB0aGUg cGF0Y2guCisKKyAgICAgICAgKEpTQzo6SlNGdW5jdGlvbjo6bmFtZSk6CisgICAgICAgIChKU0M6 OkpTRnVuY3Rpb246OmRpc3BsYXlOYW1lKToKKyAgICAgICAgKEpTQzo6SlNGdW5jdGlvbjo6bmFt ZUdldHRlcik6CisgICAgICAgIChKU0M6OkpTRnVuY3Rpb246OmdldE93blByb3BlcnR5U2xvdCk6 CisgICAgICAgIChKU0M6OkpTRnVuY3Rpb246OmdldE93blByb3BlcnR5RGVzY3JpcHRvcik6Cisg ICAgICAgIChKU0M6OkpTRnVuY3Rpb246OmdldE93blByb3BlcnR5TmFtZXMpOgorICAgICAgICAo SlNDOjpKU0Z1bmN0aW9uOjpwdXQpOgorICAgICAgICAoSlNDOjpKU0Z1bmN0aW9uOjpkZWxldGVQ cm9wZXJ0eSk6CisgICAgICAgIChKU0M6OkpTRnVuY3Rpb246OmRlZmluZU93blByb3BlcnR5KTog QWRkZWQgY3VzdG9tIGFjY2Vzc29ycyBmb3IgLm5hbWUKKyAgICAgICAganVzdCBsaWtlIC5sZW5n dGggYW5kIG90aGVycy4KKworICAgICAgICAqIHJ1bnRpbWUvSlNGdW5jdGlvbi5oOgorICAgICAg ICAoSlNDOjpKU0Z1bmN0aW9uOjpjcmVhdGUpOgorICAgICAgICAoSlNGdW5jdGlvbik6IFVwZGF0 ZWQgZm9yIGludGVyZmFjZSBjaGFuZ2VzLgorCiAyMDEyLTA5LTExICBNYXJrIEhhaG5lbmJlcmcg IDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgSW5jcmVtZW50YWxTd2VlcGVyIHNo b3VsZCBub3Qgc3dlZXAvZnJlZSBaYXBwZWQgYmxvY2tzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGVidWdnZXIvRGVidWdnZXJDYWxsRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlckNhbGxGcmFtZS5jcHAJKHJldmlzaW9u IDEyODI1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlckNhbGxG cmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDE4ICszNiwxOCBAQAogCiBuYW1lc3BhY2Ug SlNDIHsKIAotY29uc3QgU3RyaW5nKiBEZWJ1Z2dlckNhbGxGcmFtZTo6ZnVuY3Rpb25OYW1lKCkg Y29uc3QKK1N0cmluZyBEZWJ1Z2dlckNhbGxGcmFtZTo6ZnVuY3Rpb25OYW1lKCkgY29uc3QKIHsK ICAgICBpZiAoIW1fY2FsbEZyYW1lLT5jb2RlQmxvY2soKSkKLSAgICAgICAgcmV0dXJuIDA7Cisg ICAgICAgIHJldHVybiBTdHJpbmcoKTsKIAogICAgIGlmICghbV9jYWxsRnJhbWUtPmNhbGxlZSgp KQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOwogCiAgICAgSlNP YmplY3QqIGZ1bmN0aW9uID0gbV9jYWxsRnJhbWUtPmNhbGxlZSgpOwogICAgIGlmICghZnVuY3Rp b24gfHwgIWZ1bmN0aW9uLT5pbmhlcml0cygmSlNGdW5jdGlvbjo6c19pbmZvKSkKLSAgICAgICAg cmV0dXJuIDA7Ci0gICAgcmV0dXJuICZqc0Nhc3Q8SlNGdW5jdGlvbio+KGZ1bmN0aW9uKS0+bmFt ZShtX2NhbGxGcmFtZSk7CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICByZXR1cm4ganND YXN0PEpTRnVuY3Rpb24qPihmdW5jdGlvbiktPm5hbWUobV9jYWxsRnJhbWUpOwogfQogICAgIAog U3RyaW5nIERlYnVnZ2VyQ2FsbEZyYW1lOjpjYWxjdWxhdGVkRnVuY3Rpb25OYW1lKCkgY29uc3QK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlckNhbGxGcmFtZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9EZWJ1Z2dlckNh bGxGcmFtZS5oCShyZXZpc2lvbiAxMjgyNTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVi dWdnZXIvRGVidWdnZXJDYWxsRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtNTEsNyArNTEsNyBA QCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgQ2FsbEZyYW1lKiBjYWxsRnJhbWUoKSBjb25zdCB7 IHJldHVybiBtX2NhbGxGcmFtZTsgfQogICAgICAgICBKU0dsb2JhbE9iamVjdCogZHluYW1pY0ds b2JhbE9iamVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FsbEZyYW1lLT5keW5hbWljR2xvYmFsT2Jq ZWN0KCk7IH0KICAgICAgICAgSlNTY29wZSogc2NvcGUoKSBjb25zdCB7IHJldHVybiBtX2NhbGxG cmFtZS0+c2NvcGUoKTsgfQotICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBjb25zdCBTdHJpbmcq IGZ1bmN0aW9uTmFtZSgpIGNvbnN0OworICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBTdHJpbmcg ZnVuY3Rpb25OYW1lKCkgY29uc3Q7CiAgICAgICAgIEpTX0VYUE9SVF9QUklWQVRFIFN0cmluZyBj YWxjdWxhdGVkRnVuY3Rpb25OYW1lKCkgY29uc3Q7CiAgICAgICAgIEpTX0VYUE9SVF9QUklWQVRF IFR5cGUgdHlwZSgpIGNvbnN0OwogICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBKU09iamVjdCog dGhpc09iamVjdCgpIGNvbnN0OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv RXhlY3V0YWJsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0V4ZWN1dGFibGUuaAkocmV2aXNpb24gMTI4MjU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvRXhlY3V0YWJsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAj aW5jbHVkZSAiSGFuZGxlckluZm8uaCIKICNpbmNsdWRlICJKU0Z1bmN0aW9uLmgiCiAjaW5jbHVk ZSAiSW50ZXJwcmV0ZXIuaCIKKyNpbmNsdWRlICJKU0dsb2JhbE9iamVjdC5oIgogI2luY2x1ZGUg IkxMSW50Q0xvb3AuaCIKICNpbmNsdWRlICJOb2Rlcy5oIgogI2luY2x1ZGUgIlNhbXBsaW5nVG9v bC5oIgpAQCAtNzU0LDYgKzc1NSwxMyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgV3JpdGVC YXJyaWVyPFNoYXJlZFN5bWJvbFRhYmxlPiBtX3N5bWJvbFRhYmxlOwogICAgIH07CiAKKyAgICBp bmxpbmUgSlNGdW5jdGlvbjo6SlNGdW5jdGlvbihKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEsIEZ1 bmN0aW9uRXhlY3V0YWJsZSogZXhlY3V0YWJsZSwgSlNTY29wZSogc2NvcGUpCisgICAgICAgIDog QmFzZShnbG9iYWxEYXRhLCBzY29wZS0+Z2xvYmFsT2JqZWN0KCktPmZ1bmN0aW9uU3RydWN0dXJl KCkpCisgICAgICAgICwgbV9leGVjdXRhYmxlKGdsb2JhbERhdGEsIHRoaXMsIGV4ZWN1dGFibGUp CisgICAgICAgICwgbV9zY29wZShnbG9iYWxEYXRhLCB0aGlzLCBzY29wZSkKKyAgICB7CisgICAg fQorCiAgICAgaW5saW5lIEZ1bmN0aW9uRXhlY3V0YWJsZSogSlNGdW5jdGlvbjo6anNFeGVjdXRh YmxlKCkgY29uc3QKICAgICB7CiAgICAgICAgIEFTU0VSVCghaXNIb3N0RnVuY3Rpb25Ob25Jbmxp bmUoKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9u LmNwcAkocmV2aXNpb24gMTI4MjU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNGdW5jdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg0LDEzICs4NCw2IEBAIEpTRnVuY3Rp b246OkpTRnVuY3Rpb24oRXhlY1N0YXRlKiBleGVjLCAKIHsKIH0KIAotSlNGdW5jdGlvbjo6SlNG dW5jdGlvbihFeGVjU3RhdGUqIGV4ZWMsIEZ1bmN0aW9uRXhlY3V0YWJsZSogZXhlY3V0YWJsZSwg SlNTY29wZSogc2NvcGUpCi0gICAgOiBCYXNlKGV4ZWMtPmdsb2JhbERhdGEoKSwgc2NvcGUtPmds b2JhbE9iamVjdCgpLT5mdW5jdGlvblN0cnVjdHVyZSgpKQotICAgICwgbV9leGVjdXRhYmxlKGV4 ZWMtPmdsb2JhbERhdGEoKSwgdGhpcywgZXhlY3V0YWJsZSkKLSAgICAsIG1fc2NvcGUoZXhlYy0+ Z2xvYmFsRGF0YSgpLCB0aGlzLCBzY29wZSkKLXsKLX0KLQogdm9pZCBKU0Z1bmN0aW9uOjpmaW5p c2hDcmVhdGlvbihFeGVjU3RhdGUqIGV4ZWMsIE5hdGl2ZUV4ZWN1dGFibGUqIGV4ZWN1dGFibGUs IGludCBsZW5ndGgsIGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKICAgICBCYXNlOjpmaW5pc2hDcmVh dGlvbihleGVjLT5nbG9iYWxEYXRhKCkpOwpAQCAtMTAwLDIwICs5Myw2IEBAIHZvaWQgSlNGdW5j dGlvbjo6ZmluaXNoQ3JlYXRpb24oRXhlY1N0YXQKICAgICBwdXREaXJlY3QoZXhlYy0+Z2xvYmFs RGF0YSgpLCBleGVjLT5wcm9wZXJ0eU5hbWVzKCkubGVuZ3RoLCBqc051bWJlcihsZW5ndGgpLCBE b250RGVsZXRlIHwgUmVhZE9ubHkgfCBEb250RW51bSk7CiB9CiAKLXZvaWQgSlNGdW5jdGlvbjo6 ZmluaXNoQ3JlYXRpb24oRXhlY1N0YXRlKiBleGVjLCBGdW5jdGlvbkV4ZWN1dGFibGUqIGV4ZWN1 dGFibGUsIEpTU2NvcGUqIHNjb3BlKQotewotICAgIEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSA9 IGV4ZWMtPmdsb2JhbERhdGEoKTsKLSAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbihnbG9iYWxEYXRh KTsKLSAgICBBU1NFUlQoaW5oZXJpdHMoJnNfaW5mbykpOwotCi0gICAgLy8gU3dpdGNoaW5nIHRo ZSBzdHJ1Y3R1cmUgaGVyZSBpcyBvbmx5IHNhZmUgaWYgd2UgY3VycmVudGx5IGhhdmUgdGhlIGZ1 bmN0aW9uIHN0cnVjdHVyZSEKLSAgICBBU1NFUlQoc3RydWN0dXJlKCkgPT0gc2NvcGUtPmdsb2Jh bE9iamVjdCgpLT5mdW5jdGlvblN0cnVjdHVyZSgpKTsKLSAgICBzZXRTdHJ1Y3R1cmVBbmRSZWFs bG9jYXRlU3RvcmFnZUlmTmVjZXNzYXJ5KAotICAgICAgICBnbG9iYWxEYXRhLAotICAgICAgICBz Y29wZS0+Z2xvYmFsT2JqZWN0KCktPm5hbWVkRnVuY3Rpb25TdHJ1Y3R1cmUoKSk7Ci0gICAgcHV0 RGlyZWN0T2Zmc2V0KGdsb2JhbERhdGEsIHNjb3BlLT5nbG9iYWxPYmplY3QoKS0+ZnVuY3Rpb25O YW1lT2Zmc2V0KCksIGV4ZWN1dGFibGUtPm5hbWVWYWx1ZSgpKTsKLX0KLQogU3RydWN0dXJlKiBK U0Z1bmN0aW9uOjpjYWNoZUluaGVyaXRvcklEKEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICBKU1Zh bHVlIHByb3RvdHlwZSA9IGdldChleGVjLCBleGVjLT5nbG9iYWxEYXRhKCkucHJvcGVydHlOYW1l cy0+cHJvdG90eXBlKTsKQEAgLTEyNCwxMiArMTAzLDEyIEBAIFN0cnVjdHVyZSogSlNGdW5jdGlv bjo6Y2FjaGVJbmhlcml0b3JJRCgKICAgICByZXR1cm4gbV9jYWNoZWRJbmhlcml0b3JJRC5nZXQo KTsKIH0KIAotY29uc3QgU3RyaW5nJiBKU0Z1bmN0aW9uOjpuYW1lKEV4ZWNTdGF0ZSogZXhlYykK K1N0cmluZyBKU0Z1bmN0aW9uOjpuYW1lKEV4ZWNTdGF0ZSogZXhlYykKIHsKLSAgICByZXR1cm4g YXNTdHJpbmcoZ2V0RGlyZWN0KGV4ZWMtPmdsb2JhbERhdGEoKSwgZXhlYy0+Z2xvYmFsRGF0YSgp LnByb3BlcnR5TmFtZXMtPm5hbWUpKS0+dHJ5R2V0VmFsdWUoKTsKKyAgICByZXR1cm4gZ2V0KGV4 ZWMsIGV4ZWMtPmdsb2JhbERhdGEoKS5wcm9wZXJ0eU5hbWVzLT5uYW1lKS50b1dURlN0cmluZyhl eGVjKTsKIH0KIAotY29uc3QgU3RyaW5nIEpTRnVuY3Rpb246OmRpc3BsYXlOYW1lKEV4ZWNTdGF0 ZSogZXhlYykKK1N0cmluZyBKU0Z1bmN0aW9uOjpkaXNwbGF5TmFtZShFeGVjU3RhdGUqIGV4ZWMp CiB7CiAgICAgSlNWYWx1ZSBkaXNwbGF5TmFtZSA9IGdldERpcmVjdChleGVjLT5nbG9iYWxEYXRh KCksIGV4ZWMtPmdsb2JhbERhdGEoKS5wcm9wZXJ0eU5hbWVzLT5kaXNwbGF5TmFtZSk7CiAgICAg CkBAIC0yMTMsNiArMTkyLDEzIEBAIEpTVmFsdWUgSlNGdW5jdGlvbjo6bGVuZ3RoR2V0dGVyKEV4 ZWNTdGEKICAgICByZXR1cm4ganNOdW1iZXIodGhpc09iai0+anNFeGVjdXRhYmxlKCktPnBhcmFt ZXRlckNvdW50KCkpOwogfQogCitKU1ZhbHVlIEpTRnVuY3Rpb246Om5hbWVHZXR0ZXIoRXhlY1N0 YXRlKiwgSlNWYWx1ZSBzbG90QmFzZSwgUHJvcGVydHlOYW1lKQoreworICAgIEpTRnVuY3Rpb24q IHRoaXNPYmogPSBqc0Nhc3Q8SlNGdW5jdGlvbio+KHNsb3RCYXNlKTsKKyAgICBBU1NFUlQoIXRo aXNPYmotPmlzSG9zdEZ1bmN0aW9uKCkpOworICAgIHJldHVybiB0aGlzT2JqLT5qc0V4ZWN1dGFi bGUoKS0+bmFtZVZhbHVlKCk7Cit9CisKIGJvb2wgSlNGdW5jdGlvbjo6Z2V0T3duUHJvcGVydHlT bG90KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlO YW1lLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCiB7CiAgICAgSlNGdW5jdGlvbiogdGhpc09iamVjdCA9 IGpzQ2FzdDxKU0Z1bmN0aW9uKj4oY2VsbCk7CkBAIC0yNTEsNiArMjM3LDExIEBAIGJvb2wgSlNG dW5jdGlvbjo6Z2V0T3duUHJvcGVydHlTbG90KEpTQ2UKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogCisgICAgaWYgKHByb3BlcnR5TmFtZSA9PSBleGVjLT5wcm9wZXJ0eU5hbWVzKCkubmFt ZSkgeworICAgICAgICBzbG90LnNldENhY2hlYWJsZUN1c3RvbSh0aGlzT2JqZWN0LCBuYW1lR2V0 dGVyKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgaWYgKHByb3BlcnR5TmFt ZSA9PSBleGVjLT5wcm9wZXJ0eU5hbWVzKCkuY2FsbGVyKSB7CiAgICAgICAgIGlmICh0aGlzT2Jq ZWN0LT5qc0V4ZWN1dGFibGUoKS0+aXNTdHJpY3RNb2RlKCkpIHsKICAgICAgICAgICAgIGJvb2wg cmVzdWx0ID0gQmFzZTo6Z2V0T3duUHJvcGVydHlTbG90KHRoaXNPYmplY3QsIGV4ZWMsIHByb3Bl cnR5TmFtZSwgc2xvdCk7CkBAIC0yOTksNiArMjkwLDExIEBAIGJvb2wgSlNGdW5jdGlvbjo6Z2V0 T3duUHJvcGVydHlEZXNjcmlwdG8KICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIAor ICAgIGlmIChwcm9wZXJ0eU5hbWUgPT0gZXhlYy0+cHJvcGVydHlOYW1lcygpLm5hbWUpIHsKKyAg ICAgICAgZGVzY3JpcHRvci5zZXREZXNjcmlwdG9yKHRoaXNPYmplY3QtPmpzRXhlY3V0YWJsZSgp LT5uYW1lVmFsdWUoKSwgUmVhZE9ubHkgfCBEb250RW51bSB8IERvbnREZWxldGUpOworICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICBpZiAocHJvcGVydHlOYW1lID09IGV4ZWMtPnBy b3BlcnR5TmFtZXMoKS5jYWxsZXIpIHsKICAgICAgICAgaWYgKHRoaXNPYmplY3QtPmpzRXhlY3V0 YWJsZSgpLT5pc1N0cmljdE1vZGUoKSkgewogICAgICAgICAgICAgYm9vbCByZXN1bHQgPSBCYXNl OjpnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IodGhpc09iamVjdCwgZXhlYywgcHJvcGVydHlOYW1l LCBkZXNjcmlwdG9yKTsKQEAgLTMyNyw2ICszMjMsNyBAQCB2b2lkIEpTRnVuY3Rpb246OmdldE93 blByb3BlcnR5TmFtZXMoSlNPCiAgICAgICAgIHByb3BlcnR5TmFtZXMuYWRkKGV4ZWMtPnByb3Bl cnR5TmFtZXMoKS5hcmd1bWVudHMpOwogICAgICAgICBwcm9wZXJ0eU5hbWVzLmFkZChleGVjLT5w cm9wZXJ0eU5hbWVzKCkuY2FsbGVyKTsKICAgICAgICAgcHJvcGVydHlOYW1lcy5hZGQoZXhlYy0+ cHJvcGVydHlOYW1lcygpLmxlbmd0aCk7CisgICAgICAgIHByb3BlcnR5TmFtZXMuYWRkKGV4ZWMt PnByb3BlcnR5TmFtZXMoKS5uYW1lKTsKICAgICB9CiAgICAgQmFzZTo6Z2V0T3duUHJvcGVydHlO YW1lcyh0aGlzT2JqZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWVzLCBtb2RlKTsKIH0KQEAgLTM1Niw3 ICszNTMsNyBAQCB2b2lkIEpTRnVuY3Rpb246OnB1dChKU0NlbGwqIGNlbGwsIEV4ZWNTCiAgICAg ICAgIEJhc2U6OnB1dCh0aGlzT2JqZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBzbG90 KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBpZiAocHJvcGVydHlOYW1lID09IGV4ZWMt PnByb3BlcnR5TmFtZXMoKS5hcmd1bWVudHMgfHwgcHJvcGVydHlOYW1lID09IGV4ZWMtPnByb3Bl cnR5TmFtZXMoKS5sZW5ndGggfHwgcHJvcGVydHlOYW1lID09IGV4ZWMtPnByb3BlcnR5TmFtZXMo KS5jYWxsZXIpIHsKKyAgICBpZiAocHJvcGVydHlOYW1lID09IGV4ZWMtPnByb3BlcnR5TmFtZXMo KS5hcmd1bWVudHMgfHwgcHJvcGVydHlOYW1lID09IGV4ZWMtPnByb3BlcnR5TmFtZXMoKS5sZW5n dGggfHwgcHJvcGVydHlOYW1lID09IGV4ZWMtPnByb3BlcnR5TmFtZXMoKS5uYW1lIHx8IHByb3Bl cnR5TmFtZSA9PSBleGVjLT5wcm9wZXJ0eU5hbWVzKCkuY2FsbGVyKSB7CiAgICAgICAgIGlmIChz bG90LmlzU3RyaWN0TW9kZSgpKQogICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgU3Ry aWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgcmV0dXJuOwpAQCAt MzcxLDYgKzM2OCw3IEBAIGJvb2wgSlNGdW5jdGlvbjo6ZGVsZXRlUHJvcGVydHkoSlNDZWxsKiAK ICAgICBpZiAoIXRoaXNPYmplY3QtPmlzSG9zdEZ1bmN0aW9uKCkgJiYgIWV4ZWMtPmdsb2JhbERh dGEoKS5pc0luRGVmaW5lT3duUHJvcGVydHkoKQogICAgICAgICAmJiAocHJvcGVydHlOYW1lID09 IGV4ZWMtPnByb3BlcnR5TmFtZXMoKS5hcmd1bWVudHMKICAgICAgICAgICAgIHx8IHByb3BlcnR5 TmFtZSA9PSBleGVjLT5wcm9wZXJ0eU5hbWVzKCkubGVuZ3RoCisgICAgICAgICAgICB8fCBwcm9w ZXJ0eU5hbWUgPT0gZXhlYy0+cHJvcGVydHlOYW1lcygpLm5hbWUKICAgICAgICAgICAgIHx8IHBy b3BlcnR5TmFtZSA9PSBleGVjLT5wcm9wZXJ0eU5hbWVzKCkucHJvdG90eXBlCiAgICAgICAgICAg ICB8fCBwcm9wZXJ0eU5hbWUgPT0gZXhlYy0+cHJvcGVydHlOYW1lcygpLmNhbGxlcikpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKQEAgLTQwOSw2ICs0MDcsOCBAQCBib29sIEpTRnVuY3Rpb246OmRl ZmluZU93blByb3BlcnR5KEpTT2JqCiAgICAgICAgIHZhbHVlQ2hlY2sgPSAhZGVzY3JpcHRvci52 YWx1ZSgpIHx8IHNhbWVWYWx1ZShleGVjLCBkZXNjcmlwdG9yLnZhbHVlKCksIGV4ZWMtPmludGVy cHJldGVyKCktPnJldHJpZXZlQ2FsbGVyRnJvbVZNQ29kZShleGVjLCB0aGlzT2JqZWN0KSk7CiAg ICAgfSBlbHNlIGlmIChwcm9wZXJ0eU5hbWUgPT0gZXhlYy0+cHJvcGVydHlOYW1lcygpLmxlbmd0 aCkKICAgICAgICAgdmFsdWVDaGVjayA9ICFkZXNjcmlwdG9yLnZhbHVlKCkgfHwgc2FtZVZhbHVl KGV4ZWMsIGRlc2NyaXB0b3IudmFsdWUoKSwganNOdW1iZXIodGhpc09iamVjdC0+anNFeGVjdXRh YmxlKCktPnBhcmFtZXRlckNvdW50KCkpKTsKKyAgICBlbHNlIGlmIChwcm9wZXJ0eU5hbWUgPT0g ZXhlYy0+cHJvcGVydHlOYW1lcygpLm5hbWUpCisgICAgICAgIHZhbHVlQ2hlY2sgPSAhZGVzY3Jp cHRvci52YWx1ZSgpIHx8IHNhbWVWYWx1ZShleGVjLCBkZXNjcmlwdG9yLnZhbHVlKCksIHRoaXNP YmplY3QtPmpzRXhlY3V0YWJsZSgpLT5uYW1lVmFsdWUoKSk7CiAgICAgZWxzZQogICAgICAgICBy ZXR1cm4gQmFzZTo6ZGVmaW5lT3duUHJvcGVydHkob2JqZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWUs IGRlc2NyaXB0b3IsIHRocm93RXhjZXB0aW9uKTsKICAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNGdW5jdGlvbi5oCShyZXZpc2lvbiAxMjgyNTkpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAg LTU5LDE0ICs1OSwxNSBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgICAgICBzdGF0aWMgSlNGdW5j dGlvbiogY3JlYXRlKEV4ZWNTdGF0ZSogZXhlYywgRnVuY3Rpb25FeGVjdXRhYmxlKiBleGVjdXRh YmxlLCBKU1Njb3BlKiBzY29wZSkKICAgICAgICAgewotICAgICAgICAgICAgSlNGdW5jdGlvbiog ZnVuY3Rpb24gPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxKU0Z1bmN0aW9uPigqZXhlYy0+ aGVhcCgpKSkgSlNGdW5jdGlvbihleGVjLCBleGVjdXRhYmxlLCBzY29wZSk7CisgICAgICAgICAg ICBKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEgPSBleGVjLT5nbG9iYWxEYXRhKCk7CisgICAgICAg ICAgICBKU0Z1bmN0aW9uKiBmdW5jdGlvbiA9IG5ldyAoTm90TnVsbCwgYWxsb2NhdGVDZWxsPEpT RnVuY3Rpb24+KGdsb2JhbERhdGEuaGVhcCkpIEpTRnVuY3Rpb24oZ2xvYmFsRGF0YSwgZXhlY3V0 YWJsZSwgc2NvcGUpOwogICAgICAgICAgICAgQVNTRVJUKGZ1bmN0aW9uLT5zdHJ1Y3R1cmUoKS0+ Z2xvYmFsT2JqZWN0KCkpOwotICAgICAgICAgICAgZnVuY3Rpb24tPmZpbmlzaENyZWF0aW9uKGV4 ZWMsIGV4ZWN1dGFibGUsIHNjb3BlKTsKKyAgICAgICAgICAgIGZ1bmN0aW9uLT5maW5pc2hDcmVh dGlvbihnbG9iYWxEYXRhKTsKICAgICAgICAgICAgIHJldHVybiBmdW5jdGlvbjsKICAgICAgICAg fQogICAgICAgICAKLSAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgY29uc3QgU3RyaW5nJiBuYW1l KEV4ZWNTdGF0ZSopOwotICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBjb25zdCBTdHJpbmcgZGlz cGxheU5hbWUoRXhlY1N0YXRlKik7CisgICAgICAgIEpTX0VYUE9SVF9QUklWQVRFIFN0cmluZyBu YW1lKEV4ZWNTdGF0ZSopOworICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBTdHJpbmcgZGlzcGxh eU5hbWUoRXhlY1N0YXRlKik7CiAgICAgICAgIGNvbnN0IFN0cmluZyBjYWxjdWxhdGVkRGlzcGxh eU5hbWUoRXhlY1N0YXRlKik7CiAKICAgICAgICAgSlNTY29wZSogc2NvcGUoKQpAQCAtMTM3LDEw ICsxMzgsMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIGNvbnN0IHN0YXRpYyB1bnNpZ25l ZCBTdHJ1Y3R1cmVGbGFncyA9IE92ZXJyaWRlc0dldE93blByb3BlcnR5U2xvdCB8IEltcGxlbWVu dHNIYXNJbnN0YW5jZSB8IE92ZXJyaWRlc1Zpc2l0Q2hpbGRyZW4gfCBPdmVycmlkZXNHZXRQcm9w ZXJ0eU5hbWVzIHwgSlNPYmplY3Q6OlN0cnVjdHVyZUZsYWdzOwogCiAgICAgICAgIEpTX0VYUE9S VF9QUklWQVRFIEpTRnVuY3Rpb24oRXhlY1N0YXRlKiwgSlNHbG9iYWxPYmplY3QqLCBTdHJ1Y3R1 cmUqKTsKLSAgICAgICAgSlNGdW5jdGlvbihFeGVjU3RhdGUqLCBGdW5jdGlvbkV4ZWN1dGFibGUq LCBKU1Njb3BlKik7CisgICAgICAgIEpTRnVuY3Rpb24oSlNHbG9iYWxEYXRhJiwgRnVuY3Rpb25F eGVjdXRhYmxlKiwgSlNTY29wZSopOwogICAgICAgICAKICAgICAgICAgdm9pZCBmaW5pc2hDcmVh dGlvbihFeGVjU3RhdGUqLCBOYXRpdmVFeGVjdXRhYmxlKiwgaW50IGxlbmd0aCwgY29uc3QgU3Ry aW5nJiBuYW1lKTsKLSAgICAgICAgdm9pZCBmaW5pc2hDcmVhdGlvbihFeGVjU3RhdGUqLCBGdW5j dGlvbkV4ZWN1dGFibGUqLCBKU1Njb3BlKik7CisgICAgICAgIHVzaW5nIEJhc2U6OmZpbmlzaENy ZWF0aW9uOwogCiAgICAgICAgIFN0cnVjdHVyZSogY2FjaGVJbmhlcml0b3JJRChFeGVjU3RhdGUq KTsKIApAQCAtMTYzLDYgKzE2NCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBzdGF0aWMg SlNWYWx1ZSBhcmd1bWVudHNHZXR0ZXIoRXhlY1N0YXRlKiwgSlNWYWx1ZSwgUHJvcGVydHlOYW1l KTsKICAgICAgICAgc3RhdGljIEpTVmFsdWUgY2FsbGVyR2V0dGVyKEV4ZWNTdGF0ZSosIEpTVmFs dWUsIFByb3BlcnR5TmFtZSk7CiAgICAgICAgIHN0YXRpYyBKU1ZhbHVlIGxlbmd0aEdldHRlcihF eGVjU3RhdGUqLCBKU1ZhbHVlLCBQcm9wZXJ0eU5hbWUpOworICAgICAgICBzdGF0aWMgSlNWYWx1 ZSBuYW1lR2V0dGVyKEV4ZWNTdGF0ZSosIEpTVmFsdWUsIFByb3BlcnR5TmFtZSk7CiAKICAgICAg ICAgV3JpdGVCYXJyaWVyPEV4ZWN1dGFibGVCYXNlPiBtX2V4ZWN1dGFibGU7CiAgICAgICAgIFdy aXRlQmFycmllcjxKU1Njb3BlPiBtX3Njb3BlOwo=