62755 2011-06-15 13:58:18 -0700 Move more argument coders to WebCoreArgumentCoders.cpp 2011-06-15 14:39:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 421561 0 andersca 2011-06-15 13:58:18 -0700 Move more argument coders to WebCoreArgumentCoders.cpp 421562 1 97361 andersca 2011-06-15 13:58:36 -0700 Created attachment 97361 Patch 421586 2 andersca 2011-06-15 14:39:21 -0700 Committed r88973: <http://trac.webkit.org/changeset/88973> 97361 2011-06-15 13:58:36 -0700 2011-06-15 14:12:31 -0700 Patch bug-62755-20110615135835.patch text/plain 14094 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4OTcwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYtMTUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIG1vcmUgYXJndW1lbnQgY29kZXJzIHRvIFdlYkNv cmVBcmd1bWVudENvZGVycy5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTYyNzU1CisKKyAgICAgICAgKiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29k ZXJzLmNwcDoKKyAgICAgICAgKENvcmVJUEM6Ojo6ZGVjb2RlKToKKyAgICAgICAgKENvcmVJUEM6 Ojo6ZW5jb2RlKToKKyAgICAgICAgKENvcmVJUEM6OmVuY29kZUltYWdlKToKKyAgICAgICAgKENv cmVJUEM6OmRlY29kZUltYWdlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29k ZXJzLmg6CisKIDIwMTEtMDYtMTUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCShyZXZpc2lvbiA4ODk2 NykKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTgsNyArMTE4LDcgQEAgYm9vbCBBcmd1bWVudENvZGVyPEF1dGhl bnRpY2F0aW9uQ2hhbGxlbgogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKGVycm9yKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIAotICAgIGNoYWxsZW5nZSA9IFdlYkNvcmU6OkF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlKHByb3RlY3Rpb25TcGFjZSwgcHJvcG9zZWRDcmVkZW50aWFsLCBwcmV2 aW91c0ZhaWx1cmVDb3VudCwgZmFpbHVyZVJlc3BvbnNlLCBlcnJvcik7CisgICAgY2hhbGxlbmdl ID0gQXV0aGVudGljYXRpb25DaGFsbGVuZ2UocHJvdGVjdGlvblNwYWNlLCBwcm9wb3NlZENyZWRl bnRpYWwsIHByZXZpb3VzRmFpbHVyZUNvdW50LCBmYWlsdXJlUmVzcG9uc2UsIGVycm9yKTsKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTU0LDI1ICsxNTQsNDcgQEAgYm9vbCBBcmd1bWVudENv ZGVyPFByb3RlY3Rpb25TcGFjZT46OmRlYwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlRW51bShh dXRoZW50aWNhdGlvblNjaGVtZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHNwYWNl ID0gV2ViQ29yZTo6UHJvdGVjdGlvblNwYWNlKGhvc3QsIHBvcnQsIHNlcnZlclR5cGUsIHJlYWxt LCBhdXRoZW50aWNhdGlvblNjaGVtZSk7CisgICAgc3BhY2UgPSBQcm90ZWN0aW9uU3BhY2UoaG9z dCwgcG9ydCwgc2VydmVyVHlwZSwgcmVhbG0sIGF1dGhlbnRpY2F0aW9uU2NoZW1lKTsKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIAotLy8gRm9yIG5vdywgdGhlc2UgYXJlIENHLW9ubHkuIE9uY2Ugb3Ro ZXIgcGxhdGZvcm1zIGhhdmUgY3JlYXRlSW1hZ2UgZnVuY3Rpb25zLAotLy8gd2UgY2FuIGNvbXBp bGUgdGhlc2UgZm9yIG5vbi1DRyBidWlsZHMuCi0jaWYgVVNFKENHKQordm9pZCBBcmd1bWVudENv ZGVyPENyZWRlbnRpYWw+OjplbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBjb25zdCBD cmVkZW50aWFsJiBjcmVkZW50aWFsKQoreworICAgIGVuY29kZXItPmVuY29kZShjcmVkZW50aWFs LnVzZXIoKSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKGNyZWRlbnRpYWwucGFzc3dvcmQoKSk7Cisg ICAgZW5jb2Rlci0+ZW5jb2RlRW51bShjcmVkZW50aWFsLnBlcnNpc3RlbmNlKCkpOworfQorCiti b29sIEFyZ3VtZW50Q29kZXI8Q3JlZGVudGlhbD46OmRlY29kZShBcmd1bWVudERlY29kZXIqIGRl Y29kZXIsIENyZWRlbnRpYWwmIGNyZWRlbnRpYWwpCit7CisgICAgU3RyaW5nIHVzZXI7CisgICAg aWYgKCFkZWNvZGVyLT5kZWNvZGUodXNlcikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg IFN0cmluZyBwYXNzd29yZDsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShwYXNzd29yZCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIENyZWRlbnRpYWxQZXJzaXN0ZW5jZSBwZXJzaXN0 ZW5jZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZUVudW0ocGVyc2lzdGVuY2UpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgCisgICAgY3JlZGVudGlhbCA9IENyZWRlbnRpYWwodXNlciwg cGFzc3dvcmQsIHBlcnNpc3RlbmNlKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KIAotdm9pZCBlbmNv ZGVJbWFnZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIEltYWdlKiBpbWFnZSkKK3N0YXRpYyB2 b2lkIGVuY29kZUltYWdlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgSW1hZ2UqIGltYWdlKQog ewogICAgIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGJpdG1hcCA9IFNoYXJlYWJsZUJpdG1hcDo6 Y3JlYXRlU2hhcmVhYmxlKGltYWdlLT5zaXplKCksIFNoYXJlYWJsZUJpdG1hcDo6U3VwcG9ydHNB bHBoYSk7CiAgICAgYml0bWFwLT5jcmVhdGVHcmFwaGljc0NvbnRleHQoKS0+ZHJhd0ltYWdlKGlt YWdlLCBDb2xvclNwYWNlRGV2aWNlUkdCLCBJbnRQb2ludCgpKTsKKwogICAgIFNoYXJlYWJsZUJp dG1hcDo6SGFuZGxlIGhhbmRsZTsKICAgICBiaXRtYXAtPmNyZWF0ZUhhbmRsZShoYW5kbGUpOwog CiAgICAgZW5jb2Rlci0+ZW5jb2RlKGhhbmRsZSk7CiB9CiAKLWJvb2wgZGVjb2RlSW1hZ2UoQXJn dW1lbnREZWNvZGVyKiBkZWNvZGVyLCBSZWZQdHI8SW1hZ2U+JiBpbWFnZSkKK3N0YXRpYyBib29s IGRlY29kZUltYWdlKEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgUmVmUHRyPEltYWdlPiYgaW1h Z2UpCiB7CiAgICAgU2hhcmVhYmxlQml0bWFwOjpIYW5kbGUgaGFuZGxlOwogICAgIGlmICghZGVj b2Rlci0+ZGVjb2RlKGhhbmRsZSkpCkBAIC0xODYsNyArMjA4LDEzNiBAQCBib29sIGRlY29kZUlt YWdlKEFyZ3VtZW50RGVjb2RlciogZGVjb2RlCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KLSAgICAKLSNlbmRpZgogCisjaWYgVVNFKExBWllfTkFUSVZFX0NVUlNP UikKK3ZvaWQgQXJndW1lbnRDb2RlcjxDdXJzb3I+OjplbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBl bmNvZGVyLCBjb25zdCBDdXJzb3ImIGN1cnNvcikKK3sKKyAgICBlbmNvZGVyLT5lbmNvZGVFbnVt KGN1cnNvci50eXBlKCkpOworICAgICAgICAKKyAgICBpZiAoY3Vyc29yLnR5cGUoKSAhPSBDdXJz b3I6OkN1c3RvbSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZW5jb2RlSW1hZ2UoZW5jb2Rlciwg Y3Vyc29yLmltYWdlKCkpOworICAgIGVuY29kZXItPmVuY29kZShjdXJzb3IuaG90U3BvdCgpKTsK K30KKworYm9vbCBBcmd1bWVudENvZGVyPEN1cnNvcj46OmRlY29kZShBcmd1bWVudERlY29kZXIq IGRlY29kZXIsIEN1cnNvciYgY3Vyc29yKQoreworICAgIEN1cnNvcjo6VHlwZSB0eXBlOworICAg IGlmICghZGVjb2Rlci0+ZGVjb2RlRW51bSh0eXBlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgaWYgKHR5cGUgPiBDdXJzb3I6OkN1c3RvbSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgaWYgKHR5cGUgIT0gQ3Vyc29yOjpDdXN0b20pIHsKKyAgICAgICAgY3Vyc29yID0gQ3Vy c29yOjpmcm9tVHlwZSh0eXBlKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAg UmVmUHRyPEltYWdlPiBpbWFnZTsKKyAgICBpZiAoIWRlY29kZUltYWdlKGRlY29kZXIsIGltYWdl KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgSW50UG9pbnQgaG90U3BvdDsKKyAgICBp ZiAoIWRlY29kZXItPmRlY29kZShob3RTcG90KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgaWYgKCFpbWFnZS0+cmVjdCgpLmNvbnRhaW5zKGhvdFNwb3QpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBjdXJzb3IgPSBDdXJzb3IoaW1hZ2UuZ2V0KCksIGhvdFNwb3QpOworICAg IHJldHVybiB0cnVlOworfQorI2VuZGlmIC8vIFVTRShMQVpZX05BVElWRV9DVVJTT1IpCisKKwor dm9pZCBBcmd1bWVudENvZGVyPFdpbmRvd0ZlYXR1cmVzPjo6ZW5jb2RlKEFyZ3VtZW50RW5jb2Rl ciogZW5jb2RlciwgY29uc3QgV2luZG93RmVhdHVyZXMmIHdpbmRvd0ZlYXR1cmVzKQoreworICAg IGVuY29kZXItPmVuY29kZSh3aW5kb3dGZWF0dXJlcy54KTsKKyAgICBlbmNvZGVyLT5lbmNvZGUo d2luZG93RmVhdHVyZXMueSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKHdpbmRvd0ZlYXR1cmVzLndp ZHRoKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUod2luZG93RmVhdHVyZXMuaGVpZ2h0KTsKKyAgICBl bmNvZGVyLT5lbmNvZGUod2luZG93RmVhdHVyZXMueFNldCk7CisgICAgZW5jb2Rlci0+ZW5jb2Rl KHdpbmRvd0ZlYXR1cmVzLnlTZXQpOworICAgIGVuY29kZXItPmVuY29kZSh3aW5kb3dGZWF0dXJl cy53aWR0aFNldCk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKHdpbmRvd0ZlYXR1cmVzLmhlaWdodFNl dCk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKHdpbmRvd0ZlYXR1cmVzLm1lbnVCYXJWaXNpYmxlKTsK KyAgICBlbmNvZGVyLT5lbmNvZGUod2luZG93RmVhdHVyZXMuc3RhdHVzQmFyVmlzaWJsZSk7Cisg ICAgZW5jb2Rlci0+ZW5jb2RlKHdpbmRvd0ZlYXR1cmVzLnRvb2xCYXJWaXNpYmxlKTsKKyAgICBl bmNvZGVyLT5lbmNvZGUod2luZG93RmVhdHVyZXMubG9jYXRpb25CYXJWaXNpYmxlKTsKKyAgICBl bmNvZGVyLT5lbmNvZGUod2luZG93RmVhdHVyZXMuc2Nyb2xsYmFyc1Zpc2libGUpOworICAgIGVu Y29kZXItPmVuY29kZSh3aW5kb3dGZWF0dXJlcy5yZXNpemFibGUpOworICAgIGVuY29kZXItPmVu Y29kZSh3aW5kb3dGZWF0dXJlcy5mdWxsc2NyZWVuKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUod2lu ZG93RmVhdHVyZXMuZGlhbG9nKTsKK30KKworYm9vbCBBcmd1bWVudENvZGVyPFdpbmRvd0ZlYXR1 cmVzPjo6ZGVjb2RlKEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgV2luZG93RmVhdHVyZXMmIHdp bmRvd0ZlYXR1cmVzKQoreworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHdpbmRvd0ZlYXR1cmVz LngpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUod2lu ZG93RmVhdHVyZXMueSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXIt PmRlY29kZSh3aW5kb3dGZWF0dXJlcy53aWR0aCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5kb3dGZWF0dXJlcy5oZWlnaHQpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUod2luZG93RmVhdHVyZXMueFNl dCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5k b3dGZWF0dXJlcy55U2V0KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rl ci0+ZGVjb2RlKHdpbmRvd0ZlYXR1cmVzLndpZHRoU2V0KSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHdpbmRvd0ZlYXR1cmVzLmhlaWdodFNldCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5kb3dGZWF0 dXJlcy5tZW51QmFyVmlzaWJsZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRl Y29kZXItPmRlY29kZSh3aW5kb3dGZWF0dXJlcy5zdGF0dXNCYXJWaXNpYmxlKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHdpbmRvd0ZlYXR1cmVzLnRv b2xCYXJWaXNpYmxlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci0+ ZGVjb2RlKHdpbmRvd0ZlYXR1cmVzLmxvY2F0aW9uQmFyVmlzaWJsZSkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5kb3dGZWF0dXJlcy5zY3JvbGxi YXJzVmlzaWJsZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRl Y29kZSh3aW5kb3dGZWF0dXJlcy5yZXNpemFibGUpKQorICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUod2luZG93RmVhdHVyZXMuZnVsbHNjcmVlbikpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5kb3dGZWF0dXJl cy5kaWFsb2cpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7CiB9CisK Kwordm9pZCBBcmd1bWVudENvZGVyPENvbG9yPjo6ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5j b2RlciwgY29uc3QgQ29sb3ImIGNvbG9yKQoreworICAgIGlmICghY29sb3IuaXNWYWxpZCgpKSB7 CisgICAgICAgIGVuY29kZXItPmVuY29kZUJvb2woZmFsc2UpOworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgZW5jb2Rlci0+ZW5jb2RlQm9vbCh0cnVlKTsKKyAgICBlbmNvZGVyLT5lbmNv ZGUoY29sb3IucmdiKCkpOworfQorCitib29sIEFyZ3VtZW50Q29kZXI8Q29sb3I+OjpkZWNvZGUo QXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBDb2xvciYgY29sb3IpCit7CisgICAgYm9vbCBpc1Zh bGlkOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKGlzVmFsaWQpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBpZiAoIWlzVmFsaWQpIHsKKyAgICAgICAgY29sb3IgPSBDb2xvcigpOwor ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBSR0JBMzIgcmdiYTsKKyAgICBpZiAo IWRlY29kZXItPmRlY29kZShyZ2JhKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgY29s b3IgPSBDb2xvcihyZ2JhKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworfSAvLyBuYW1lc3BhY2Ug Q29yZUlQQwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVy cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRD b2RlcnMuaAkocmV2aXNpb24gODg5NjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29y ZUFyZ3VtZW50Q29kZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTExOSw4MiArMTE5LDE1IEBAIHRl bXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZToKIH07CiAKIHRlbXBsYXRlPD4g c3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Q3JlZGVudGlhbD4gewotICAgIHN0YXRpYyB2 b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IFdlYkNvcmU6OkNyZWRl bnRpYWwmIGNyZWRlbnRpYWwpCi0gICAgewotICAgICAgICBlbmNvZGVyLT5lbmNvZGUoQ29yZUlQ Qzo6SW4oY3JlZGVudGlhbC51c2VyKCksIGNyZWRlbnRpYWwucGFzc3dvcmQoKSwgc3RhdGljX2Nh c3Q8dWludDMyX3Q+KGNyZWRlbnRpYWwucGVyc2lzdGVuY2UoKSkpKTsKLSAgICB9Ci0KLSAgICBz dGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3JlOjpDcmVk ZW50aWFsJiBjcmVkZW50aWFsKQotICAgIHsKLSAgICAgICAgU3RyaW5nIHVzZXI7Ci0gICAgICAg IFN0cmluZyBwYXNzd29yZDsKLSAgICAgICAgaW50IHBlcnNpc3RlbmNlOwotICAgICAgICBpZiAo IWRlY29kZXItPmRlY29kZShDb3JlSVBDOjpPdXQodXNlciwgcGFzc3dvcmQsIHBlcnNpc3RlbmNl KSkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIAotICAgICAgICBjcmVkZW50 aWFsID0gV2ViQ29yZTo6Q3JlZGVudGlhbCh1c2VyLCBwYXNzd29yZCwgc3RhdGljX2Nhc3Q8V2Vi Q29yZTo6Q3JlZGVudGlhbFBlcnNpc3RlbmNlPihwZXJzaXN0ZW5jZSkpOwotICAgICAgICByZXR1 cm4gdHJ1ZTsKLSAgICB9CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2Rlcios IGNvbnN0IFdlYkNvcmU6OkNyZWRlbnRpYWwmKTsKKyAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQXJn dW1lbnREZWNvZGVyKiwgV2ViQ29yZTo6Q3JlZGVudGlhbCYpOwogfTsKIAogI2lmIFVTRShMQVpZ X05BVElWRV9DVVJTT1IpCi0KLXZvaWQgZW5jb2RlSW1hZ2UoQXJndW1lbnRFbmNvZGVyKiwgV2Vi Q29yZTo6SW1hZ2UqKTsKLWJvb2wgZGVjb2RlSW1hZ2UoQXJndW1lbnREZWNvZGVyKiwgUmVmUHRy PFdlYkNvcmU6OkltYWdlPiYpOwotCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdl YkNvcmU6OkN1cnNvcj4gewotICAgIHN0YXRpYyB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIq IGVuY29kZXIsIGNvbnN0IFdlYkNvcmU6OkN1cnNvciYgY3Vyc29yKQotICAgIHsKLSAgICAgICAg V2ViQ29yZTo6Q3Vyc29yOjpUeXBlIHR5cGUgPSBjdXJzb3IudHlwZSgpOwotI2lmICFVU0UoQ0cp Ci0gICAgICAgIC8vIEZJWE1FOiBDdXJyZW50bHkgd2Ugb25seSBoYXZlIHRoZSBjcmVhdGVJbWFn ZSBmdW5jdGlvbiBpbXBsZW1lbnRlZCBmb3IgQ0cuCi0gICAgICAgIC8vIE9uY2Ugd2UgaW1wbGVt ZW50IGl0IGZvciBvdGhlciBwbGF0Zm9ybXMgd2UgY2FuIHJlbW92ZSB0aGlzIGNvbmRpdGlvbmFs LAotICAgICAgICAvLyBhbmQgdGhlIG90aGVyIGNvbmRpdGlvbmFscyBiZWxvdyBhbmQgaW4gV2Vi Q29yZUFyZ3VtZW50Q29kZXJzLmNwcC4KLSAgICAgICAgaWYgKHR5cGUgPT0gV2ViQ29yZTo6Q3Vy c29yOjpDdXN0b20pCi0gICAgICAgICAgICB0eXBlID0gV2ViQ29yZTo6Q3Vyc29yOjpQb2ludGVy OwotI2VuZGlmCi0gICAgICAgIGVuY29kZXItPmVuY29kZShzdGF0aWNfY2FzdDx1aW50MzJfdD4o dHlwZSkpOwotI2lmIFVTRShDRykKLSAgICAgICAgaWYgKHR5cGUgIT0gV2ViQ29yZTo6Q3Vyc29y OjpDdXN0b20pCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgZW5jb2RlSW1hZ2UoZW5j b2RlciwgY3Vyc29yLmltYWdlKCkpOwotICAgICAgICBlbmNvZGVyLT5lbmNvZGUoY3Vyc29yLmhv dFNwb3QoKSk7Ci0jZW5kaWYKLSAgICB9Ci0gICAgCi0gICAgc3RhdGljIGJvb2wgZGVjb2RlKEFy Z3VtZW50RGVjb2RlciogZGVjb2RlciwgV2ViQ29yZTo6Q3Vyc29yJiBjdXJzb3IpCi0gICAgewot ICAgICAgICB1aW50MzJfdCB0eXBlSW50OwotICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZSh0 eXBlSW50KSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKHR5cGVJbnQg PiBXZWJDb3JlOjpDdXJzb3I6OkN1c3RvbSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICAgICAgV2ViQ29yZTo6Q3Vyc29yOjpUeXBlIHR5cGUgPSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpD dXJzb3I6OlR5cGU+KHR5cGVJbnQpOwotCi0gICAgICAgIGlmICh0eXBlICE9IFdlYkNvcmU6OkN1 cnNvcjo6Q3VzdG9tKSB7Ci0gICAgICAgICAgICBjdXJzb3IgPSBXZWJDb3JlOjpDdXJzb3I6OmZy b21UeXBlKHR5cGUpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLQotI2lm ICFVU0UoQ0cpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSNlbHNlCi0gICAgICAgIFJlZlB0cjxX ZWJDb3JlOjpJbWFnZT4gaW1hZ2U7Ci0gICAgICAgIGlmICghZGVjb2RlSW1hZ2UoZGVjb2Rlciwg aW1hZ2UpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBXZWJDb3JlOjpJbnRQ b2ludCBob3RTcG90OwotICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZShob3RTcG90KSkKLSAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKCFpbWFnZS0+cmVjdCgpLmNvbnRh aW5zKFdlYkNvcmU6OkludFJlY3QoaG90U3BvdCwgV2ViQ29yZTo6SW50U2l6ZSgpKSkpCi0gICAg ICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAgY3Vyc29yID0gV2ViQ29yZTo6Q3Vyc29y KGltYWdlLmdldCgpLCBob3RTcG90KTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0jZW5kaWYKLSAg ICB9CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciosIGNvbnN0IFdlYkNv cmU6OkN1cnNvciYpOworICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqLCBX ZWJDb3JlOjpDdXJzb3ImKTsKIH07Ci0KICNlbmRpZgogCiAvLyBUaGVzZSB0d28gZnVuY3Rpb25z IGFyZSBpbXBsZW1lbnRlZCBpbiBhIHBsYXRmb3JtIHNwZWNpZmljIG1hbm5lci4KQEAgLTI0Niw5 NCArMTc5LDEzIEBAIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZToKIH07 CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6V2luZG93RmVhdHVy ZXM+IHsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBj b25zdCBXZWJDb3JlOjpXaW5kb3dGZWF0dXJlcyYgd2luZG93RmVhdHVyZXMpCi0gICAgewotICAg ICAgICBlbmNvZGVyLT5lbmNvZGUod2luZG93RmVhdHVyZXMueCk7Ci0gICAgICAgIGVuY29kZXIt PmVuY29kZSh3aW5kb3dGZWF0dXJlcy55KTsKLSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKHdpbmRv d0ZlYXR1cmVzLndpZHRoKTsKLSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKHdpbmRvd0ZlYXR1cmVz LmhlaWdodCk7Ci0gICAgICAgIGVuY29kZXItPmVuY29kZSh3aW5kb3dGZWF0dXJlcy54U2V0KTsK LSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKHdpbmRvd0ZlYXR1cmVzLnlTZXQpOwotICAgICAgICBl bmNvZGVyLT5lbmNvZGUod2luZG93RmVhdHVyZXMud2lkdGhTZXQpOwotICAgICAgICBlbmNvZGVy LT5lbmNvZGUod2luZG93RmVhdHVyZXMuaGVpZ2h0U2V0KTsKLSAgICAgICAgZW5jb2Rlci0+ZW5j b2RlKHdpbmRvd0ZlYXR1cmVzLm1lbnVCYXJWaXNpYmxlKTsKLSAgICAgICAgZW5jb2Rlci0+ZW5j b2RlKHdpbmRvd0ZlYXR1cmVzLnN0YXR1c0JhclZpc2libGUpOwotICAgICAgICBlbmNvZGVyLT5l bmNvZGUod2luZG93RmVhdHVyZXMudG9vbEJhclZpc2libGUpOwotICAgICAgICBlbmNvZGVyLT5l bmNvZGUod2luZG93RmVhdHVyZXMubG9jYXRpb25CYXJWaXNpYmxlKTsKLSAgICAgICAgZW5jb2Rl ci0+ZW5jb2RlKHdpbmRvd0ZlYXR1cmVzLnNjcm9sbGJhcnNWaXNpYmxlKTsKLSAgICAgICAgZW5j b2Rlci0+ZW5jb2RlKHdpbmRvd0ZlYXR1cmVzLnJlc2l6YWJsZSk7Ci0gICAgICAgIGVuY29kZXIt PmVuY29kZSh3aW5kb3dGZWF0dXJlcy5mdWxsc2NyZWVuKTsKLSAgICAgICAgZW5jb2Rlci0+ZW5j b2RlKHdpbmRvd0ZlYXR1cmVzLmRpYWxvZyk7Ci0gICAgfQotICAgIAotICAgIHN0YXRpYyBib29s IGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVz JiB3aW5kb3dGZWF0dXJlcykKLSAgICB7Ci0gICAgICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHdp bmRvd0ZlYXR1cmVzLngpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAo IWRlY29kZXItPmRlY29kZSh3aW5kb3dGZWF0dXJlcy55KSkKLSAgICAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUod2luZG93RmVhdHVyZXMud2lkdGgp KQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoIWRlY29kZXItPmRlY29k ZSh3aW5kb3dGZWF0dXJlcy5oZWlnaHQpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg ICAgICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5kb3dGZWF0dXJlcy54U2V0KSkKLSAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUod2luZG93RmVh dHVyZXMueVNldCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGlmICghZGVj b2Rlci0+ZGVjb2RlKHdpbmRvd0ZlYXR1cmVzLndpZHRoU2V0KSkKLSAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUod2luZG93RmVhdHVyZXMuaGVp Z2h0U2V0KSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKCFkZWNvZGVy LT5kZWNvZGUod2luZG93RmVhdHVyZXMubWVudUJhclZpc2libGUpKQotICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5kb3dGZWF0dXJlcy5z dGF0dXNCYXJWaXNpYmxlKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYg KCFkZWNvZGVyLT5kZWNvZGUod2luZG93RmVhdHVyZXMudG9vbEJhclZpc2libGUpKQotICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5kb3dG ZWF0dXJlcy5sb2NhdGlvbkJhclZpc2libGUpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZSh3aW5kb3dGZWF0dXJlcy5zY3JvbGxiYXJzVmlz aWJsZSkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGlmICghZGVjb2Rlci0+ ZGVjb2RlKHdpbmRvd0ZlYXR1cmVzLnJlc2l6YWJsZSkpCi0gICAgICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHdpbmRvd0ZlYXR1cmVzLmZ1bGxzY3Jl ZW4pKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoIWRlY29kZXItPmRl Y29kZSh3aW5kb3dGZWF0dXJlcy5kaWFsb2cpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3Vt ZW50RW5jb2RlciosIGNvbnN0IFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVzJik7CisgICAgc3RhdGlj IGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciosIFdlYkNvcmU6OldpbmRvd0ZlYXR1cmVzJik7 CiB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkNvbG9yPiB7 Ci0gICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgY29uc3Qg V2ViQ29yZTo6Q29sb3ImIGNvbG9yKQotICAgIHsKLSAgICAgICAgaWYgKCFjb2xvci5pc1ZhbGlk KCkpIHsKLSAgICAgICAgICAgIGVuY29kZXItPmVuY29kZUJvb2woZmFsc2UpOwotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlQm9vbCh0cnVl KTsKLSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKGNvbG9yLnJnYigpKTsKLSAgICB9Ci0KLSAgICBz dGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3JlOjpDb2xv ciYgY29sb3IpCi0gICAgewotICAgICAgICBib29sIGlzVmFsaWQ7Ci0gICAgICAgIGlmICghZGVj b2Rlci0+ZGVjb2RlKGlzVmFsaWQpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAg ICAgIGlmICghaXNWYWxpZCkgewotICAgICAgICAgICAgY29sb3IgPSBXZWJDb3JlOjpDb2xvcigp OwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLQotICAgICAgICBXZWJDb3Jl OjpSR0JBMzIgcmdiYTsKLSAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocmdiYSkpCi0gICAg ICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAgY29sb3IgPSBXZWJDb3JlOjpDb2xvcihy Z2JhKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQorICAgIHN0YXRpYyB2b2lkIGVuY29k ZShBcmd1bWVudEVuY29kZXIqLCBjb25zdCBXZWJDb3JlOjpDb2xvciYpOworICAgIHN0YXRpYyBi b29sIGRlY29kZShBcmd1bWVudERlY29kZXIqLCBXZWJDb3JlOjpDb2xvciYpOwogfTsKIAogI2lm IFBMQVRGT1JNKE1BQykK