65271 2011-07-27 11:59:09 -0700 Handle callback oriented JSONP 2011-07-27 15:04:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver aroben oldest_to_newest 443051 0 oliver 2011-07-27 11:59:09 -0700 Handle callback oriented JSONP 443054 1 102161 oliver 2011-07-27 12:01:59 -0700 Created attachment 102161 Patch 443132 2 102161 oliver 2011-07-27 13:34:21 -0700 Comment on attachment 102161 Patch grumble, found an issue 443163 3 102187 oliver 2011-07-27 14:46:38 -0700 Created attachment 102187 Patch 443168 4 oliver 2011-07-27 14:56:04 -0700 Committed r91871: <http://trac.webkit.org/changeset/91871> 443176 5 aroben 2011-07-27 15:04:49 -0700 No test? 102161 2011-07-27 12:01:59 -0700 2011-07-27 14:46:36 -0700 Patch bug-65271-20110727120157.patch text/plain 5453 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogOTE3OTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDdk YmFjNjZiZjAxMTYxMGIxNDI2NzE5ZjNlYzU1OGVmZmNkYzI3MTEuLjE1YTA2ZDQ2NjUyMjc2NTky ZGYyMWM1OWZlZWI5NzUwZmI5MmYwYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDIwIEBACisyMDExLTA3LTI3ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisK KyAgICAgICAgSGFuZGxlIGNhbGxiYWNrIG9yaWVudGVkIEpTT05QCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTI3MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSB0aGUgY2FsbGJhY2sgb3JpZW50 ZWQgdmVyc2lvbnMgb2YgSlNPTlAuICBUaGUgTGl0ZXJhbCBwYXJzZXIKKyAgICAgICAgbm93IGhh bmRsZXMgPElkZW50aWZpZXI+ICguIDxJZGVudGlmaWVyPikqIChqc29uRGF0YSkuCisKKyAgICAg ICAgKiBpbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHA6CisgICAgICAgIChKU0M6OkludGVycHJl dGVyOjpleGVjdXRlKToKKyAgICAgICAgKiBydW50aW1lL0xpdGVyYWxQYXJzZXIuY3BwOgorICAg ICAgICAoSlNDOjpMaXRlcmFsUGFyc2VyOjp0cnlKU09OUFBhcnNlKToKKyAgICAgICAgKEpTQzo6 TGl0ZXJhbFBhcnNlcjo6TGV4ZXI6OmxleCk6CisgICAgICAgICogcnVudGltZS9MaXRlcmFsUGFy c2VyLmg6CisKIDIwMTEtMDctMjYgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBCdWZmZXIgb3ZlcmZsb3cgY3JlYXRpbmcgZXJyb3IgbWVzc2FnZXMgZm9yIEpTT04u cGFyc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRl cnByZXRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0 ZXIuY3BwCmluZGV4IDc4OGNlMDUzNDMxZmNhN2RjNjY3YWE2NTNlZDM5N2NkZDFhMzgxZDQuLjhl OTYzNzFiMDkxMGYwY2U0M2U0NTc0NzJlNmM4YmU5MjZlNmFkNDEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcApAQCAtODI1LDYgKzgy NSwyMiBAQCBKU1ZhbHVlIEludGVycHJldGVyOjpleGVjdXRlKFByb2dyYW1FeGVjdXRhYmxlKiBw cm9ncmFtLCBDYWxsRnJhbWUqIGNhbGxGcmFtZSwgUwogICAgICAgICAgICAgfQogICAgICAgICAg ICAgUHV0UHJvcGVydHlTbG90IHNsb3Q7CiAgICAgICAgICAgICBzd2l0Y2ggKEpTT05QUGF0aC5s YXN0KCkubV90eXBlKSB7CisgICAgICAgICAgICBjYXNlIExpdGVyYWxQYXJzZXI6OkpTT05QUGF0 aEVudHJ5VHlwZUNhbGw6IHsKKyAgICAgICAgICAgICAgICBKU1ZhbHVlIGZ1bmN0aW9uID0gYmFz ZU9iamVjdC5nZXQoY2FsbEZyYW1lLCBKU09OUFBhdGgubGFzdCgpLm1fcGF0aEVudHJ5TmFtZSk7 CisgICAgICAgICAgICAgICAgaWYgKGNhbGxGcmFtZS0+aGFkRXhjZXB0aW9uKCkpCisgICAgICAg ICAgICAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOworICAgICAgICAgICAgICAgIENhbGxE YXRhIGNhbGxEYXRhOworICAgICAgICAgICAgICAgIENhbGxUeXBlIGNhbGxUeXBlID0gZ2V0Q2Fs bERhdGEoZnVuY3Rpb24sIGNhbGxEYXRhKTsKKyAgICAgICAgICAgICAgICBpZiAoY2FsbFR5cGUg PT0gQ2FsbFR5cGVOb25lKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihj YWxsRnJhbWUsIGNyZWF0ZU5vdEFGdW5jdGlvbkVycm9yKGNhbGxGcmFtZSwgZnVuY3Rpb24pKTsK KyAgICAgICAgICAgICAgICBNYXJrZWRBcmd1bWVudEJ1ZmZlciBqc29uQXJnOworICAgICAgICAg ICAgICAgIGpzb25BcmcuYXBwZW5kKEpTT05QVmFsdWUpOworICAgICAgICAgICAgICAgIEpTVmFs dWUgdGhpc1ZhbHVlID0gSlNPTlBQYXRoLnNpemUoKSA9PSAxID8ganNVbmRlZmluZWQoKTogYmFz ZU9iamVjdDsKKyAgICAgICAgICAgICAgICBKU0M6OmNhbGwoY2FsbEZyYW1lLCBmdW5jdGlvbiwg Y2FsbFR5cGUsIGNhbGxEYXRhLCB0aGlzVmFsdWUsIGpzb25BcmcpOworICAgICAgICAgICAgICAg IGlmIChjYWxsRnJhbWUtPmhhZEV4Y2VwdGlvbigpKQorICAgICAgICAgICAgICAgICAgICByZXR1 cm4ganNVbmRlZmluZWQoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0K ICAgICAgICAgICAgIGNhc2UgTGl0ZXJhbFBhcnNlcjo6SlNPTlBQYXRoRW50cnlUeXBlRG90OiB7 CiAgICAgICAgICAgICAgICAgYmFzZU9iamVjdC5wdXQoY2FsbEZyYW1lLCBKU09OUFBhdGgubGFz dCgpLm1fcGF0aEVudHJ5TmFtZSwgSlNPTlBWYWx1ZSwgc2xvdCk7CiAgICAgICAgICAgICAgICAg aWYgKGNhbGxGcmFtZS0+aGFkRXhjZXB0aW9uKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9MaXRlcmFsUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0xpdGVyYWxQYXJzZXIuY3BwCmluZGV4IDcwMDgxNjAzZDViMzY2NDM1NjI3NGI4 ZTA1ZWE2MDEyOWIyNjg3NzkuLjczNjQ5ZTJjMDIzYTZiMDFiZGQxYzQzMjUzYzJkMzE1MDVlZTYy ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xpdGVyYWxQYXJz ZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xpdGVyYWxQYXJzZXIu Y3BwCkBAIC04NywxOCArODcsMzEgQEAgYm9vbCBMaXRlcmFsUGFyc2VyOjp0cnlKU09OUFBhcnNl KFZlY3RvcjxKU09OUERhdGE+JiByZXN1bHRzKQogICAgICAgICAgICAgICAgIGVudHJ5Lm1fcGF0 aEVudHJ5TmFtZSA9IElkZW50aWZpZXIobV9leGVjLCBtX2xleGVyLmN1cnJlbnRUb2tlbigpLnN0 YXJ0LCBtX2xleGVyLmN1cnJlbnRUb2tlbigpLmVuZCAtIG1fbGV4ZXIuY3VycmVudFRva2VuKCku c3RhcnQpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQorICAgICAgICAg ICAgY2FzZSBUb2tMUGFyZW46IHsKKyAgICAgICAgICAgICAgICBpZiAocGF0aC5sYXN0KCkubV90 eXBlICE9IEpTT05QUGF0aEVudHJ5VHlwZURvdCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgICAgIHBhdGgubGFzdCgpLm1fdHlwZSA9IEpTT05QUGF0aEVu dHJ5VHlwZUNhbGw7CisgICAgICAgICAgICAgICAgZW50cnkgPSBwYXRoLmxhc3QoKTsKKyAgICAg ICAgICAgICAgICBnb3RvIHN0YXJ0SlNPTjsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGRl ZmF1bHQ6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogICAg ICAgICAgICAgcGF0aC5hcHBlbmQoZW50cnkpOwogICAgICAgICAgICAgdG9rZW5UeXBlID0gbV9s ZXhlci5uZXh0KCk7CiAgICAgICAgIH0KKyAgICBzdGFydEpTT046CiAgICAgICAgIG1fbGV4ZXIu bmV4dCgpOwogICAgICAgICByZXN1bHRzLmFwcGVuZChKU09OUERhdGEoKSk7CiAgICAgICAgIHJl c3VsdHMubGFzdCgpLm1fdmFsdWUuc2V0KG1fZXhlYy0+Z2xvYmFsRGF0YSgpLCBwYXJzZShTdGFy dFBhcnNlRXhwcmVzc2lvbikpOwogICAgICAgICBpZiAoIXJlc3VsdHMubGFzdCgpLm1fdmFsdWUp CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIHJlc3VsdHMubGFzdCgpLm1fcGF0 aC5zd2FwKHBhdGgpOworICAgICAgICBpZiAoZW50cnkubV90eXBlID09IEpTT05QUGF0aEVudHJ5 VHlwZUNhbGwpIHsKKyAgICAgICAgICAgIGlmIChtX2xleGVyLmN1cnJlbnRUb2tlbigpLnR5cGUg IT0gVG9rUlBhcmVuKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAg IG1fbGV4ZXIubmV4dCgpOworICAgICAgICB9CiAgICAgICAgIGlmIChtX2xleGVyLmN1cnJlbnRU b2tlbigpLnR5cGUgIT0gVG9rU2VtaSkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBtX2xl eGVyLm5leHQoKTsKQEAgLTE1MCwxMSArMTYzLDExIEBAIHRlbXBsYXRlIDxMaXRlcmFsUGFyc2Vy OjpQYXJzZXJNb2RlIG1vZGU+IExpdGVyYWxQYXJzZXI6OlRva2VuVHlwZSBMaXRlcmFsUGFyc2Vy CiAgICAgICAgIGNhc2UgJygnOgogICAgICAgICAgICAgdG9rZW4udHlwZSA9IFRva0xQYXJlbjsK ICAgICAgICAgICAgIHRva2VuLmVuZCA9ICsrbV9wdHI7Ci0gICAgICAgICAgICByZXR1cm4gVG9r TEJyYWNrZXQ7CisgICAgICAgICAgICByZXR1cm4gVG9rTFBhcmVuOwogICAgICAgICBjYXNlICcp JzoKICAgICAgICAgICAgIHRva2VuLnR5cGUgPSBUb2tSUGFyZW47CiAgICAgICAgICAgICB0b2tl bi5lbmQgPSArK21fcHRyOwotICAgICAgICAgICAgcmV0dXJuIFRva1JCcmFja2V0OworICAgICAg ICAgICAgcmV0dXJuIFRva1JQYXJlbjsKICAgICAgICAgY2FzZSAneyc6CiAgICAgICAgICAgICB0 b2tlbi50eXBlID0gVG9rTEJyYWNlOwogICAgICAgICAgICAgdG9rZW4uZW5kID0gKyttX3B0cjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xpdGVyYWxQYXJzZXIu aCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xpdGVyYWxQYXJzZXIuaAppbmRleCBj MDBjMjUyNWU3NGUzYWQ1YzM0YThkNmE2N2M1NzQzNThlZjM0OWE3Li5hZWEzZjIwNWFhOGE2N2U2 MzI4ZWM1MDQ3MmE3OTYzMWRlMWJiNDY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9MaXRlcmFsUGFyc2VyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvTGl0ZXJhbFBhcnNlci5oCkBAIC02Niw3ICs2Niw4IEBAIG5hbWVzcGFjZSBKU0Mgewog ICAgICAgICBlbnVtIEpTT05QUGF0aEVudHJ5VHlwZSB7CiAgICAgICAgICAgICBKU09OUFBhdGhF bnRyeVR5cGVEZWNsYXJlLCAvLyB2YXIgcGF0aEVudHJ5TmFtZSA9IEpTT04KICAgICAgICAgICAg IEpTT05QUGF0aEVudHJ5VHlwZURvdCwgLy8gPHByaW9yIGVudHJpZXM+LnBhdGhFbnRyeU5hbWUg PSBKU09OCi0gICAgICAgICAgICBKU09OUFBhdGhFbnRyeVR5cGVMb29rdXAgLy8gPHByaW9yIGVu dHJpZXM+W3BhdGhJbmRleF0gPSBKU09OCisgICAgICAgICAgICBKU09OUFBhdGhFbnRyeVR5cGVM b29rdXAsIC8vIDxwcmlvciBlbnRyaWVzPltwYXRoSW5kZXhdID0gSlNPTgorICAgICAgICAgICAg SlNPTlBQYXRoRW50cnlUeXBlQ2FsbCAvLyA8cHJpb3IgZW50cmllcz4oSlNPTikKICAgICAgICAg fTsKIAogICAgICAgICBzdHJ1Y3QgSlNPTlBQYXRoRW50cnkgewo= 102187 2011-07-27 14:46:38 -0700 2011-07-27 14:51:04 -0700 Patch bug-65271-20110727144637.patch text/plain 6840 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogOTE3OTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDdk YmFjNjZiZjAxMTYxMGIxNDI2NzE5ZjNlYzU1OGVmZmNkYzI3MTEuLjE1YTA2ZDQ2NjUyMjc2NTky ZGYyMWM1OWZlZWI5NzUwZmI5MmYwYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDIwIEBACisyMDExLTA3LTI3ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisK KyAgICAgICAgSGFuZGxlIGNhbGxiYWNrIG9yaWVudGVkIEpTT05QCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTI3MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSB0aGUgY2FsbGJhY2sgb3JpZW50 ZWQgdmVyc2lvbnMgb2YgSlNPTlAuICBUaGUgTGl0ZXJhbCBwYXJzZXIKKyAgICAgICAgbm93IGhh bmRsZXMgPElkZW50aWZpZXI+ICguIDxJZGVudGlmaWVyPikqIChqc29uRGF0YSkuCisKKyAgICAg ICAgKiBpbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHA6CisgICAgICAgIChKU0M6OkludGVycHJl dGVyOjpleGVjdXRlKToKKyAgICAgICAgKiBydW50aW1lL0xpdGVyYWxQYXJzZXIuY3BwOgorICAg ICAgICAoSlNDOjpMaXRlcmFsUGFyc2VyOjp0cnlKU09OUFBhcnNlKToKKyAgICAgICAgKEpTQzo6 TGl0ZXJhbFBhcnNlcjo6TGV4ZXI6OmxleCk6CisgICAgICAgICogcnVudGltZS9MaXRlcmFsUGFy c2VyLmg6CisKIDIwMTEtMDctMjYgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBCdWZmZXIgb3ZlcmZsb3cgY3JlYXRpbmcgZXJyb3IgbWVzc2FnZXMgZm9yIEpTT04u cGFyc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRl cnByZXRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0 ZXIuY3BwCmluZGV4IDc4OGNlMDUzNDMxZmNhN2RjNjY3YWE2NTNlZDM5N2NkZDFhMzgxZDQuLjdh MTRhYzAyNDk2YmJiNmZlY2E2OGRmMWQ2ZmNjMWIxOWVkOTAzNDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcApAQCAtNzc2LDcgKzc3 Niw3IEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4ZWN1dGUoUHJvZ3JhbUV4ZWN1dGFibGUqIHBy b2dyYW0sIENhbGxGcmFtZSogY2FsbEZyYW1lLCBTCiAgICAgRHluYW1pY0dsb2JhbE9iamVjdFNj b3BlIGdsb2JhbE9iamVjdFNjb3BlKCpzY29wZUNoYWluLT5nbG9iYWxEYXRhLCBzY29wZUNoYWlu LT5nbG9iYWxPYmplY3QuZ2V0KCkpOwogICAgIExpdGVyYWxQYXJzZXIgbGl0ZXJhbFBhcnNlcihj YWxsRnJhbWUsIHByb2dyYW0tPnNvdXJjZSgpLmRhdGEoKSwgcHJvZ3JhbS0+c291cmNlKCkubGVu Z3RoKCksIExpdGVyYWxQYXJzZXI6OkpTT05QKTsKICAgICBWZWN0b3I8TGl0ZXJhbFBhcnNlcjo6 SlNPTlBEYXRhPiBKU09OUERhdGE7Ci0gICAgaWYgKGxpdGVyYWxQYXJzZXIudHJ5SlNPTlBQYXJz ZShKU09OUERhdGEpKSB7CisgICAgaWYgKGxpdGVyYWxQYXJzZXIudHJ5SlNPTlBQYXJzZShKU09O UERhdGEsIHNjb3BlQ2hhaW4tPmdsb2JhbE9iamVjdC0+c3VwcG9ydHNSaWNoU291cmNlSW5mbygp KSkgewogICAgICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gc2NvcGVDaGFpbi0+ Z2xvYmFsT2JqZWN0LmdldCgpOwogICAgICAgICBKU1ZhbHVlIHJlc3VsdDsKICAgICAgICAgZm9y ICh1bnNpZ25lZCBlbnRyeSA9IDA7IGVudHJ5IDwgSlNPTlBEYXRhLnNpemUoKTsgZW50cnkrKykg ewpAQCAtODI1LDYgKzgyNSwyMiBAQCBKU1ZhbHVlIEludGVycHJldGVyOjpleGVjdXRlKFByb2dy YW1FeGVjdXRhYmxlKiBwcm9ncmFtLCBDYWxsRnJhbWUqIGNhbGxGcmFtZSwgUwogICAgICAgICAg ICAgfQogICAgICAgICAgICAgUHV0UHJvcGVydHlTbG90IHNsb3Q7CiAgICAgICAgICAgICBzd2l0 Y2ggKEpTT05QUGF0aC5sYXN0KCkubV90eXBlKSB7CisgICAgICAgICAgICBjYXNlIExpdGVyYWxQ YXJzZXI6OkpTT05QUGF0aEVudHJ5VHlwZUNhbGw6IHsKKyAgICAgICAgICAgICAgICBKU1ZhbHVl IGZ1bmN0aW9uID0gYmFzZU9iamVjdC5nZXQoY2FsbEZyYW1lLCBKU09OUFBhdGgubGFzdCgpLm1f cGF0aEVudHJ5TmFtZSk7CisgICAgICAgICAgICAgICAgaWYgKGNhbGxGcmFtZS0+aGFkRXhjZXB0 aW9uKCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOworICAgICAg ICAgICAgICAgIENhbGxEYXRhIGNhbGxEYXRhOworICAgICAgICAgICAgICAgIENhbGxUeXBlIGNh bGxUeXBlID0gZ2V0Q2FsbERhdGEoZnVuY3Rpb24sIGNhbGxEYXRhKTsKKyAgICAgICAgICAgICAg ICBpZiAoY2FsbFR5cGUgPT0gQ2FsbFR5cGVOb25lKQorICAgICAgICAgICAgICAgICAgICByZXR1 cm4gdGhyb3dFcnJvcihjYWxsRnJhbWUsIGNyZWF0ZU5vdEFGdW5jdGlvbkVycm9yKGNhbGxGcmFt ZSwgZnVuY3Rpb24pKTsKKyAgICAgICAgICAgICAgICBNYXJrZWRBcmd1bWVudEJ1ZmZlciBqc29u QXJnOworICAgICAgICAgICAgICAgIGpzb25BcmcuYXBwZW5kKEpTT05QVmFsdWUpOworICAgICAg ICAgICAgICAgIEpTVmFsdWUgdGhpc1ZhbHVlID0gSlNPTlBQYXRoLnNpemUoKSA9PSAxID8ganNV bmRlZmluZWQoKTogYmFzZU9iamVjdDsKKyAgICAgICAgICAgICAgICBKU0M6OmNhbGwoY2FsbEZy YW1lLCBmdW5jdGlvbiwgY2FsbFR5cGUsIGNhbGxEYXRhLCB0aGlzVmFsdWUsIGpzb25BcmcpOwor ICAgICAgICAgICAgICAgIGlmIChjYWxsRnJhbWUtPmhhZEV4Y2VwdGlvbigpKQorICAgICAgICAg ICAgICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKKyAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNhc2UgTGl0ZXJhbFBhcnNlcjo6SlNPTlBQYXRo RW50cnlUeXBlRG90OiB7CiAgICAgICAgICAgICAgICAgYmFzZU9iamVjdC5wdXQoY2FsbEZyYW1l LCBKU09OUFBhdGgubGFzdCgpLm1fcGF0aEVudHJ5TmFtZSwgSlNPTlBWYWx1ZSwgc2xvdCk7CiAg ICAgICAgICAgICAgICAgaWYgKGNhbGxGcmFtZS0+aGFkRXhjZXB0aW9uKCkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9MaXRlcmFsUGFyc2VyLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xpdGVyYWxQYXJzZXIuY3BwCmluZGV4IDcwMDgxNjAz ZDViMzY2NDM1NjI3NGI4ZTA1ZWE2MDEyOWIyNjg3NzkuLmMwMGNkNGM5ZmU4NTE4MmY1MWMzODZh Y2RlMGYwNzJhNDI1NDk0NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0xpdGVyYWxQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0xpdGVyYWxQYXJzZXIuY3BwCkBAIC00Miw3ICs0Miw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBp c0pTT05XaGl0ZVNwYWNlKGNvbnN0IFVDaGFyJiBjKQogICAgIHJldHVybiBjID09ICcgJyB8fCBj ID09IDB4OSB8fCBjID09IDB4QSB8fCBjID09IDB4RDsKIH0KIAotYm9vbCBMaXRlcmFsUGFyc2Vy Ojp0cnlKU09OUFBhcnNlKFZlY3RvcjxKU09OUERhdGE+JiByZXN1bHRzKQorYm9vbCBMaXRlcmFs UGFyc2VyOjp0cnlKU09OUFBhcnNlKFZlY3RvcjxKU09OUERhdGE+JiByZXN1bHRzLCBib29sIG5l ZWRzRnVsbFNvdXJjZUluZm8pCiB7CiAgICAgaWYgKG1fbGV4ZXIubmV4dCgpICE9IFRva0lkZW50 aWZpZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTg3LDE4ICs4NywzMSBAQCBib29sIExp dGVyYWxQYXJzZXI6OnRyeUpTT05QUGFyc2UoVmVjdG9yPEpTT05QRGF0YT4mIHJlc3VsdHMpCiAg ICAgICAgICAgICAgICAgZW50cnkubV9wYXRoRW50cnlOYW1lID0gSWRlbnRpZmllcihtX2V4ZWMs IG1fbGV4ZXIuY3VycmVudFRva2VuKCkuc3RhcnQsIG1fbGV4ZXIuY3VycmVudFRva2VuKCkuZW5k IC0gbV9sZXhlci5jdXJyZW50VG9rZW4oKS5zdGFydCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBjYXNlIFRva0xQYXJlbjogeworICAgICAgICAg ICAgICAgIGlmIChwYXRoLmxhc3QoKS5tX3R5cGUgIT0gSlNPTlBQYXRoRW50cnlUeXBlRG90IHx8 IG5lZWRzRnVsbFNvdXJjZUluZm8pCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgICAgICAgICBwYXRoLmxhc3QoKS5tX3R5cGUgPSBKU09OUFBhdGhFbnRyeVR5cGVD YWxsOworICAgICAgICAgICAgICAgIGVudHJ5ID0gcGF0aC5sYXN0KCk7CisgICAgICAgICAgICAg ICAgZ290byBzdGFydEpTT047CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBkZWZhdWx0Ogog ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IHBhdGguYXBwZW5kKGVudHJ5KTsKICAgICAgICAgICAgIHRva2VuVHlwZSA9IG1fbGV4ZXIubmV4 dCgpOwogICAgICAgICB9CisgICAgc3RhcnRKU09OOgogICAgICAgICBtX2xleGVyLm5leHQoKTsK ICAgICAgICAgcmVzdWx0cy5hcHBlbmQoSlNPTlBEYXRhKCkpOwogICAgICAgICByZXN1bHRzLmxh c3QoKS5tX3ZhbHVlLnNldChtX2V4ZWMtPmdsb2JhbERhdGEoKSwgcGFyc2UoU3RhcnRQYXJzZUV4 cHJlc3Npb24pKTsKICAgICAgICAgaWYgKCFyZXN1bHRzLmxhc3QoKS5tX3ZhbHVlKQogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICByZXN1bHRzLmxhc3QoKS5tX3BhdGguc3dhcChw YXRoKTsKKyAgICAgICAgaWYgKGVudHJ5Lm1fdHlwZSA9PSBKU09OUFBhdGhFbnRyeVR5cGVDYWxs KSB7CisgICAgICAgICAgICBpZiAobV9sZXhlci5jdXJyZW50VG9rZW4oKS50eXBlICE9IFRva1JQ YXJlbikKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBtX2xleGVy Lm5leHQoKTsKKyAgICAgICAgfQogICAgICAgICBpZiAobV9sZXhlci5jdXJyZW50VG9rZW4oKS50 eXBlICE9IFRva1NlbWkpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgbV9sZXhlci5uZXh0 KCk7CkBAIC0xNTAsMTEgKzE2MywxMSBAQCB0ZW1wbGF0ZSA8TGl0ZXJhbFBhcnNlcjo6UGFyc2Vy TW9kZSBtb2RlPiBMaXRlcmFsUGFyc2VyOjpUb2tlblR5cGUgTGl0ZXJhbFBhcnNlcgogICAgICAg ICBjYXNlICcoJzoKICAgICAgICAgICAgIHRva2VuLnR5cGUgPSBUb2tMUGFyZW47CiAgICAgICAg ICAgICB0b2tlbi5lbmQgPSArK21fcHRyOwotICAgICAgICAgICAgcmV0dXJuIFRva0xCcmFja2V0 OworICAgICAgICAgICAgcmV0dXJuIFRva0xQYXJlbjsKICAgICAgICAgY2FzZSAnKSc6CiAgICAg ICAgICAgICB0b2tlbi50eXBlID0gVG9rUlBhcmVuOwogICAgICAgICAgICAgdG9rZW4uZW5kID0g KyttX3B0cjsKLSAgICAgICAgICAgIHJldHVybiBUb2tSQnJhY2tldDsKKyAgICAgICAgICAgIHJl dHVybiBUb2tSUGFyZW47CiAgICAgICAgIGNhc2UgJ3snOgogICAgICAgICAgICAgdG9rZW4udHlw ZSA9IFRva0xCcmFjZTsKICAgICAgICAgICAgIHRva2VuLmVuZCA9ICsrbV9wdHI7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9MaXRlcmFsUGFyc2VyLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9MaXRlcmFsUGFyc2VyLmgKaW5kZXggYzAwYzI1MjVl NzRlM2FkNWMzNGE4ZDZhNjdjNTc0MzU4ZWYzNDlhNy4uOGFiZWFiNTg1MjhhMWVkNjMyMTRjNzgx MjZkOTY1NGY2NDJkNjhlMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvTGl0ZXJhbFBhcnNlci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xp dGVyYWxQYXJzZXIuaApAQCAtNjYsNyArNjYsOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAg ZW51bSBKU09OUFBhdGhFbnRyeVR5cGUgewogICAgICAgICAgICAgSlNPTlBQYXRoRW50cnlUeXBl RGVjbGFyZSwgLy8gdmFyIHBhdGhFbnRyeU5hbWUgPSBKU09OCiAgICAgICAgICAgICBKU09OUFBh dGhFbnRyeVR5cGVEb3QsIC8vIDxwcmlvciBlbnRyaWVzPi5wYXRoRW50cnlOYW1lID0gSlNPTgot ICAgICAgICAgICAgSlNPTlBQYXRoRW50cnlUeXBlTG9va3VwIC8vIDxwcmlvciBlbnRyaWVzPltw YXRoSW5kZXhdID0gSlNPTgorICAgICAgICAgICAgSlNPTlBQYXRoRW50cnlUeXBlTG9va3VwLCAv LyA8cHJpb3IgZW50cmllcz5bcGF0aEluZGV4XSA9IEpTT04KKyAgICAgICAgICAgIEpTT05QUGF0 aEVudHJ5VHlwZUNhbGwgLy8gPHByaW9yIGVudHJpZXM+KEpTT04pCiAgICAgICAgIH07CiAKICAg ICAgICAgc3RydWN0IEpTT05QUGF0aEVudHJ5IHsKQEAgLTgwLDcgKzgxLDcgQEAgbmFtZXNwYWNl IEpTQyB7CiAgICAgICAgICAgICBTdHJvbmc8VW5rbm93bj4gbV92YWx1ZTsKICAgICAgICAgfTsK IAotICAgICAgICBib29sIHRyeUpTT05QUGFyc2UoVmVjdG9yPEpTT05QRGF0YT4mKTsKKyAgICAg ICAgYm9vbCB0cnlKU09OUFBhcnNlKFZlY3RvcjxKU09OUERhdGE+JiwgYm9vbCBuZWVkc0Z1bGxT b3VyY2VJbmZvKTsKIAogICAgIHByaXZhdGU6CiAgICAgICAgIGVudW0gUGFyc2VyU3RhdGUgeyBT dGFydFBhcnNlT2JqZWN0LCBTdGFydFBhcnNlQXJyYXksIFN0YXJ0UGFyc2VFeHByZXNzaW9uLCAK