45234 2010-09-04 15:41:49 -0700 Allow passing null to postMessage API functions 2010-09-04 17:21:32 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 274394 0 sam 2010-09-04 15:41:49 -0700 We should allow passing null to the postMessage API functions through explicit serialization of the null value for user messages. 274395 1 66591 sam 2010-09-04 15:45:55 -0700 Created attachment 66591 Patch 274410 2 sam 2010-09-04 17:21:32 -0700 Landed in r66799. 66591 2010-09-04 15:45:55 -0700 2010-09-04 17:16:41 -0700 Patch nullMessage.diff text/plain 9895 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Njc5NykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDAgQEAKKzIwMTAtMDktMDQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBw YXNzaW5nIG51bGwgdG8gcG9zdE1lc3NhZ2UgQVBJIGZ1bmN0aW9ucworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUyMzQKKworICAgICAgICAqIFNoYXJl ZC9BUElPYmplY3QuaDogQWRkIFR5cGVOdWxsIHRvIGVudW0uIFRoaXMgaXMgb25seSB1c2VkCisg ICAgICAgIGZvciBzZXJpYWxpemF0aW9uIHB1cnBvc2VzLCBhbmQgZG9lcyBub3QgcmVwcmVzZW50 IGEgY29uY3JldGUgc3ViY2xhc3MKKyAgICAgICAgb2YgQVBJT2JqZWN0LgorCisgICAgICAgICog U2hhcmVkL0NvcmVJUENTdXBwb3J0L1dlYlBhZ2VQcm94eU1lc3NhZ2VLaW5kcy5oOiBSZW1vdmUg V2lsbFN1Ym1pdEZvcm1XaXRoVXNlckRhdGEKKyAgICAgICAgbm93IHRoYXQgaXQgaXMgbm90IG5l ZWRlZC4KKworICAgICAgICAqIFNoYXJlZC9Vc2VyTWVzc2FnZUNvZGVycy5oOgorICAgICAgICAo V2ViS2l0OjpVc2VyTWVzc2FnZUVuY29kZXI6OmJhc2VFbmNvZGUpOgorICAgICAgICAoV2ViS2l0 OjpVc2VyTWVzc2FnZURlY29kZXI6OmJhc2VEZWNvZGUpOgorICAgICAgICBBZGQgZXhwbGljaXQg ZW5jb2RpbmcvZGVjb2Rpbmcgb2YgbnVsbCBmb3IgdXNlciBtZXNzYWdlcy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9XZWJDb250ZXh0VXNlck1lc3NhZ2VDb2RlcnMuaDoKKyAgICAgICAgKFdlYktp dDo6V2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2Rlcjo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktp dDo6V2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2Rlcjo6ZGVjb2RlKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VDb2RlcnMuaDoK KyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXI6OmVuY29k ZSk6CisgICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VEZWNvZGVyOjpk ZWNvZGUpOgorICAgICAgICBVcGRhdGUgVXNlck1lc3NhZ2VDb2RlcnMgc3ViY2xhc3NlcyB0byBj YWxsIHRoZSBiYXNlIGNsYXNzIGluIHRoZSBjb3JyZWN0CisgICAgICAgIHdheSB0byB3b3JrIHdp dGggbnVsbCBtZXNzYWdlcy4gVGhpcyBtZWFucyBtb3ZpbmcgdGhlIGVuY29kaW5nL2RlY29kaW5n CisgICAgICAgIG9mIHRoZSB0eXBlIGRvd24gdG8gdGhlIGJhc2UgY2xhc3MsIHdoaWNoIGlzIGEg bmljZSBjbGVhbnVwLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UpOgorICAgICAg ICBSZW1vdmUgbm93IHJlZHVuZGFudCBXaWxsU3VibWl0Rm9ybVdpdGhVc2VyRGF0YSBpbXBsZW1l bnRhdGlvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hXaWxsU3VibWl0Rm9ybSk6CisgICAgICAgIERpdHRvLgorCiAyMDEwLTA5LTAzICBK ZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYktpdDIvU2hhcmVkL0FQ SU9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL0FQSU9iamVjdC5oCShyZXZp c2lvbiA2Njc5MCkKKysrIFdlYktpdDIvU2hhcmVkL0FQSU9iamVjdC5oCSh3b3JraW5nIGNvcHkp CkBAIC0zNCw2ICszNCw3IEBAIGNsYXNzIEFQSU9iamVjdCA6IHB1YmxpYyBSZWZDb3VudGVkPEFQ SU8KIHB1YmxpYzoKICAgICBlbnVtIFR5cGUgewogICAgICAgICAvLyBCYXNlIHR5cGVzCisgICAg ICAgIFR5cGVOdWxsLAogICAgICAgICBUeXBlQXJyYXksCiAgICAgICAgIFR5cGVEYXRhLAogICAg ICAgICBUeXBlRGljdGlvbmFyeSwKSW5kZXg6IFdlYktpdDIvU2hhcmVkL1VzZXJNZXNzYWdlQ29k ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaAko cmV2aXNpb24gNjY3OTApCisrKyBXZWJLaXQyL1NoYXJlZC9Vc2VyTWVzc2FnZUNvZGVycy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCisv LyAgIC0gTnVsbCAtPiBOdWxsCiAvLyAgIC0gQXJyYXkgLT4gQXJyYXkKIC8vICAgLSBEaWN0aW9u YXJ5IC0+IERpY3Rpb25hcnkKIC8vICAgLSBTdHJpbmcgLT4gU3RyaW5nCkBAIC0zOSw4ICs0MCwx NiBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIHRlbXBsYXRlPHR5cGVuYW1lIE93bmVyPgogY2xhc3Mg VXNlck1lc3NhZ2VFbmNvZGVyIHsKIHB1YmxpYzoKLSAgICBib29sIGJhc2VFbmNvZGUoQ29yZUlQ Qzo6QXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBBUElPYmplY3Q6OlR5cGUgdHlwZSkgY29uc3Qg CisgICAgYm9vbCBiYXNlRW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciogZW5jb2Rlciwg QVBJT2JqZWN0OjpUeXBlJiB0eXBlKSBjb25zdCAKICAgICB7CisgICAgICAgIGlmICghbV9yb290 KSB7CisgICAgICAgICAgICBlbmNvZGVyLT5lbmNvZGVVSW50MzIoQVBJT2JqZWN0OjpUeXBlTnVs bCk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAgIHR5cGUg PSBtX3Jvb3QtPnR5cGUoKTsKKyAgICAgICAgZW5jb2Rlci0+ZW5jb2RlVUludDMyKHR5cGUpOwor CiAgICAgICAgIHN3aXRjaCAodHlwZSkgewogICAgICAgICBjYXNlIEFQSU9iamVjdDo6VHlwZUFy cmF5OiB7CiAgICAgICAgICAgICBJbW11dGFibGVBcnJheSogYXJyYXkgPSBzdGF0aWNfY2FzdDxJ bW11dGFibGVBcnJheSo+KG1fcm9vdCk7CkBAIC04NSw2ICs5NCw3IEBAIHByb3RlY3RlZDoKIAog CiAvLyBIYW5kbGVzCisvLyAgIC0gTnVsbCAtPiBOdWxsCiAvLyAgIC0gQXJyYXkgLT4gQXJyYXkK IC8vICAgLSBEaWN0aW9uYXJ5IC0+IERpY3Rpb25hcnkKIC8vICAgLSBTdHJpbmcgLT4gU3RyaW5n CkBAIC05Miw4ICsxMDIsMTQgQEAgcHJvdGVjdGVkOgogdGVtcGxhdGU8dHlwZW5hbWUgT3duZXI+ CiBjbGFzcyBVc2VyTWVzc2FnZURlY29kZXIgewogcHVibGljOgotICAgIHN0YXRpYyBib29sIGJh c2VEZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBPd25lciYgY29kZXIs IEFQSU9iamVjdDo6VHlwZSB0eXBlKQorICAgIHN0YXRpYyBib29sIGJhc2VEZWNvZGUoQ29yZUlQ Qzo6QXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBPd25lciYgY29kZXIsIEFQSU9iamVjdDo6VHlw ZSYgdHlwZSkKICAgICB7CisgICAgICAgIHVpbnQzMl90IHR5cGVBc1VJbnQzMjsKKyAgICAgICAg aWYgKCFkZWNvZGVyLT5kZWNvZGUodHlwZUFzVUludDMyKSkKKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgICAgICB0eXBlID0gc3RhdGljX2Nhc3Q8QVBJT2JqZWN0OjpUeXBlPih0eXBl QXNVSW50MzIpOworCiAgICAgICAgIHN3aXRjaCAodHlwZSkgewogICAgICAgICBjYXNlIEFQSU9i amVjdDo6VHlwZUFycmF5OiB7CiAgICAgICAgICAgICB1aW50NjRfdCBzaXplOwpJbmRleDogV2Vi S2l0Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUGFnZVByb3h5TWVzc2FnZUtpbmRzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUGFnZVByb3h5TWVz c2FnZUtpbmRzLmgJKHJldmlzaW9uIDY2NzkwKQorKysgV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1 cHBvcnQvV2ViUGFnZVByb3h5TWVzc2FnZUtpbmRzLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3LDcg KzY3LDYgQEAgZW51bSBLaW5kIHsKICAgICBTZXRUb29sVGlwLAogICAgIFRha2VGb2N1cywKICAg ICBXaWxsU3VibWl0Rm9ybSwKLSAgICBXaWxsU3VibWl0Rm9ybVdpdGhVc2VyRGF0YSwKICAgICAK ICAgICBCYWNrRm9yd2FyZEFkZEl0ZW0sCiAgICAgQmFja0ZvcndhcmRHb1RvSXRlbSwKSW5kZXg6 IFdlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRVc2VyTWVzc2FnZUNvZGVycy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRVc2VyTWVzc2FnZUNvZGVycy5oCShy ZXZpc2lvbiA2Njc5MCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRVc2VyTWVzc2Fn ZUNvZGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw5ICs0Myw3IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciogZW5jb2RlcikgY29uc3QgCiAg ICAgewotICAgICAgICBBUElPYmplY3Q6OlR5cGUgdHlwZSA9IG1fcm9vdC0+dHlwZSgpOwotICAg ICAgICBlbmNvZGVyLT5lbmNvZGUoc3RhdGljX2Nhc3Q8dWludDMyX3Q+KHR5cGUpKTsKLQorICAg ICAgICBBUElPYmplY3Q6OlR5cGUgdHlwZSA9IEFQSU9iamVjdDo6VHlwZU51bGw7CiAgICAgICAg IGlmIChiYXNlRW5jb2RlKGVuY29kZXIsIHR5cGUpKQogICAgICAgICAgICAgcmV0dXJuOwogCkBA IC04MywxNSArODEsMTEgQEAgcHVibGljOgogCiAgICAgc3RhdGljIGJvb2wgZGVjb2RlKENvcmVJ UEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2Rl ciYgY29kZXIpCiAgICAgewotICAgICAgICB1aW50MzJfdCB0eXBlOwotICAgICAgICBpZiAoIWRl Y29kZXItPmRlY29kZSh0eXBlKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAg ICBpZiAoIUJhc2U6OmJhc2VEZWNvZGUoZGVjb2RlciwgY29kZXIsIHN0YXRpY19jYXN0PEFQSU9i amVjdDo6VHlwZT4odHlwZSkpKQorICAgICAgICBBUElPYmplY3Q6OlR5cGUgdHlwZSA9IEFQSU9i amVjdDo6VHlwZU51bGw7CisgICAgICAgIGlmICghQmFzZTo6YmFzZURlY29kZShkZWNvZGVyLCBj b2RlciwgdHlwZSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgLy8gSWYg dGhlIGJhc2UgZGVjb2RlZCBzb21ldGhpbmcgaW50byByb290LCB3ZSBhcmUgZG9uZS4KLSAgICAg ICAgaWYgKGNvZGVyLm1fcm9vdCkKKyAgICAgICAgaWYgKGNvZGVyLm1fcm9vdCB8fCB0eXBlID09 IEFQSU9iamVjdDo6VHlwZU51bGwpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAg ICBzd2l0Y2ggKHR5cGUpIHsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2 aXNpb24gNjY3OTApCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC01NzYsMTkgKzU3Niw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRSZWNl aXZlTWVzc2FnZShDb3IKICAgICAgICAgICAgIHVpbnQ2NF90IHNvdXJjZUZyYW1lSUQ7CiAgICAg ICAgICAgICBWZWN0b3I8c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPiA+IHRleHRGaWVsZFZhbHVl czsKICAgICAgICAgICAgIHVpbnQ2NF90IGxpc3RlbmVySUQ7Ci0gICAgICAgICAgICBpZiAoIWFy Z3VtZW50cy0+ZGVjb2RlKENvcmVJUEM6Ok91dChmcmFtZUlELCBzb3VyY2VGcmFtZUlELCB0ZXh0 RmllbGRWYWx1ZXMsIGxpc3RlbmVySUQpKSkKLSAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgICAgIEFQSU9iamVjdCogbm9Vc2VyRGF0YSA9IDA7Ci0gICAgICAgICAgICB3aWxsU3Vi bWl0Rm9ybShwcm9jZXNzKCktPndlYkZyYW1lKGZyYW1lSUQpLCBwcm9jZXNzKCktPndlYkZyYW1l KHNvdXJjZUZyYW1lSUQpLCB0ZXh0RmllbGRWYWx1ZXMsIG5vVXNlckRhdGEsIGxpc3RlbmVySUQp OwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgY2FzZSBXZWJQYWdlUHJv eHlNZXNzYWdlOjpXaWxsU3VibWl0Rm9ybVdpdGhVc2VyRGF0YTogewotICAgICAgICAgICAgdWlu dDY0X3QgZnJhbWVJRDsKLSAgICAgICAgICAgIHVpbnQ2NF90IHNvdXJjZUZyYW1lSUQ7Ci0gICAg ICAgICAgICBWZWN0b3I8c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPiA+IHRleHRGaWVsZFZhbHVl czsKLSAgICAgICAgICAgIHVpbnQ2NF90IGxpc3RlbmVySUQ7Ci0gICAgICAgICAgICAKICAgICAg ICAgICAgIFJlZlB0cjxBUElPYmplY3Q+IHVzZXJEYXRhOwogICAgICAgICAgICAgV2ViQ29udGV4 dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgcGFnZU5hbWVzcGFj ZSgpLT5jb250ZXh0KCkpOwogCkBAIC01OTgsNyArNTg2LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmRpZFJlY2VpdmVNZXNzYWdlKENvcgogICAgICAgICAgICAgd2lsbFN1Ym1pdEZvcm0ocHJvY2Vz cygpLT53ZWJGcmFtZShmcmFtZUlEKSwgcHJvY2VzcygpLT53ZWJGcmFtZShzb3VyY2VGcmFtZUlE KSwgdGV4dEZpZWxkVmFsdWVzLCB1c2VyRGF0YS5nZXQoKSwgbGlzdGVuZXJJRCk7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQotICAgICAgICAKICAgICAgICAgY2FzZSBXZWJQYWdlUHJv eHlNZXNzYWdlOjpEaWRSdW5KYXZhU2NyaXB0SW5NYWluRnJhbWU6IHsKICAgICAgICAgICAgIFN0 cmluZyByZXN1bHRTdHJpbmc7CiAgICAgICAgICAgICB1aW50NjRfdCBjYWxsYmFja0lEOwpJbmRl eDogV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlVXNlck1l c3NhZ2VDb2RlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUNvZGVycy5oCShyZXZpc2lvbiA2Njc5MCkK KysrIFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVVzZXJN ZXNzYWdlQ29kZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSw0IEBACisKIC8qCiAgKiBD b3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKQEAg LTQzLDkgKzQ0LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1l bnRFbmNvZGVyKiBlbmNvZGVyKSBjb25zdCAKICAgICB7Ci0gICAgICAgIEFQSU9iamVjdDo6VHlw ZSB0eXBlID0gbV9yb290LT50eXBlKCk7Ci0gICAgICAgIGVuY29kZXItPmVuY29kZShzdGF0aWNf Y2FzdDx1aW50MzJfdD4odHlwZSkpOwotICAgICAgICAKKyAgICAgICAgQVBJT2JqZWN0OjpUeXBl IHR5cGUgPSBBUElPYmplY3Q6OlR5cGVOdWxsOwogICAgICAgICBpZiAoYmFzZUVuY29kZShlbmNv ZGVyLCB0eXBlKSkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtODEsMTUgKzgwLDExIEBAIHB1 YmxpYzoKIAogICAgIHN0YXRpYyBib29sIGRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXIq IGRlY29kZXIsIEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VEZWNvZGVyJiBjb2RlcikKICAgICB7 Ci0gICAgICAgIHVpbnQzMl90IHR5cGU7Ci0gICAgICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHR5 cGUpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgIGlmICghQmFzZTo6YmFz ZURlY29kZShkZWNvZGVyLCBjb2Rlciwgc3RhdGljX2Nhc3Q8QVBJT2JqZWN0OjpUeXBlPih0eXBl KSkpCisgICAgICAgIEFQSU9iamVjdDo6VHlwZSB0eXBlID0gQVBJT2JqZWN0OjpUeXBlTnVsbDsK KyAgICAgICAgaWYgKCFCYXNlOjpiYXNlRGVjb2RlKGRlY29kZXIsIGNvZGVyLCB0eXBlKSkKICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICAvLyBJZiB0aGUgYmFzZSBjcmVhdGVk IHNvbWV0aGluZyBpbiByb290LCB3ZSBhcmUgZG9uZS4KLSAgICAgICAgaWYgKGNvZGVyLm1fcm9v dCkKKyAgICAgICAgaWYgKGNvZGVyLm1fcm9vdCB8fCB0eXBlID09IEFQSU9iamVjdDo6VHlwZU51 bGwpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAgICBzd2l0Y2ggKHR5cGUpIHsK SW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkocmV2aXNpb24gNjY3OTApCisrKyBXZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01MjIsMTMgKzUyMiw4IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoV2lsbFMKIAogICAgIHVpbnQ2NF90IGxpc3RlbmVySUQgPSBtX2ZyYW1lLT5zZXRVcFBv bGljeUxpc3RlbmVyKGZ1bmN0aW9uKTsKIAotICAgIGlmICh1c2VyRGF0YSkgewotICAgICAgICBX ZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoV2ViUGFnZVByb3h5TWVzc2Fn ZTo6V2lsbFN1Ym1pdEZvcm1XaXRoVXNlckRhdGEsIHdlYlBhZ2UtPnBhZ2VJRCgpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29yZUlQQzo6SW4obV9m cmFtZS0+ZnJhbWVJRCgpLCBzb3VyY2VGcmFtZS0+ZnJhbWVJRCgpLCB2YWx1ZXMsIGxpc3RlbmVy SUQsIEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLmdldCgpKSkpOwot ICAgIH0gZWxzZSB7Ci0gICAgICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+ c2VuZChXZWJQYWdlUHJveHlNZXNzYWdlOjpXaWxsU3VibWl0Rm9ybSwgd2ViUGFnZS0+cGFnZUlE KCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDb3Jl SVBDOjpJbihtX2ZyYW1lLT5mcmFtZUlEKCksIHNvdXJjZUZyYW1lLT5mcmFtZUlEKCksIHZhbHVl cywgbGlzdGVuZXJJRCkpOwotICAgIH0KKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0 aW9uKCktPnNlbmQoV2ViUGFnZVByb3h5TWVzc2FnZTo6V2lsbFN1Ym1pdEZvcm0sIHdlYlBhZ2Ut PnBhZ2VJRCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBD b3JlSVBDOjpJbihtX2ZyYW1lLT5mcmFtZUlEKCksIHNvdXJjZUZyYW1lLT5mcmFtZUlEKCksIHZh bHVlcywgbGlzdGVuZXJJRCwgSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIodXNlckRh dGEuZ2V0KCkpKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlk TG9hZE1haW5SZXNvdXJjZShEb2N1bWVudExvYWRlciopCg==