105470 2012-12-19 15:08:33 -0800 Tidy up JSScriptRef API 2012-12-20 13:38:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver fpizlo oldest_to_newest 794994 0 oliver 2012-12-19 15:08:33 -0800 Tidy up JSScriptRef API 794998 1 180235 oliver 2012-12-19 15:10:06 -0800 Created attachment 180235 Patch 795007 2 oliver 2012-12-19 15:37:12 -0800 Committed r138199: <http://trac.webkit.org/changeset/138199> 795745 3 fpizlo 2012-12-20 13:38:42 -0800 This broke testapi. 180235 2012-12-19 15:10:06 -0800 2012-12-19 15:29:59 -0800 Patch bug-105470-20121219150722.patch text/plain 12898 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk NmI4MzJkYjdlYzU3ODgyZGNjYmM5Y2VmOGY1NGQ1YjJlOGUyYjMwLi5hYTVjZmYyNzJmYjk5YTY5 YjMwMWNmMTY3NmZkYjljYTA3ZmVmMWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMi0xMi0xOSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIFRpZHkgdXAgSlNTY3JpcHRSZWYgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU0NzAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQZW9wbGUgZm91bmQgdGhlIEFQSSdzIHVzZSBvZiBh IGNvbnRleHQgY29uZnVzaW5nLCBzbyB3ZSdsbCBzd2l0Y2ggdG8gYSBKU0NvbnRleHRHcm91cCBi YXNlZAorICAgICAgICBBUEksIGFuZCBkcm9wIGEgbnVtYmVyIG9mIHRoZSB1bm5lY2Vzc2FyeSB1 c2VzIG9mIGNvbnRleHRzLgorCisgICAgICAgICogQVBJL0pTU2NyaXB0UmVmLmNwcDoKKyAgICAg ICAgKE9wYXF1ZUpTU2NyaXB0OjpnbG9iYWxEYXRhKToKKyAgICAgICAgKHBhcnNlU2NyaXB0KToK KyAgICAgICAgKiBBUEkvSlNTY3JpcHRSZWZQcml2YXRlLmg6CisgICAgICAgICogQVBJL3Rlc3Rz L3Rlc3RhcGkuYzoKKyAgICAgICAgKG1haW4pOgorCiAyMDEyLTEyLTE5ICBBbGV4aXMgTWVuYXJk ICA8YWxleGlzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW1wbGVtZW50IENTUyBwYXJzaW5nIGZv ciBDU1MgdHJhbnNpdGlvbnMgdW5wcmVmaXhlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9BUEkvSlNTY3JpcHRSZWYuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9K U1NjcmlwdFJlZi5jcHAKaW5kZXggOGU1ZDY5NWEzNjIxNGI5MWI3YzZkMjVjZmE1NmQ2MzNlYWI2 NTYxZi4uOTc4OTg2MGRkNzRkOTk3ZDI2NzI4ZTJkOWRkZjcxYzE1MTAwZWZiZCAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1NjcmlwdFJlZi5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL0FQSS9KU1NjcmlwdFJlZi5jcHAKQEAgLTMyLDYgKzMyLDcgQEAKICNp bmNsdWRlICJKU0dsb2JhbERhdGEuaCIKICNpbmNsdWRlICJKU1NjcmlwdFJlZlByaXZhdGUuaCIK ICNpbmNsdWRlICJPcGFxdWVKU1N0cmluZy5oIgorI2luY2x1ZGUgIlBhcnNlci5oIgogI2luY2x1 ZGUgIlNvdXJjZUNvZGUuaCIKICNpbmNsdWRlICJTb3VyY2VQcm92aWRlci5oIgogCkBAIC00OSw3 ICs1MCw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1fc291cmNlOwogICAgIH0KIAotICAg IGNvbnN0IEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZ2xvYmFs RGF0YTsgfQorICAgIEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1f Z2xvYmFsRGF0YTsgfQogCiBwcml2YXRlOgogICAgIE9wYXF1ZUpTU2NyaXB0KEpTR2xvYmFsRGF0 YSogZ2xvYmFsRGF0YSwgY29uc3QgU3RyaW5nJiB1cmwsIGludCBzdGFydGluZ0xpbmVOdW1iZXIs IGNvbnN0IFN0cmluZyYgc291cmNlKQpAQCAtNjUsNjAgKzY2LDY0IEBAIHByaXZhdGU6CiAgICAg U3RyaW5nIG1fc291cmNlOwogfTsKIAorc3RhdGljIGJvb2wgcGFyc2VTY3JpcHQoSlNHbG9iYWxE YXRhKiBnbG9iYWxEYXRhLCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UsIFBhcnNlckVycm9yJiBl cnJvcikKK3sKKyAgICByZXR1cm4gSlNDOjpwYXJzZTxKU0M6OlByb2dyYW1Ob2RlPihnbG9iYWxE YXRhLCBzb3VyY2UsIDAsIElkZW50aWZpZXIoKSwgSlNQYXJzZU5vcm1hbCwgSlNQYXJzZVByb2dy YW1Db2RlLCBlcnJvcik7Cit9CisKIGV4dGVybiAiQyIgewogCi1KU1NjcmlwdFJlZiBKU1Njcmlw dENyZWF0ZVJlZmVyZW5jaW5nSW1tb3J0YWxBU0NJSVRleHQoSlNDb250ZXh0UmVmIGNvbnRleHQs IEpTU3RyaW5nUmVmIHVybCwgaW50IHN0YXJ0aW5nTGluZU51bWJlciwgY29uc3QgY2hhciogc291 cmNlLCBzaXplX3QgbGVuZ3RoLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCitKU1NjcmlwdFJlZiBK U1NjcmlwdENyZWF0ZVJlZmVyZW5jaW5nSW1tb3J0YWxBU0NJSVRleHQoSlNDb250ZXh0R3JvdXBS ZWYgY29udGV4dEdyb3VwLCBKU1N0cmluZ1JlZiB1cmwsIGludCBzdGFydGluZ0xpbmVOdW1iZXIs IGNvbnN0IGNoYXIqIHNvdXJjZSwgc2l6ZV90IGxlbmd0aCwgSlNTdHJpbmdSZWYqIGVycm9yTWVz c2FnZSwgaW50KiBlcnJvckxpbmUpCiB7Ci0gICAgRXhlY1N0YXRlKiBleGVjID0gdG9KUyhjb250 ZXh0KTsKLSAgICBBUElFbnRyeVNoaW0gZW50cnlTaGltKGV4ZWMpOwotICAgIEpTR2xvYmFsRGF0 YSogZ2xvYmFsRGF0YSA9ICZleGVjLT5nbG9iYWxEYXRhKCk7CisgICAgSlNHbG9iYWxEYXRhKiBn bG9iYWxEYXRhID0gdG9KUyhjb250ZXh0R3JvdXApOworICAgIEFQSUVudHJ5U2hpbSBlbnRyeVNo aW0oZ2xvYmFsRGF0YSk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsZW5ndGg7IGkrKykg ewogICAgICAgICBpZiAoIWlzQVNDSUkoc291cmNlW2ldKSkKICAgICAgICAgICAgIHJldHVybiAw OwogICAgIH0KIAogICAgIFJlZlB0cjxPcGFxdWVKU1NjcmlwdD4gcmVzdWx0ID0gT3BhcXVlSlNT Y3JpcHQ6OmNyZWF0ZShnbG9iYWxEYXRhLCB1cmwtPnN0cmluZygpLCBzdGFydGluZ0xpbmVOdW1i ZXIsIFN0cmluZyhTdHJpbmdJbXBsOjpjcmVhdGVGcm9tTGl0ZXJhbChzb3VyY2UsIGxlbmd0aCkp KTsKLSAgICBKU1ZhbHVlIGV4Y2VwdGlvblZhbHVlOwotICAgIGlmICghY2hlY2tTeW50YXgoZXhl YywgU291cmNlQ29kZShyZXN1bHQpLCAmZXhjZXB0aW9uVmFsdWUpKSB7Ci0gICAgICAgIGlmIChl eGNlcHRpb24pCi0gICAgICAgICAgICAqZXhjZXB0aW9uID0gdG9SZWYoZXhlYywgZXhjZXB0aW9u VmFsdWUpOworCisgICAgUGFyc2VyRXJyb3IgZXJyb3I7CisgICAgaWYgKCFwYXJzZVNjcmlwdChn bG9iYWxEYXRhLCBTb3VyY2VDb2RlKHJlc3VsdCksIGVycm9yKSkgeworICAgICAgICBpZiAoZXJy b3JNZXNzYWdlKQorICAgICAgICAgICAgKmVycm9yTWVzc2FnZSA9IE9wYXF1ZUpTU3RyaW5nOjpj cmVhdGUoZXJyb3IubV9tZXNzYWdlKS5sZWFrUmVmKCk7CisgICAgICAgIGlmIChlcnJvckxpbmUp CisgICAgICAgICAgICAqZXJyb3JMaW5lID0gZXJyb3IubV9saW5lOwogICAgICAgICByZXR1cm4g MDsKICAgICB9CiAKICAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2UoKS5sZWFrUmVmKCk7CiB9CiAK LUpTU2NyaXB0UmVmIEpTU2NyaXB0Q3JlYXRlRnJvbVN0cmluZyhKU0NvbnRleHRSZWYgY29udGV4 dCwgSlNTdHJpbmdSZWYgdXJsLCBpbnQgc3RhcnRpbmdMaW5lTnVtYmVyLCBKU1N0cmluZ1JlZiBz b3VyY2UsIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKK0pTU2NyaXB0UmVmIEpTU2NyaXB0Q3JlYXRl RnJvbVN0cmluZyhKU0NvbnRleHRHcm91cFJlZiBjb250ZXh0R3JvdXAsIEpTU3RyaW5nUmVmIHVy bCwgaW50IHN0YXJ0aW5nTGluZU51bWJlciwgSlNTdHJpbmdSZWYgc291cmNlLCBKU1N0cmluZ1Jl ZiogZXJyb3JNZXNzYWdlLCBpbnQqIGVycm9yTGluZSkKIHsKLSAgICBFeGVjU3RhdGUqIGV4ZWMg PSB0b0pTKGNvbnRleHQpOwotICAgIEFQSUVudHJ5U2hpbSBlbnRyeVNoaW0oZXhlYyk7Ci0gICAg SlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhID0gJmV4ZWMtPmdsb2JhbERhdGEoKTsKKyAgICBKU0ds b2JhbERhdGEqIGdsb2JhbERhdGEgPSB0b0pTKGNvbnRleHRHcm91cCk7CisgICAgQVBJRW50cnlT aGltIGVudHJ5U2hpbShnbG9iYWxEYXRhKTsKIAogICAgIFJlZlB0cjxPcGFxdWVKU1NjcmlwdD4g cmVzdWx0ID0gT3BhcXVlSlNTY3JpcHQ6OmNyZWF0ZShnbG9iYWxEYXRhLCB1cmwtPnN0cmluZygp LCBzdGFydGluZ0xpbmVOdW1iZXIsIHNvdXJjZS0+c3RyaW5nKCkpOwotICAgIEpTVmFsdWUgZXhj ZXB0aW9uVmFsdWU7Ci0gICAgaWYgKCFjaGVja1N5bnRheChleGVjLCBTb3VyY2VDb2RlKHJlc3Vs dCksICZleGNlcHRpb25WYWx1ZSkpIHsKLSAgICAgICAgaWYgKGV4Y2VwdGlvbikKLSAgICAgICAg ICAgICpleGNlcHRpb24gPSB0b1JlZihleGVjLCBleGNlcHRpb25WYWx1ZSk7CisKKyAgICBQYXJz ZXJFcnJvciBlcnJvcjsKKyAgICBpZiAoIXBhcnNlU2NyaXB0KGdsb2JhbERhdGEsIFNvdXJjZUNv ZGUocmVzdWx0KSwgZXJyb3IpKSB7CisgICAgICAgIGlmIChlcnJvck1lc3NhZ2UpCisgICAgICAg ICAgICAqZXJyb3JNZXNzYWdlID0gT3BhcXVlSlNTdHJpbmc6OmNyZWF0ZShlcnJvci5tX21lc3Nh Z2UpLmxlYWtSZWYoKTsKKyAgICAgICAgaWYgKGVycm9yTGluZSkKKyAgICAgICAgICAgICplcnJv ckxpbmUgPSBlcnJvci5tX2xpbmU7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KKwogICAgIHJl dHVybiByZXN1bHQucmVsZWFzZSgpLmxlYWtSZWYoKTsKIH0KIAotdm9pZCBKU1NjcmlwdFJldGFp bihKU0NvbnRleHRSZWYgY29udGV4dCwgSlNTY3JpcHRSZWYgc2NyaXB0KQordm9pZCBKU1Njcmlw dFJldGFpbihKU1NjcmlwdFJlZiBzY3JpcHQpCiB7Ci0gICAgRXhlY1N0YXRlKiBleGVjID0gdG9K Uyhjb250ZXh0KTsKLSAgICBBUElFbnRyeVNoaW0gZW50cnlTaGltKGV4ZWMpOwotICAgIGlmIChz Y3JpcHQtPmdsb2JhbERhdGEoKSAhPSAmZXhlYy0+Z2xvYmFsRGF0YSgpKQotICAgICAgICBDUkFT SCgpOworICAgIEFQSUVudHJ5U2hpbSBlbnRyeVNoaW0oc2NyaXB0LT5nbG9iYWxEYXRhKCkpOwog ICAgIHNjcmlwdC0+cmVmKCk7CiB9CiAKLXZvaWQgSlNTY3JpcHRSZWxlYXNlKEpTQ29udGV4dFJl ZiBjb250ZXh0LCBKU1NjcmlwdFJlZiBzY3JpcHQpCit2b2lkIEpTU2NyaXB0UmVsZWFzZShKU1Nj cmlwdFJlZiBzY3JpcHQpCiB7Ci0gICAgRXhlY1N0YXRlKiBleGVjID0gdG9KUyhjb250ZXh0KTsK LSAgICBBUElFbnRyeVNoaW0gZW50cnlTaGltKGV4ZWMpOwotICAgIGlmIChzY3JpcHQtPmdsb2Jh bERhdGEoKSAhPSAmZXhlYy0+Z2xvYmFsRGF0YSgpKQotICAgICAgICBDUkFTSCgpOworICAgIEFQ SUVudHJ5U2hpbSBlbnRyeVNoaW0oc2NyaXB0LT5nbG9iYWxEYXRhKCkpOwogICAgIHNjcmlwdC0+ ZGVyZWYoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1Nj cmlwdFJlZlByaXZhdGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNTY3JpcHRSZWZQ cml2YXRlLmgKaW5kZXggYTEwNjM4NTU5YzkyZWNiMWU2Nzk1ZjJhZjMxYzA0YmE3MDc2ODQ4MS4u MDczNzk4ZDEyODQ1OWNhNTUyMjA2Yjg1ZTQzYjMwMWZmNjM2MmE3NSAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1NjcmlwdFJlZlByaXZhdGUuaAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvQVBJL0pTU2NyaXB0UmVmUHJpdmF0ZS5oCkBAIC00MCw0NSArNDAsNDUg QEAgdHlwZWRlZiBzdHJ1Y3QgT3BhcXVlSlNTY3JpcHQqIEpTU2NyaXB0UmVmOwogLyohCiAgQGZ1 bmN0aW9uCiAgQGFic3RyYWN0IENyZWF0ZXMgYSBzY3JpcHQgcmVmZXJlbmNlIGZyb20gYW4gYXNj aWkgc3RyaW5nLCB3aXRob3V0IGNvcHlpbmcgb3IgdGFraW5nIG93bmVyc2hpcCBvZiB0aGUgc3Ry aW5nCi0gQHBhcmFtIGN0eCBUaGUgY29udGV4dCB0byB1c2UuCisgQHBhcmFtIGNvbnRleHRHcm91 cCBUaGUgY29udGV4dCBncm91cCB0aGUgc2NyaXB0IGlzIHRvIGJlIHVzZWQgaW4uCiAgQHBhcmFt IHVybCBUaGUgc291cmNlIHVybCB0byBiZSByZXBvcnRlZCBpbiBlcnJvcnMgYW5kIGV4Y2VwdGlv bnMuCiAgQHBhcmFtIHN0YXJ0aW5nTGluZU51bWJlciBBbiBpbnRlZ2VyIHZhbHVlIHNwZWNpZnlp bmcgdGhlIHNjcmlwdCdzIHN0YXJ0aW5nIGxpbmUgbnVtYmVyIGluIHRoZSBmaWxlIGxvY2F0ZWQg YXQgc291cmNlVVJMLiBUaGlzIGlzIG9ubHkgdXNlZCB3aGVuIHJlcG9ydGluZyBleGNlcHRpb25z LgogIEBwYXJhbSBzb3VyY2UgVGhlIHNvdXJjZSBzdHJpbmcuICBUaGlzIGlzIHJlcXVpcmVkIHRv IGJlIHB1cmUgQVNDSUkgYW5kIHRvIG5ldmVyIGJlIGRlYWxsb2NhdGVkLgogIEBwYXJhbSBsZW5n dGggVGhlIGxlbmd0aCBvZiB0aGUgc291cmNlIHN0cmluZy4KLSBAcGFyYW0gZXhjZXB0aW9uIEEg cG9pbnRlciB0byBhIEpTVmFsdWVSZWYgaW4gd2hpY2ggdG8gc3RvcmUgYW4gZXhjZXB0aW9uIGlm IHRoZSBzb3VyY2UgaXMgbm90IHZhbGlkLiBQYXNzIE5VTEwgaWYgeW91IGRvIG5vdCBjYXJlIHRv IHN0b3JlIGFuIGV4Y2VwdGlvbi4KKyBAcGFyYW0gZXJyb3JNZXNzYWdlIEEgcG9pbnRlciB0byBh IEpTU3RyaW5nUmVmIGluIHdoaWNoIHRvIHN0b3JlIHRoZSBwYXJzZSBlcnJvciBtZXNzYWdlIGlm IHRoZSBzb3VyY2UgaXMgbm90IHZhbGlkLiBQYXNzIE5VTEwgaWYgeW91IGRvIG5vdCBjYXJlIHRv IHN0b3JlIGFuIGVycm9yIG1lc3NhZ2UuCisgQHBhcmFtIGVycm9yTGluZSBBIHBvaW50ZXIgdG8g YW4gaW50IGluIHdoaWNoIHRvIHN0b3JlIHRoZSBsaW5lIG51bWJlciBvZiBhIHBhcnNlciBlcnJv ci4gUGFzcyBOVUxMIGlmIHlvdSBkbyBub3QgY2FyZSB0byBzdG9yZSBhbiBlcnJvciBsaW5lLgog IEByZXN1bHQgQSBKU1NjcmlwdFJlZiBmb3IgdGhlIHByb3ZpZGVkIHNvdXJjZSwgb3IgTlVMTCBp ZiBhbnkgbm9uLUFTQ0lJIGNoYXJhY3RlciBpcyBmb3VuZCBpbiBzb3VyY2Ugb3IgaWYgdGhlIHNv dXJjZSBpcyBub3QgYSB2YWxpZCBKYXZhU2NyaXB0IHByb2dyYW0uIE93bmVyc2hpcCBmb2xsb3dz IHRoZSBDcmVhdGUgUnVsZS4KICBAZGlzY3Vzc2lvbiBVc2UgdGhpcyBmdW5jdGlvbiB0byBjcmVh dGUgYSByZXVzYWJsZSBzY3JpcHQgcmVmZXJlbmNlIHdpdGggYSBjb25zdGFudAogIGJ1ZmZlciBh cyB0aGUgYmFja2luZyBzdHJpbmcuICBUaGUgc291cmNlIHN0cmluZyBtdXN0IG91dGxpdmUgdGhl IGdsb2JhbCBjb250ZXh0LgogICovCi1KU19FWFBPUlQgSlNTY3JpcHRSZWYgSlNTY3JpcHRDcmVh dGVSZWZlcmVuY2luZ0ltbW9ydGFsQVNDSUlUZXh0KEpTQ29udGV4dFJlZiBjdHgsIEpTU3RyaW5n UmVmIHVybCwgaW50IHN0YXJ0aW5nTGluZU51bWJlciwgY29uc3QgY2hhciogc291cmNlLCBzaXpl X3QgbGVuZ3RoLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pOworSlNfRVhQT1JUIEpTU2NyaXB0UmVm IEpTU2NyaXB0Q3JlYXRlUmVmZXJlbmNpbmdJbW1vcnRhbEFTQ0lJVGV4dChKU0NvbnRleHRHcm91 cFJlZiBjb250ZXh0R3JvdXAsIEpTU3RyaW5nUmVmIHVybCwgaW50IHN0YXJ0aW5nTGluZU51bWJl ciwgY29uc3QgY2hhciogc291cmNlLCBzaXplX3QgbGVuZ3RoLCBKU1N0cmluZ1JlZiogZXJyb3JN ZXNzYWdlLCBpbnQqIGVycm9yTGluZSk7CiAKIC8qIQogIEBmdW5jdGlvbgogIEBhYnN0cmFjdCBD cmVhdGVzIGEgc2NyaXB0IHJlZmVyZW5jZSBmcm9tIGEgc3RyaW5nCi0gQHBhcmFtIGN0eCBUaGUg Y29udGV4dCB0byB1c2UuCisgQHBhcmFtIGNvbnRleHRHcm91cCBUaGUgY29udGV4dCBncm91cCB0 aGUgc2NyaXB0IGlzIHRvIGJlIHVzZWQgaW4uCiAgQHBhcmFtIHVybCBUaGUgc291cmNlIHVybCB0 byBiZSByZXBvcnRlZCBpbiBlcnJvcnMgYW5kIGV4Y2VwdGlvbnMuCiAgQHBhcmFtIHN0YXJ0aW5n TGluZU51bWJlciBBbiBpbnRlZ2VyIHZhbHVlIHNwZWNpZnlpbmcgdGhlIHNjcmlwdCdzIHN0YXJ0 aW5nIGxpbmUgbnVtYmVyIGluIHRoZSBmaWxlIGxvY2F0ZWQgYXQgc291cmNlVVJMLiBUaGlzIGlz IG9ubHkgdXNlZCB3aGVuIHJlcG9ydGluZyBleGNlcHRpb25zLgogIEBwYXJhbSBzb3VyY2UgVGhl IHNvdXJjZSBzdHJpbmcuCi0gQHBhcmFtIGV4Y2VwdGlvbiBBIHBvaW50ZXIgdG8gYSBKU1ZhbHVl UmVmIGluIHdoaWNoIHRvIHN0b3JlIGFuIGV4Y2VwdGlvbiBpZiB0aGUgc291cmNlIGlzIG5vdCB2 YWxpZC4gUGFzcyBOVUxMIGlmIHlvdSBkbyBub3QgY2FyZSB0byBzdG9yZSBhbiBleGNlcHRpb24u CisgQHBhcmFtIGVycm9yTWVzc2FnZSBBIHBvaW50ZXIgdG8gYSBKU1N0cmluZ1JlZiBpbiB3aGlj aCB0byBzdG9yZSB0aGUgcGFyc2UgZXJyb3IgbWVzc2FnZSBpZiB0aGUgc291cmNlIGlzIG5vdCB2 YWxpZC4gUGFzcyBOVUxMIGlmIHlvdSBkbyBub3QgY2FyZSB0byBzdG9yZSBhbiBlcnJvciBtZXNz YWdlLgorIEBwYXJhbSBlcnJvckxpbmUgQSBwb2ludGVyIHRvIGFuIGludCBpbiB3aGljaCB0byBz dG9yZSB0aGUgbGluZSBudW1iZXIgb2YgYSBwYXJzZXIgZXJyb3IuIFBhc3MgTlVMTCBpZiB5b3Ug ZG8gbm90IGNhcmUgdG8gc3RvcmUgYW4gZXJyb3IgbGluZS4KICBAcmVzdWx0IEEgSlNTY3JpcHRS ZWYgZm9yIHRoZSBwcm92aWRlZCBzb3VyY2UsIG9yIE5VTEwgaXMgdGhlIHNvdXJjZSBpcyBub3Qg YSB2YWxpZCBKYXZhU2NyaXB0IHByb2dyYW0uICBPd25lcnNoaXAgZm9sbG93cyB0aGUgQ3JlYXRl IFJ1bGUuCiAgKi8KLUpTX0VYUE9SVCBKU1NjcmlwdFJlZiBKU1NjcmlwdENyZWF0ZUZyb21TdHJp bmcoSlNDb250ZXh0UmVmIGN0eCwgSlNTdHJpbmdSZWYgdXJsLCBpbnQgc3RhcnRpbmdMaW5lTnVt YmVyLCBKU1N0cmluZ1JlZiBzb3VyY2UsIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbik7CitKU19FWFBP UlQgSlNTY3JpcHRSZWYgSlNTY3JpcHRDcmVhdGVGcm9tU3RyaW5nKEpTQ29udGV4dEdyb3VwUmVm IGNvbnRleHRHcm91cCwgSlNTdHJpbmdSZWYgdXJsLCBpbnQgc3RhcnRpbmdMaW5lTnVtYmVyLCBK U1N0cmluZ1JlZiBzb3VyY2UsIEpTU3RyaW5nUmVmKiBlcnJvck1lc3NhZ2UsIGludCogZXJyb3JM aW5lKTsKIAogLyohCiAgQGZ1bmN0aW9uCiAgQGFic3RyYWN0IFJldGFpbnMgYSBKYXZhU2NyaXB0 IHNjcmlwdC4KLSBAcGFyYW0gY3R4IFRoZSBjb250ZXh0IHRoYXQgdGhlIHNjcmlwdCBpcyBkZWZp bmVkIGluLgogIEBwYXJhbSBzY3JpcHQgVGhlIHNjcmlwdCB0byByZXRhaW4uCiAgKi8KLUpTX0VY UE9SVCB2b2lkIEpTU2NyaXB0UmV0YWluKEpTQ29udGV4dFJlZiBjdHgsIEpTU2NyaXB0UmVmIHNj cmlwdCk7CitKU19FWFBPUlQgdm9pZCBKU1NjcmlwdFJldGFpbihKU1NjcmlwdFJlZiBzY3JpcHQp OwogCiAvKiEKICBAZnVuY3Rpb24KICBAYWJzdHJhY3QgUmVsZWFzZXMgYSBKYXZhU2NyaXB0IHNj cmlwdC4KLSBAcGFyYW0gY3R4IFRoZSBjb250ZXh0IHRoYXQgdGhlIHNjcmlwdCBpcyBkZWZpbmVk IGluLgogIEBwYXJhbSBzY3JpcHQgVGhlIHNjcmlwdCB0byByZWxlYXNlLgogICovCi1KU19FWFBP UlQgdm9pZCBKU1NjcmlwdFJlbGVhc2UoSlNDb250ZXh0UmVmIGN0eCwgSlNTY3JpcHRSZWYgc2Ny aXB0KTsKK0pTX0VYUE9SVCB2b2lkIEpTU2NyaXB0UmVsZWFzZShKU1NjcmlwdFJlZiBzY3JpcHQp OwogCiAvKiEKICBAZnVuY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9B UEkvdGVzdHMvdGVzdGFwaS5jIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0 YXBpLmMKaW5kZXggMTFjNTA0NWU4OTgwNWEwYjdkYjhlNGE4MzM2YTliMzU1MjA4ODAxMC4uMjVi OTQ1YTQ0NDA1OTU2MTdjNjc3OGI2MzA2ZjI1ZWU1ODEwYTgwYiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLmMKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLmMKQEAgLTEwNDcsNiArMTA0Nyw3IEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgCiAgICAgLy8gVGVzdCBnYXJiYWdlIGNvbGxl Y3Rpb24gd2l0aCBhIGZyZXNoIGNvbnRleHQKICAgICBjb250ZXh0ID0gSlNHbG9iYWxDb250ZXh0 Q3JlYXRlSW5Hcm91cChOVUxMLCBOVUxMKTsKKyAgICBKU0NvbnRleHRHcm91cFJlZiBjb250ZXh0 R3JvdXAgPSBKU0NvbnRleHRHZXRHcm91cChjb250ZXh0KTsKICAgICBUZXN0SW5pdGlhbGl6ZUZp bmFsaXplID0gdHJ1ZTsKICAgICB0ZXN0SW5pdGlhbGl6ZUZpbmFsaXplKCk7CiAgICAgSlNHbG9i YWxDb250ZXh0UmVsZWFzZShjb250ZXh0KTsKQEAgLTE0MDQsOCArMTQwNSw4IEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgSlNTdHJpbmdSZWYgYmFkU3ludGF4ID0gSlNT dHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoYmFkU3ludGF4Q29uc3RhbnQpOwogICAgIEFTU0VS VChKU0NoZWNrU2NyaXB0U3ludGF4KGNvbnRleHQsIGdvb2RTeW50YXgsIE5VTEwsIDAsIE5VTEwp KTsKICAgICBBU1NFUlQoIUpTQ2hlY2tTY3JpcHRTeW50YXgoY29udGV4dCwgYmFkU3ludGF4LCBO VUxMLCAwLCBOVUxMKSk7Ci0gICAgQVNTRVJUKCFKU1NjcmlwdENyZWF0ZUZyb21TdHJpbmcoY29u dGV4dCwgMCwgMCwgYmFkU3ludGF4LCAwKSk7Ci0gICAgQVNTRVJUKCFKU1NjcmlwdENyZWF0ZVJl ZmVyZW5jaW5nSW1tb3J0YWxBU0NJSVRleHQoY29udGV4dCwgMCwgMCwgYmFkU3ludGF4Q29uc3Rh bnQsIHN0cmxlbihiYWRTeW50YXhDb25zdGFudCksIDApKTsKKyAgICBBU1NFUlQoIUpTU2NyaXB0 Q3JlYXRlRnJvbVN0cmluZyhjb250ZXh0R3JvdXAsIDAsIDAsIGJhZFN5bnRheCwgMCwgMCkpOwor ICAgIEFTU0VSVCghSlNTY3JpcHRDcmVhdGVSZWZlcmVuY2luZ0ltbW9ydGFsQVNDSUlUZXh0KGNv bnRleHRHcm91cCwgMCwgMCwgYmFkU3ludGF4Q29uc3RhbnQsIHN0cmxlbihiYWRTeW50YXhDb25z dGFudCksIDAsIDApKTsKIAogICAgIEpTVmFsdWVSZWYgcmVzdWx0OwogICAgIEpTVmFsdWVSZWYg djsKQEAgLTE2MDIsMTIgKzE2MDMsMTIgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3Zb XSkKICAgICBBU1NFUlQoSlNWYWx1ZUlzRXF1YWwoY29udGV4dCwgdiwgbywgTlVMTCkpOwogICAg IEpTU3RyaW5nUmVsZWFzZShzY3JpcHQpOwogCi0gICAgSlNTY3JpcHRSZWYgc2NyaXB0T2JqZWN0 ID0gSlNTY3JpcHRDcmVhdGVSZWZlcmVuY2luZ0ltbW9ydGFsQVNDSUlUZXh0KGNvbnRleHQsIDAs IDAsIHRoaXNTY3JpcHQsIHN0cmxlbih0aGlzU2NyaXB0KSwgMCk7CisgICAgSlNTY3JpcHRSZWYg c2NyaXB0T2JqZWN0ID0gSlNTY3JpcHRDcmVhdGVSZWZlcmVuY2luZ0ltbW9ydGFsQVNDSUlUZXh0 KGNvbnRleHRHcm91cCwgMCwgMCwgdGhpc1NjcmlwdCwgc3RybGVuKHRoaXNTY3JpcHQpLCAwLCAw KTsKICAgICB2ID0gSlNTY3JpcHRFdmFsdWF0ZShjb250ZXh0LCBzY3JpcHRPYmplY3QsIE5VTEws IE5VTEwpOwogICAgIEFTU0VSVChKU1ZhbHVlSXNFcXVhbChjb250ZXh0LCB2LCBnbG9iYWxPYmpl Y3QsIE5VTEwpKTsKICAgICB2ID0gSlNTY3JpcHRFdmFsdWF0ZShjb250ZXh0LCBzY3JpcHRPYmpl Y3QsIG8sIE5VTEwpOwogICAgIEFTU0VSVChKU1ZhbHVlSXNFcXVhbChjb250ZXh0LCB2LCBvLCBO VUxMKSk7Ci0gICAgSlNTY3JpcHRSZWxlYXNlKGNvbnRleHQsIHNjcmlwdE9iamVjdCk7CisgICAg SlNTY3JpcHRSZWxlYXNlKHNjcmlwdE9iamVjdCk7CiAKICAgICBzY3JpcHQgPSBKU1N0cmluZ0Ny ZWF0ZVdpdGhVVEY4Q1N0cmluZygiZXZhbCh0aGlzKTsiKTsKICAgICB2ID0gSlNFdmFsdWF0ZVNj cmlwdChjb250ZXh0LCBzY3JpcHQsIE5VTEwsIE5VTEwsIDEsIE5VTEwpOwpAQCAtMTYzMCwxMCAr MTYzMSwxNiBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgIH0gZWxzZSB7 CiAgICAgICAgIEpTU3RyaW5nUmVmIHVybCA9IEpTU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5n KHNjcmlwdFBhdGgpOwogICAgICAgICBKU1N0cmluZ1JlZiBzY3JpcHQgPSBKU1N0cmluZ0NyZWF0 ZVdpdGhVVEY4Q1N0cmluZyhzY3JpcHRVVEY4KTsKLSAgICAgICAgSlNTY3JpcHRSZWYgc2NyaXB0 T2JqZWN0ID0gSlNTY3JpcHRDcmVhdGVGcm9tU3RyaW5nKGNvbnRleHQsIHVybCwgMSwgc2NyaXB0 LCAmZXhjZXB0aW9uKTsKKyAgICAgICAgSlNTdHJpbmdSZWYgZXJyb3JNZXNzYWdlID0gMDsKKyAg ICAgICAgaW50IGVycm9yTGluZSA9IDA7CisgICAgICAgIEpTU2NyaXB0UmVmIHNjcmlwdE9iamVj dCA9IEpTU2NyaXB0Q3JlYXRlRnJvbVN0cmluZyhjb250ZXh0R3JvdXAsIHVybCwgMSwgc2NyaXB0 LCAmZXJyb3JNZXNzYWdlLCAmZXJyb3JMaW5lKTsKICAgICAgICAgQVNTRVJUKCghc2NyaXB0T2Jq ZWN0KSAhPSAoIWV4Y2VwdGlvbikpOwogICAgICAgICBpZiAoZXhjZXB0aW9uKSB7Ci0gICAgICAg ICAgICBwcmludGYoIkZBSUw6IFRlc3Qgc2NyaXB0IGRpZCBub3QgcGFyc2VcbiIpOworICAgICAg ICAgICAgcHJpbnRmKCJGQUlMOiBUZXN0IHNjcmlwdCBkaWQgbm90IHBhcnNlXG5cdCVzOiVkXG5c dCIsIHNjcmlwdFBhdGgsIGVycm9yTGluZSk7CisgICAgICAgICAgICBDRlN0cmluZ1JlZiBlcnJv ckNGID0gSlNTdHJpbmdDb3B5Q0ZTdHJpbmcoa0NGQWxsb2NhdG9yRGVmYXVsdCwgZXJyb3JNZXNz YWdlKTsKKyAgICAgICAgICAgIENGU2hvdyhlcnJvckNGKTsKKyAgICAgICAgICAgIENGUmVsZWFz ZShlcnJvckNGKTsKKyAgICAgICAgICAgIEpTU3RyaW5nUmVsZWFzZShlcnJvck1lc3NhZ2UpOwog ICAgICAgICAgICAgZmFpbGVkID0gMTsKICAgICAgICAgfQogCkBAIC0xNjUwLDcgKzE2NTcsNyBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAgICAgICAgSlNTdHJpbmdS ZWxlYXNlKGV4Y2VwdGlvbklTdHJpbmcpOwogICAgICAgICAgICAgZmFpbGVkID0gMTsKICAgICAg ICAgfQotICAgICAgICBKU1NjcmlwdFJlbGVhc2UoY29udGV4dCwgc2NyaXB0T2JqZWN0KTsKKyAg ICAgICAgSlNTY3JpcHRSZWxlYXNlKHNjcmlwdE9iamVjdCk7CiAgICAgICAgIGZyZWUoc2NyaXB0 VVRGOCk7CiAgICAgfQogCg==