68200 2011-09-15 17:20:47 -0700 Prepare JSTypes for more Object subtypes 2011-09-16 14:33:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 468172 0 sam 2011-09-15 17:20:47 -0700 Prepare JSTypes for more Object subtypes 468173 1 107568 sam 2011-09-15 17:21:16 -0700 Created attachment 107568 Patch 468814 2 sam 2011-09-16 14:33:17 -0700 Committed r95326: <http://trac.webkit.org/changeset/95326> 107568 2011-09-15 17:21:16 -0700 2011-09-16 11:43:36 -0700 Patch bug-68200-20110915172115.patch text/plain 10126 sam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTUyNDUpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAK KzIwMTEtMDktMTUgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBQcmVw YXJlIEpTVHlwZXMgZm9yIG1vcmUgT2JqZWN0IHN1YnR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODIwMAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZGZnL0RGR0pJVENvbXBpbGVyLmg6CisgICAg ICAgIChKU0M6OkRGRzo6SklUQ29tcGlsZXI6OmJyYW5jaElmTm90T2JqZWN0KToKKyAgICAgICAg KiBqaXQvSklUSW5saW5lTWV0aG9kcy5oOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRKdW1wSWZO b3RPYmplY3QpOgorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuaDoKKyAgICAgICAg KEpTQzo6U3RydWN0dXJlOjpwcm90b3R5cGVGb3JMb29rdXApOgorICAgICAgICAqIHJ1bnRpbWUv SlNPYmplY3QuaDoKKyAgICAgICAgKEpTQzo6SlNPYmplY3Q6OmZpbmlzaENyZWF0aW9uKToKKyAg ICAgICAgKiBydW50aW1lL0pTVHlwZS5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNUeXBlSW5mby5o OgorICAgICAgICAoSlNDOjpUeXBlSW5mbzo6dHlwZSk6CisgICAgICAgIChKU0M6OlR5cGVJbmZv Ojppc09iamVjdCk6CisgICAgICAgIChKU0M6OlR5cGVJbmZvOjppc0ZpbmFsKToKKyAgICAgICAg KEpTQzo6VHlwZUluZm86OnByb2hpYml0c1Byb3BlcnR5Q2FjaGluZyk6CisgICAgICAgICogcnVu dGltZS9OYXRpdmVFcnJvckNvbnN0cnVjdG9yLmg6CisgICAgICAgIChKU0M6Ok5hdGl2ZUVycm9y Q29uc3RydWN0b3I6OmZpbmlzaENyZWF0aW9uKToKKyAgICAgICAgKiBydW50aW1lL09wZXJhdGlv bnMuY3BwOgorICAgICAgICAoSlNDOjpqc0lzT2JqZWN0VHlwZSk6CisgICAgICAgICogcnVudGlt ZS9TdHJ1Y3R1cmUuY3BwOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6OmFkZFByb3BlcnR5VHJh bnNpdGlvblRvRXhpc3RpbmdTdHJ1Y3R1cmUpOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6OmFk ZFByb3BlcnR5VHJhbnNpdGlvbik6CisgICAgICAgICogcnVudGltZS9TdHJ1Y3R1cmUuaDoKKyAg ICAgICAgKEpTQzo6U3RydWN0dXJlOjppc09iamVjdCk6CisgICAgICAgIChKU0M6OkpTQ2VsbDo6 aXNPYmplY3QpOgorCiAyMDExLTA5LTE1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+ CiAKICAgICAgICAgVGhlIERGRyBub24tc3BlY3VsYXRpdmUgSklUIGlzIG5vIGxvbmdlciB1c2Vk IGFuZCBzaG91bGQgYmUgcmVtb3ZlZC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHSklUQ29tcGlsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0pJVENvbXBpbGVyLmgJKHJldmlzaW9uIDk1MjQ1KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdKSVRDb21waWxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODcsNyArMTg3LDcg QEAgcHVibGljOgogCiAgICAgSnVtcCBicmFuY2hJZk5vdE9iamVjdChHUFJSZWcgc3RydWN0dXJl UmVnKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGJyYW5jaDgoTm90RXF1YWwsIEFkZHJlc3Moc3Ry dWN0dXJlUmVnLCBTdHJ1Y3R1cmU6OnR5cGVJbmZvVHlwZU9mZnNldCgpKSwgVHJ1c3RlZEltbTMy KE9iamVjdFR5cGUpKTsKKyAgICAgICAgcmV0dXJuIGJyYW5jaDgoQmVsb3csIEFkZHJlc3Moc3Ry dWN0dXJlUmVnLCBTdHJ1Y3R1cmU6OnR5cGVJbmZvVHlwZU9mZnNldCgpKSwgVHJ1c3RlZEltbTMy KE9iamVjdFR5cGUpKTsKICAgICB9CiAKICAgICAvLyBOb3RpZnkgdGhlIEpJVCBvZiBhIGNhbGwg dGhhdCBkb2VzIG5vdCByZXF1aXJlIGxpbmtpbmcuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVElubGluZU1ldGhvZHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVElubGluZU1ldGhvZHMuaAkocmV2aXNpb24gOTUyNDUpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVElubGluZU1ldGhvZHMuaAkod29ya2luZyBjb3B5KQpAQCAt MzE1LDcgKzMxNSw3IEBAIEFMV0FZU19JTkxJTkUgdm9pZCBKSVQ6OmVtaXRKdW1wU2xvd1RvSG8K IAogQUxXQVlTX0lOTElORSBKSVQ6Okp1bXAgSklUOjplbWl0SnVtcElmTm90T2JqZWN0KFJlZ2lz dGVySUQgc3RydWN0dXJlUmVnKQogewotICAgIHJldHVybiBicmFuY2g4KE5vdEVxdWFsLCBBZGRy ZXNzKHN0cnVjdHVyZVJlZywgU3RydWN0dXJlOjp0eXBlSW5mb1R5cGVPZmZzZXQoKSksIFRydXN0 ZWRJbW0zMihPYmplY3RUeXBlKSk7CisgICAgcmV0dXJuIGJyYW5jaDgoQmVsb3csIEFkZHJlc3Mo c3RydWN0dXJlUmVnLCBTdHJ1Y3R1cmU6OnR5cGVJbmZvVHlwZU9mZnNldCgpKSwgVHJ1c3RlZElt bTMyKE9iamVjdFR5cGUpKTsKIH0KIAogI2lmIEVOQUJMRShTQU1QTElOR19GTEFHUykKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuaAkocmV2 aXNpb24gOTUyNDUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9i amVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNDgsNyArMzQ4LDcgQEAgbmFtZXNwYWNlIEpTQyB7 CiAKICAgICBpbmxpbmUgSlNWYWx1ZSBTdHJ1Y3R1cmU6OnByb3RvdHlwZUZvckxvb2t1cChFeGVj U3RhdGUqIGV4ZWMpIGNvbnN0CiAgICAgewotICAgICAgICBpZiAodHlwZUluZm8oKS50eXBlKCkg PT0gT2JqZWN0VHlwZSkKKyAgICAgICAgaWYgKGlzT2JqZWN0KCkpCiAgICAgICAgICAgICByZXR1 cm4gbV9wcm90b3R5cGUuZ2V0KCk7CiAKICAgICAgICAgQVNTRVJUKHR5cGVJbmZvKCkudHlwZSgp ID09IFN0cmluZ1R5cGUpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNP YmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09i amVjdC5oCShyZXZpc2lvbiA5NTI0NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI1Myw3ICsyNTMsNyBAQCBuYW1lc3BhY2Ug SlNDIHsKICAgICAgICAgICAgIEFTU0VSVChtX3N0cnVjdHVyZS0+aXNFbXB0eSgpKTsKICAgICAg ICAgICAgIEFTU0VSVChwcm90b3R5cGUoKS5pc051bGwoKSB8fCBIZWFwOjpoZWFwKHRoaXMpID09 IEhlYXA6OmhlYXAocHJvdG90eXBlKCkpKTsKICAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQoaW5s aW5lU3RvcmFnZSwgc3RhdGljX2Nhc3Q8dm9pZCo+KGlubGluZVN0b3JhZ2UpID09IHN0YXRpY19j YXN0PHZvaWQqPih0aGlzICsgMSkpOwotICAgICAgICAgICAgQVNTRVJUKG1fc3RydWN0dXJlLT50 eXBlSW5mbygpLnR5cGUoKSA9PSBPYmplY3RUeXBlKTsKKyAgICAgICAgICAgIEFTU0VSVChtX3N0 cnVjdHVyZS0+aXNPYmplY3QoKSk7CiAgICAgICAgIH0KIAogICAgICAgICBzdGF0aWMgU3RydWN0 dXJlKiBjcmVhdGVTdHJ1Y3R1cmUoSlNHbG9iYWxEYXRhJiBnbG9iYWxEYXRhLCBKU0dsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHByb3RvdHlwZSkKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTVHlwZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTVHlwZS5oCShyZXZpc2lvbiA5NTI0NSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw5ICszNiwx MCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgTGVhZlR5cGUgICAgICAgICAgPSA2LAogICAg ICAgICAvLyBUaGUgQ29tcG91bmRUeXBlIHZhbHVlIG11c3QgY29tZSBiZWZvcmUgYW55IEpTVHlw ZSB0aGF0IG1heSBoYXZlIGNoaWxkcmVuCiAgICAgICAgIENvbXBvdW5kVHlwZSAgICAgID0gNywK LSAgICAgICAgT2JqZWN0VHlwZSAgICAgICAgPSA4LAotICAgICAgICBHZXR0ZXJTZXR0ZXJUeXBl ICA9IDksCi0gICAgICAgIEFQSVZhbHVlV3JhcHBlciAgID0gMTAKKyAgICAgICAgR2V0dGVyU2V0 dGVyVHlwZSAgPSA4LAorICAgICAgICBBUElWYWx1ZVdyYXBwZXIgICA9IDksCisgICAgICAgIC8v IFRoZSBPYmplY3RUeXBlIHZhbHVlIG11c3QgY29tZSBiZWZvcmUgYW55IEpTVHlwZSB0aGF0IGlz IGEgc3ViY2xhc3Mgb2YgSlNPYmplY3QKKyAgICAgICAgT2JqZWN0VHlwZSAgICAgICAgPSAxMCwK ICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBKU0MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTVHlwZUluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU1R5cGVJbmZvLmgJKHJldmlzaW9uIDk1MjQ1KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNUeXBlSW5mby5oCSh3b3JraW5nIGNvcHkpCkBAIC02MCw3ICs2 MCw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgICAgIG1fZmxhZ3MgfD0gSW1wbGVt ZW50c0RlZmF1bHRIYXNJbnN0YW5jZTsKICAgICAgICAgfQogCi0gICAgICAgIEpTVHlwZSB0eXBl KCkgY29uc3QgeyByZXR1cm4gKEpTVHlwZSltX3R5cGU7IH0KKyAgICAgICAgSlNUeXBlIHR5cGUo KSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxKU1R5cGU+KG1fdHlwZSk7IH0KKyAgICAgICAg Ym9vbCBpc09iamVjdCgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA+PSBPYmplY3RUeXBlOyB9CiAK ICAgICAgICAgYm9vbCBtYXNxdWVyYWRlc0FzVW5kZWZpbmVkKCkgY29uc3QgeyByZXR1cm4gbV9m bGFncyAmIE1hc3F1ZXJhZGVzQXNVbmRlZmluZWQ7IH0KICAgICAgICAgYm9vbCBpbXBsZW1lbnRz SGFzSW5zdGFuY2UoKSBjb25zdCB7IHJldHVybiBtX2ZsYWdzICYgSW1wbGVtZW50c0hhc0luc3Rh bmNlOyB9CkBAIC02OSw4ICs3MCw5IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBib29sIG92 ZXJyaWRlc0dldE93blByb3BlcnR5U2xvdCgpIGNvbnN0IHsgcmV0dXJuIG1fZmxhZ3MgJiBPdmVy cmlkZXNHZXRPd25Qcm9wZXJ0eVNsb3Q7IH0KICAgICAgICAgYm9vbCBvdmVycmlkZXNWaXNpdENo aWxkcmVuKCkgY29uc3QgeyByZXR1cm4gbV9mbGFncyAmIE92ZXJyaWRlc1Zpc2l0Q2hpbGRyZW47 IH0KICAgICAgICAgYm9vbCBvdmVycmlkZXNHZXRQcm9wZXJ0eU5hbWVzKCkgY29uc3QgeyByZXR1 cm4gbV9mbGFncyAmIE92ZXJyaWRlc0dldFByb3BlcnR5TmFtZXM7IH0KLSAgICAgICAgdW5zaWdu ZWQgaXNGaW5hbCgpIGNvbnN0IHsgcmV0dXJuIG1fZmxhZ3MyICYgKElzSlNGaW5hbE9iamVjdCA+ PiA4KTsgfQotICAgICAgICB1bnNpZ25lZCBwcm9oaWJpdHNQcm9wZXJ0eUNhY2hpbmcoKSBjb25z dCB7IHJldHVybiBtX2ZsYWdzMiAmIChQcm9oaWJpdHNQcm9wZXJ0eUNhY2hpbmcgPj4gOCk7IH0K KyAgICAgICAgYm9vbCBpc0ZpbmFsKCkgY29uc3QgeyByZXR1cm4gbV9mbGFnczIgJiAoSXNKU0Zp bmFsT2JqZWN0ID4+IDgpOyB9CisgICAgICAgIGJvb2wgcHJvaGliaXRzUHJvcGVydHlDYWNoaW5n KCkgY29uc3QgeyByZXR1cm4gbV9mbGFnczIgJiAoUHJvaGliaXRzUHJvcGVydHlDYWNoaW5nID4+ IDgpOyB9CisgICAgICAgIAogICAgICAgICB1bnNpZ25lZCBmbGFncygpIGNvbnN0IHsgcmV0dXJu IG1fZmxhZ3M7IH0KIAogICAgICAgICBzdGF0aWMgcHRyZGlmZl90IGZsYWdzT2Zmc2V0KCkKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL05hdGl2ZUVycm9yQ29uc3RydWN0b3Iu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9OYXRpdmVFcnJv ckNvbnN0cnVjdG9yLmgJKHJldmlzaW9uIDk1MjQ1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvTmF0aXZlRXJyb3JDb25zdHJ1Y3Rvci5oCSh3b3JraW5nIGNvcHkpCkBAIC02Miw3 ICs2Miw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgcHV0RGlyZWN0KGV4ZWMtPmds b2JhbERhdGEoKSwgZXhlYy0+cHJvcGVydHlOYW1lcygpLnByb3RvdHlwZSwgcHJvdG90eXBlLCBE b250RGVsZXRlIHwgUmVhZE9ubHkgfCBEb250RW51bSk7CiAgICAgICAgICAgICBtX2Vycm9yU3Ry dWN0dXJlLnNldChleGVjLT5nbG9iYWxEYXRhKCksIHRoaXMsIEVycm9ySW5zdGFuY2U6OmNyZWF0 ZVN0cnVjdHVyZShleGVjLT5nbG9iYWxEYXRhKCksIGdsb2JhbE9iamVjdCwgcHJvdG90eXBlKSk7 CiAgICAgICAgICAgICBBU1NFUlQobV9lcnJvclN0cnVjdHVyZSk7Ci0gICAgICAgICAgICBBU1NF UlQobV9lcnJvclN0cnVjdHVyZS0+dHlwZUluZm8oKS50eXBlKCkgPT0gT2JqZWN0VHlwZSk7Cisg ICAgICAgICAgICBBU1NFUlQobV9lcnJvclN0cnVjdHVyZS0+aXNPYmplY3QoKSk7CiAgICAgICAg IH0KIAogICAgIHByaXZhdGU6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9P cGVyYXRpb25zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9PcGVyYXRpb25zLmNwcAkocmV2aXNpb24gOTUyNDUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9PcGVyYXRpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODgsNyArODgsNyBA QCBib29sIGpzSXNPYmplY3RUeXBlKEpTVmFsdWUgdikKICAgICBKU1R5cGUgdHlwZSA9IHYuYXND ZWxsKCktPnN0cnVjdHVyZSgpLT50eXBlSW5mbygpLnR5cGUoKTsKICAgICBpZiAodHlwZSA9PSBO dW1iZXJUeXBlIHx8IHR5cGUgPT0gU3RyaW5nVHlwZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgIGlmICh0eXBlID09IE9iamVjdFR5cGUpIHsKKyAgICBpZiAodHlwZSA+PSBPYmplY3RUeXBl KSB7CiAgICAgICAgIGlmIChhc09iamVjdCh2KS0+c3RydWN0dXJlKCktPnR5cGVJbmZvKCkubWFz cXVlcmFkZXNBc1VuZGVmaW5lZCgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAg ICBDYWxsRGF0YSBjYWxsRGF0YTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L1N0cnVjdHVyZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvU3RydWN0dXJlLmNwcAkocmV2aXNpb24gOTUyNDUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODAsNyArMjgwLDcg QEAgdm9pZCBTdHJ1Y3R1cmU6OmRlc3BlY2lmeURpY3Rpb25hcnlGdW5jdAogU3RydWN0dXJlKiBT dHJ1Y3R1cmU6OmFkZFByb3BlcnR5VHJhbnNpdGlvblRvRXhpc3RpbmdTdHJ1Y3R1cmUoU3RydWN0 dXJlKiBzdHJ1Y3R1cmUsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgdW5zaWduZWQg YXR0cmlidXRlcywgSlNDZWxsKiBzcGVjaWZpY1ZhbHVlLCBzaXplX3QmIG9mZnNldCkKIHsKICAg ICBBU1NFUlQoIXN0cnVjdHVyZS0+aXNEaWN0aW9uYXJ5KCkpOwotICAgIEFTU0VSVChzdHJ1Y3R1 cmUtPnR5cGVJbmZvKCkudHlwZSgpID09IE9iamVjdFR5cGUpOworICAgIEFTU0VSVChzdHJ1Y3R1 cmUtPmlzT2JqZWN0KCkpOwogCiAgICAgaWYgKFN0cnVjdHVyZSogZXhpc3RpbmdUcmFuc2l0aW9u ID0gc3RydWN0dXJlLT5tX3RyYW5zaXRpb25UYWJsZS5nZXQocHJvcGVydHlOYW1lLmltcGwoKSwg YXR0cmlidXRlcykpIHsKICAgICAgICAgSlNDZWxsKiBzcGVjaWZpY1ZhbHVlSW5QcmV2aW91cyA9 IGV4aXN0aW5nVHJhbnNpdGlvbi0+bV9zcGVjaWZpY1ZhbHVlSW5QcmV2aW91cy5nZXQoKTsKQEAg LTMwNyw3ICszMDcsNyBAQCBTdHJ1Y3R1cmUqIFN0cnVjdHVyZTo6YWRkUHJvcGVydHlUcmFuc2l0 CiAgICAgICAgIHNwZWNpZmljVmFsdWUgPSAwOwogCiAgICAgQVNTRVJUKCFzdHJ1Y3R1cmUtPmlz RGljdGlvbmFyeSgpKTsKLSAgICBBU1NFUlQoc3RydWN0dXJlLT50eXBlSW5mbygpLnR5cGUoKSA9 PSBPYmplY3RUeXBlKTsKKyAgICBBU1NFUlQoc3RydWN0dXJlLT5pc09iamVjdCgpKTsKICAgICBB U1NFUlQoIVN0cnVjdHVyZTo6YWRkUHJvcGVydHlUcmFuc2l0aW9uVG9FeGlzdGluZ1N0cnVjdHVy ZShzdHJ1Y3R1cmUsIHByb3BlcnR5TmFtZSwgYXR0cmlidXRlcywgc3BlY2lmaWNWYWx1ZSwgb2Zm c2V0KSk7CiAgICAgCiAgICAgaWYgKHN0cnVjdHVyZS0+bV9zcGVjaWZpY0Z1bmN0aW9uVGhyYXNo Q291bnQgPT0gbWF4U3BlY2lmaWNGdW5jdGlvblRocmFzaENvdW50KQpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgJKHJldmlzaW9uIDk1MjQ1KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmgJKHdvcmtpbmcgY29weSkKQEAg LTExOSw3ICsxMTksMTAgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIGJvb2wgaXNEaWN0aW9u YXJ5KCkgY29uc3QgeyByZXR1cm4gbV9kaWN0aW9uYXJ5S2luZCAhPSBOb25lRGljdGlvbmFyeUtp bmQ7IH0KICAgICAgICAgYm9vbCBpc1VuY2FjaGVhYmxlRGljdGlvbmFyeSgpIGNvbnN0IHsgcmV0 dXJuIG1fZGljdGlvbmFyeUtpbmQgPT0gVW5jYWNoZWREaWN0aW9uYXJ5S2luZDsgfQogCisgICAg ICAgIC8vIFR5cGUgYWNjZXNzb3JzLgogICAgICAgICBjb25zdCBUeXBlSW5mbyYgdHlwZUluZm8o KSBjb25zdCB7IEFTU0VSVChzdHJ1Y3R1cmUoKS0+Y2xhc3NJbmZvKCkgPT0gJnNfaW5mbyk7IHJl dHVybiBtX3R5cGVJbmZvOyB9CisgICAgICAgIGJvb2wgaXNPYmplY3QoKSBjb25zdCB7IHJldHVy biB0eXBlSW5mbygpLmlzT2JqZWN0KCk7IH0KKwogCiAgICAgICAgIEpTR2xvYmFsT2JqZWN0KiBn bG9iYWxPYmplY3QoKSBjb25zdCB7IHJldHVybiBtX2dsb2JhbE9iamVjdC5nZXQoKTsgfQogICAg ICAgICB2b2lkIHNldEdsb2JhbE9iamVjdChKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEsIEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpIHsgbV9nbG9iYWxPYmplY3Quc2V0KGdsb2JhbERhdGEs IHRoaXMsIGdsb2JhbE9iamVjdCk7IH0KQEAgLTMwNCw3ICszMDcsNyBAQCBuYW1lc3BhY2UgSlND IHsKIAogICAgIGlubGluZSBib29sIEpTQ2VsbDo6aXNPYmplY3QoKSBjb25zdAogICAgIHsKLSAg ICAgICAgcmV0dXJuIG1fc3RydWN0dXJlLT50eXBlSW5mbygpLnR5cGUoKSA9PSBPYmplY3RUeXBl OworICAgICAgICByZXR1cm4gbV9zdHJ1Y3R1cmUtPmlzT2JqZWN0KCk7CiAgICAgfQogCiAgICAg aW5saW5lIGJvb2wgSlNDZWxsOjppc1N0cmluZygpIGNvbnN0Cg==