139959 2014-12-26 13:59:04 -0800 Handle more types in the UserData encode/decode functions 2014-12-26 14:17:00 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca mitz oldest_to_newest 1057923 0 andersca 2014-12-26 13:59:04 -0800 Handle more types in the UserData encode/decode functions 1057924 1 243764 andersca 2014-12-26 14:01:06 -0800 Created attachment 243764 Patch 1057926 2 243764 mitz 2014-12-26 14:10:11 -0800 Comment on attachment 243764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243764&action=review > Source/WebKit2/Shared/UserData.cpp:414 > + return true; Why not break; like elsewhere? > Source/WebKit2/Shared/UserData.cpp:476 > + No need for this empty line. > Source/WebKit2/Shared/UserData.cpp:514 > + if (children && children->type() != API::Object::Type::Array) > + return false; Why do you type-check children here but not elementClassNames and not any of the API objects decoded in RenderLayer? 1057928 3 andersca 2014-12-26 14:16:13 -0800 (In reply to comment #2) > > Source/WebKit2/Shared/UserData.cpp:514 > > + if (children && children->type() != API::Object::Type::Array) > > + return false; > > Why do you type-check children here but not elementClassNames and not any of > the API objects decoded in RenderLayer? This code is just copied from the legacy decoder. I guess you'll have to ask the author of that patch... 1057929 4 andersca 2014-12-26 14:16:33 -0800 Committed r177750: <http://trac.webkit.org/changeset/177750> 243764 2014-12-26 14:01:06 -0800 2014-12-26 14:10:11 -0800 Patch bug-139959-20141226140107.patch text/plain 10201 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjYwZGE5ZmNjODc3MDEx ZWE0YWRhY2EyZWU0MDk5NWQ4OTZmOWZhMi4uNzMxOTYxYzg4NDU5NmY3YjY0Zjg1YjIxNGNiY2Zj NjFjYWE5OWM5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDE0LTEyLTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSGFuZGxlIG1vcmUg dHlwZXMgaW4gdGhlIFVzZXJEYXRhIGVuY29kZS9kZWNvZGUgZnVuY3Rpb25zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk5NTkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9Vc2VyRGF0YS5j cHA6CisgICAgICAgIChXZWJLaXQ6OlVzZXJEYXRhOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0 OjpVc2VyRGF0YTo6ZGVjb2RlKToKKworMjAxNC0xMi0yNiAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIE1vdmUgaGFuZGxlIGVuY29kaW5nIGZ1bmN0aW9u cyB0byB0aGVpciByZXNwZWN0aXZlIGltcGxlbWVudGF0aW9uIGZpbGVzCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk5NTcKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvU2hhcmVkL1VzZXJEYXRhLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9Vc2VyRGF0YS5jcHAKaW5kZXggMjFjOWYzZGIwNGRhMTkwMGI2NGMzYmVkNGNhMDMyYjNjMjRk YzliMi4uNGE5MDJkOTA3NTM1YjNlNWIzMmUwOTVmNGVhYTViYmU1MTM2NTFjOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1VzZXJEYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvVXNlckRhdGEuY3BwCkBAIC00MCw4ICs0MCwxNCBAQAogI2luY2x1ZGUgIkFQSVVS TC5oIgogI2luY2x1ZGUgIkFQSVVSTFJlcXVlc3QuaCIKICNpbmNsdWRlICJBUElVUkxSZXNwb25z ZS5oIgorI2luY2x1ZGUgIkFQSVVzZXJDb250ZW50VVJMUGF0dGVybi5oIgogI2luY2x1ZGUgIkFy Z3VtZW50Q29kZXJzLmgiCiAjaW5jbHVkZSAiQXJndW1lbnRFbmNvZGVyLmgiCisjaW5jbHVkZSAi U2hhcmVhYmxlQml0bWFwLmgiCisjaW5jbHVkZSAiV2ViQ2VydGlmaWNhdGVJbmZvLmgiCisjaW5j bHVkZSAiV2ViSW1hZ2UuaCIKKyNpbmNsdWRlICJXZWJSZW5kZXJMYXllci5oIgorI2luY2x1ZGUg IldlYlJlbmRlck9iamVjdC5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtMTY5LDYgKzE3 NSwxMiBAQCB2b2lkIFVzZXJEYXRhOjplbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImIGVuY29k ZXIsIGNvbnN0IEFQSTo6T2JqZWN0JiBvYmplY3QpCiAgICAgICAgIHN0YXRpY19jYXN0PGNvbnN0 IEFQSTo6Qm9vbGVhbiY+KG9iamVjdCkuZW5jb2RlKGVuY29kZXIpOwogICAgICAgICBicmVhazsK IAorICAgIGNhc2UgQVBJOjpPYmplY3Q6OlR5cGU6OkNlcnRpZmljYXRlSW5mbzogeworICAgICAg ICBjb25zdCBhdXRvJiBjZXJ0aWZpY2F0ZUluZm8gPSBzdGF0aWNfY2FzdDxjb25zdCBXZWJDZXJ0 aWZpY2F0ZUluZm8mPihvYmplY3QpOworICAgICAgICBlbmNvZGVyIDw8IGNlcnRpZmljYXRlSW5m by5jZXJ0aWZpY2F0ZUluZm8oKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorCiAgICAgY2FzZSBB UEk6Ok9iamVjdDo6VHlwZTo6RGF0YToKICAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgQVBJOjpE YXRhJj4ob2JqZWN0KS5lbmNvZGUoZW5jb2Rlcik7CiAgICAgICAgIGJyZWFrOwpAQCAtMTk3LDYg KzIwOSwyMyBAQCB2b2lkIFVzZXJEYXRhOjplbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImIGVu Y29kZXIsIGNvbnN0IEFQSTo6T2JqZWN0JiBvYmplY3QpCiAgICAgICAgIHN0YXRpY19jYXN0PGNv bnN0IEFQSTo6RnJhbWVIYW5kbGUmPihvYmplY3QpLmVuY29kZShlbmNvZGVyKTsKICAgICAgICAg YnJlYWs7CiAKKyAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpJbWFnZTogeworICAgICAgICBh dXRvJiBpbWFnZSA9IHN0YXRpY19jYXN0PGNvbnN0IFdlYkltYWdlJj4ob2JqZWN0KTsKKworICAg ICAgICBTaGFyZWFibGVCaXRtYXA6OkhhbmRsZSBoYW5kbGU7CisgICAgICAgIEFTU0VSVCghaW1h Z2UuYml0bWFwKCkgfHwgaW1hZ2UuYml0bWFwKCktPmlzQmFja2VkQnlTaGFyZWRNZW1vcnkoKSk7 CisgICAgICAgIGlmICghaW1hZ2UuYml0bWFwKCkgfHwgIWltYWdlLmJpdG1hcCgpLT5pc0JhY2tl ZEJ5U2hhcmVkTWVtb3J5KCkgfHwgIWltYWdlLmJpdG1hcCgpLT5jcmVhdGVIYW5kbGUoaGFuZGxl KSkgeworICAgICAgICAgICAgLy8gSW5pdGlhbCBmYWxzZSBpbmRpY2F0ZXMgbm8gYWxsb2NhdGVk IGJpdG1hcCBvciBpcyBub3Qgc2hhcmVhYmxlLgorICAgICAgICAgICAgZW5jb2RlciA8PCBmYWxz ZTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisKKyAgICAgICAgLy8gSW5pdGlhbCB0 cnVlIGluZGljYXRlcyBhIGJpdG1hcCB3YXMgYWxsb2NhdGVkIGFuZCBpcyBzaGFyZWFibGUuCisg ICAgICAgIGVuY29kZXIgPDwgdHJ1ZTsKKyAgICAgICAgZW5jb2RlciA8PCBoYW5kbGU7CisgICAg ICAgIGJyZWFrOworICAgIH0KKwogICAgIGNhc2UgQVBJOjpPYmplY3Q6OlR5cGU6OlBhZ2VHcm91 cEhhbmRsZToKICAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgQVBJOjpQYWdlR3JvdXBIYW5kbGUm PihvYmplY3QpLmVuY29kZShlbmNvZGVyKTsKICAgICAgICAgYnJlYWs7CkBAIC0yMTMsNiArMjQy LDM4IEBAIHZvaWQgVXNlckRhdGE6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2Rl ciwgY29uc3QgQVBJOjpPYmplY3QmIG9iamVjdCkKICAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3Qg QVBJOjpSZWN0Jj4ob2JqZWN0KS5lbmNvZGUoZW5jb2Rlcik7CiAgICAgICAgIGJyZWFrOwogCisg ICAgY2FzZSBBUEk6Ok9iamVjdDo6VHlwZTo6UmVuZGVyTGF5ZXI6IHsKKyAgICAgICAgYXV0byYg cmVuZGVyTGF5ZXIgPSBzdGF0aWNfY2FzdDxjb25zdCBXZWJSZW5kZXJMYXllciY+KG9iamVjdCk7 CisKKyAgICAgICAgZW5jb2RlKGVuY29kZXIsIHJlbmRlckxheWVyLnJlbmRlcmVyKCkpOworICAg ICAgICBlbmNvZGVyIDw8IHJlbmRlckxheWVyLmlzUmVmbGVjdGlvbigpOworICAgICAgICBlbmNv ZGVyIDw8IHJlbmRlckxheWVyLmlzQ2xpcHBpbmcoKTsKKyAgICAgICAgZW5jb2RlciA8PCByZW5k ZXJMYXllci5pc0NsaXBwZWQoKTsKKyAgICAgICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDx1aW50 MzJfdD4ocmVuZGVyTGF5ZXIuY29tcG9zaXRpbmdMYXllclR5cGUoKSk7CisgICAgICAgIGVuY29k ZXIgPDwgcmVuZGVyTGF5ZXIuYWJzb2x1dGVCb3VuZGluZ0JveCgpOworICAgICAgICBlbmNvZGVy IDw8IHJlbmRlckxheWVyLmJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKCk7CisgICAgICAgIGVu Y29kZShlbmNvZGVyLCByZW5kZXJMYXllci5uZWdhdGl2ZVpPcmRlckxpc3QoKSk7CisgICAgICAg IGVuY29kZShlbmNvZGVyLCByZW5kZXJMYXllci5ub3JtYWxGbG93TGlzdCgpKTsKKyAgICAgICAg ZW5jb2RlKGVuY29kZXIsIHJlbmRlckxheWVyLnBvc2l0aXZlWk9yZGVyTGlzdCgpKTsKKyAgICAg ICAgZW5jb2RlKGVuY29kZXIsIHJlbmRlckxheWVyLmZyYW1lQ29udGVudHNMYXllcigpKTsKKyAg ICAgICAgYnJlYWs7CisgICAgfQorCisgICAgY2FzZSBBUEk6Ok9iamVjdDo6VHlwZTo6UmVuZGVy T2JqZWN0OiB7CisgICAgICAgIGF1dG8mIHJlbmRlck9iamVjdCA9IHN0YXRpY19jYXN0PGNvbnN0 IFdlYlJlbmRlck9iamVjdCY+KG9iamVjdCk7CisKKyAgICAgICAgZW5jb2RlciA8PCByZW5kZXJP YmplY3QubmFtZSgpOworICAgICAgICBlbmNvZGVyIDw8IHJlbmRlck9iamVjdC5lbGVtZW50VGFn TmFtZSgpOworICAgICAgICBlbmNvZGVyIDw8IHJlbmRlck9iamVjdC5lbGVtZW50SUQoKTsKKyAg ICAgICAgZW5jb2RlKGVuY29kZXIsIHJlbmRlck9iamVjdC5lbGVtZW50Q2xhc3NOYW1lcygpKTsK KyAgICAgICAgZW5jb2RlciA8PCByZW5kZXJPYmplY3QuYWJzb2x1dGVQb3NpdGlvbigpOworICAg ICAgICBlbmNvZGVyIDw8IHJlbmRlck9iamVjdC5mcmFtZVJlY3QoKTsKKyAgICAgICAgZW5jb2Rl ciA8PCByZW5kZXJPYmplY3QudGV4dFNuaXBwZXQoKTsKKyAgICAgICAgZW5jb2RlciA8PCByZW5k ZXJPYmplY3QudGV4dExlbmd0aCgpOworICAgICAgICBlbmNvZGUoZW5jb2RlciwgcmVuZGVyT2Jq ZWN0LmNoaWxkcmVuKCkpOworICAgICAgICBicmVhazsKKyAgICB9CisKICAgICBjYXNlIEFQSTo6 T2JqZWN0OjpUeXBlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWU6IHsKICAgICAgICAgYXV0byYgc2Vy aWFsaXplZFNjcmlwdFZhbHVlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQVBJOjpTZXJpYWxpemVkU2Ny aXB0VmFsdWUmPihvYmplY3QpOwogICAgICAgICBlbmNvZGVyIDw8IHNlcmlhbGl6ZWRTY3JpcHRW YWx1ZS5kYXRhUmVmZXJlbmNlKCk7CkBAIC0yNDUsNiArMzA2LDEyIEBAIHZvaWQgVXNlckRhdGE6 OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29uc3QgQVBJOjpPYmplY3Qm IG9iamVjdCkKICAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgQVBJOjpVSW50NjQmPihvYmplY3Qp LmVuY29kZShlbmNvZGVyKTsKICAgICAgICAgYnJlYWs7CiAKKyAgICBjYXNlIEFQSTo6T2JqZWN0 OjpUeXBlOjpVc2VyQ29udGVudFVSTFBhdHRlcm46IHsKKyAgICAgICAgYXV0byYgdXJsUGF0dGVy biA9IHN0YXRpY19jYXN0PGNvbnN0IEFQSTo6VXNlckNvbnRlbnRVUkxQYXR0ZXJuJj4ob2JqZWN0 KTsKKyAgICAgICAgZW5jb2RlciA8PCB1cmxQYXR0ZXJuLnBhdHRlcm5TdHJpbmcoKTsKKyAgICAg ICAgYnJlYWs7CisgICAgfQorCiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgfQpAQCAtMjgwLDYgKzM0NywxNCBAQCBib29sIFVzZXJEYXRhOjpkZWNvZGUo SVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFJlZlB0cjxBUEk6Ok9iamVjdD4mIHJlc3Vs dAogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBicmVhazsKIAorICAgIGNhc2Ug QVBJOjpPYmplY3Q6OlR5cGU6OkNlcnRpZmljYXRlSW5mbzogeworICAgICAgICBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8gY2VydGlmaWNhdGVJbmZvOworICAgICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKGNlcnRpZmljYXRlSW5mbykpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg IHJlc3VsdCA9IFdlYkNlcnRpZmljYXRlSW5mbzo6Y3JlYXRlKGNlcnRpZmljYXRlSW5mbyk7Cisg ICAgICAgIGJyZWFrOworICAgIH0KKwogICAgIGNhc2UgQVBJOjpPYmplY3Q6OlR5cGU6OkRhdGE6 CiAgICAgICAgIGlmICghQVBJOjpEYXRhOjpkZWNvZGUoZGVjb2RlciwgcmVzdWx0KSkKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTMyMyw2ICszOTgsMjIgQEAgYm9vbCBVc2VyRGF0YTo6 ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZWZQdHI8QVBJOjpPYmplY3Q+ JiByZXN1bHQKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgYnJlYWs7CiAKKyAg ICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpJbWFnZTogeworICAgICAgICBib29sIGRpZEVuY29k ZSA9IGZhbHNlOworICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGRpZEVuY29kZSkpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgaWYgKCFkaWRFbmNvZGUpCisgICAgICAg ICAgICBicmVhazsKKworICAgICAgICBTaGFyZWFibGVCaXRtYXA6OkhhbmRsZSBoYW5kbGU7Cisg ICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFuZGxlKSkKKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgICAgICByZXN1bHQgPSBXZWJJbWFnZTo6Y3JlYXRlKFNoYXJlYWJsZUJpdG1h cDo6Y3JlYXRlKGhhbmRsZSkpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICBj YXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpOdWxsOgogICAgICAgICByZXN1bHQgPSBudWxscHRyOwog ICAgICAgICBicmVhazsKQEAgLTM0Nyw2ICs0MzgsODQgQEAgYm9vbCBVc2VyRGF0YTo6ZGVjb2Rl KElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZWZQdHI8QVBJOjpPYmplY3Q+JiByZXN1 bHQKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgYnJlYWs7CiAKKyAgICBjYXNl IEFQSTo6T2JqZWN0OjpUeXBlOjpSZW5kZXJMYXllcjogeworICAgICAgICBSZWZQdHI8QVBJOjpP YmplY3Q+IHJlbmRlcmVyOworICAgICAgICBib29sIGlzUmVmbGVjdGlvbjsKKyAgICAgICAgYm9v bCBpc0NsaXBwaW5nOworICAgICAgICBib29sIGlzQ2xpcHBlZDsKKyAgICAgICAgdWludDMyX3Qg Y29tcG9zaXRpbmdMYXllclR5cGVBc1VJbnQzMjsKKyAgICAgICAgV2ViQ29yZTo6SW50UmVjdCBh YnNvbHV0ZUJvdW5kaW5nQm94OworICAgICAgICBkb3VibGUgYmFja2luZ1N0b3JlTWVtb3J5RXN0 aW1hdGU7CisgICAgICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gbmVnYXRpdmVaT3JkZXJMaXN0Owor ICAgICAgICBSZWZQdHI8QVBJOjpPYmplY3Q+IG5vcm1hbEZsb3dMaXN0OworICAgICAgICBSZWZQ dHI8QVBJOjpPYmplY3Q+IHBvc2l0aXZlWk9yZGVyTGlzdDsKKyAgICAgICAgUmVmUHRyPEFQSTo6 T2JqZWN0PiBmcmFtZUNvbnRlbnRzTGF5ZXI7CisKKyAgICAgICAgaWYgKCFkZWNvZGUoZGVjb2Rl ciwgcmVuZGVyZXIpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAocmVu ZGVyZXItPnR5cGUoKSAhPSBBUEk6Ok9iamVjdDo6VHlwZTo6UmVuZGVyT2JqZWN0KQorICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGlzUmVmbGVj dGlvbikpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICghZGVjb2Rlci5k ZWNvZGUoaXNDbGlwcGluZykpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlm ICghZGVjb2Rlci5kZWNvZGUoaXNDbGlwcGVkKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb21wb3NpdGluZ0xheWVyVHlwZUFzVUludDMy KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29k ZShhYnNvbHV0ZUJvdW5kaW5nQm94KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShiYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSkpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICghZGVjb2RlKGRlY29kZXIsIG5lZ2F0 aXZlWk9yZGVyTGlzdCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICgh ZGVjb2RlKGRlY29kZXIsIG5vcm1hbEZsb3dMaXN0KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgaWYgKCFkZWNvZGUoZGVjb2RlciwgcG9zaXRpdmVaT3JkZXJMaXN0KSkKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBpZiAoIWRlY29kZShkZWNvZGVyLCBm cmFtZUNvbnRlbnRzTGF5ZXIpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAg IHJlc3VsdCA9IFdlYlJlbmRlckxheWVyOjpjcmVhdGUoc3RhdGljX3BvaW50ZXJfY2FzdDxXZWJS ZW5kZXJPYmplY3Q+KHJlbmRlcmVyKSwgaXNSZWZsZWN0aW9uLCBpc0NsaXBwaW5nLCBpc0NsaXBw ZWQsIHN0YXRpY19jYXN0PFdlYlJlbmRlckxheWVyOjpDb21wb3NpdGluZ0xheWVyVHlwZT4oY29t cG9zaXRpbmdMYXllclR5cGVBc1VJbnQzMiksIGFic29sdXRlQm91bmRpbmdCb3gsIGJhY2tpbmdT dG9yZU1lbW9yeUVzdGltYXRlLCBzdGF0aWNfcG9pbnRlcl9jYXN0PEFQSTo6QXJyYXk+KG5lZ2F0 aXZlWk9yZGVyTGlzdCksIHN0YXRpY19wb2ludGVyX2Nhc3Q8QVBJOjpBcnJheT4obm9ybWFsRmxv d0xpc3QpLCBzdGF0aWNfcG9pbnRlcl9jYXN0PEFQSTo6QXJyYXk+KHBvc2l0aXZlWk9yZGVyTGlz dCksIHN0YXRpY19wb2ludGVyX2Nhc3Q8V2ViUmVuZGVyTGF5ZXI+KGZyYW1lQ29udGVudHNMYXll cikpOworICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBl OjpSZW5kZXJPYmplY3Q6IHsKKyAgICAgICAgU3RyaW5nIG5hbWU7CisgICAgICAgIFN0cmluZyB0 ZXh0U25pcHBldDsKKyAgICAgICAgU3RyaW5nIGVsZW1lbnRUYWdOYW1lOworICAgICAgICBTdHJp bmcgZWxlbWVudElEOworICAgICAgICB1bnNpZ25lZCB0ZXh0TGVuZ3RoOworICAgICAgICBSZWZQ dHI8QVBJOjpPYmplY3Q+IGVsZW1lbnRDbGFzc05hbWVzOworICAgICAgICBXZWJDb3JlOjpJbnRQ b2ludCBhYnNvbHV0ZVBvc2l0aW9uOworICAgICAgICBXZWJDb3JlOjpJbnRSZWN0IGZyYW1lUmVj dDsKKyAgICAgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBjaGlsZHJlbjsKKworICAgICAgICBpZiAo IWRlY29kZXIuZGVjb2RlKG5hbWUpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKGVsZW1lbnRUYWdOYW1lKSkKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShlbGVtZW50SUQpKQorICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWRlY29kZShkZWNvZGVyLCBlbGVtZW50 Q2xhc3NOYW1lcykpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICghZGVj b2Rlci5kZWNvZGUoYWJzb2x1dGVQb3NpdGlvbikpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUoZnJhbWVSZWN0KSkKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZSh0ZXh0U25pcHBldCkpCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUodGV4 dExlbmd0aCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICghZGVjb2Rl KGRlY29kZXIsIGNoaWxkcmVuKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg aWYgKGNoaWxkcmVuICYmIGNoaWxkcmVuLT50eXBlKCkgIT0gQVBJOjpPYmplY3Q6OlR5cGU6OkFy cmF5KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXN1bHQgPSBXZWJSZW5k ZXJPYmplY3Q6OmNyZWF0ZShuYW1lLCBlbGVtZW50VGFnTmFtZSwgZWxlbWVudElELCBzdGF0aWNf cG9pbnRlcl9jYXN0PEFQSTo6QXJyYXk+KGVsZW1lbnRDbGFzc05hbWVzKSwgYWJzb2x1dGVQb3Np dGlvbiwgZnJhbWVSZWN0LCB0ZXh0U25pcHBldCwgdGV4dExlbmd0aCwgc3RhdGljX3BvaW50ZXJf Y2FzdDxBUEk6OkFycmF5PihjaGlsZHJlbikpOworICAgICAgICBicmVhazsKKyAgICB9CisKICAg ICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWU6IHsKICAgICAg ICAgSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGFSZWZlcmVuY2U7CiAgICAgICAgIGlmICghZGVjb2Rl ci5kZWNvZGUoZGF0YVJlZmVyZW5jZSkpCkBAIC0zOTEsNiArNTYwLDE0IEBAIGJvb2wgVXNlckRh dGE6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgUmVmUHRyPEFQSTo6T2Jq ZWN0PiYgcmVzdWx0CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGJyZWFrOwog CisgICAgY2FzZSBBUEk6Ok9iamVjdDo6VHlwZTo6VXNlckNvbnRlbnRVUkxQYXR0ZXJuOiB7Cisg ICAgICAgIFN0cmluZyBzdHJpbmc7CisgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUoc3RyaW5n KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmVzdWx0ID0gQVBJOjpVc2Vy Q29udGVudFVSTFBhdHRlcm46OmNyZWF0ZShzdHJpbmcpOworICAgICAgICBicmVhazsKKyAgICB9 CisKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9Cg==