62676 2011-06-14 16:19:35 -0700 Start using the new encode/decode functions 2011-06-14 16:25:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 420815 0 andersca 2011-06-14 16:19:35 -0700 Start using the new encode/decode functions 420819 1 97184 andersca 2011-06-14 16:23:04 -0700 Created attachment 97184 Patch 420823 2 andersca 2011-06-14 16:25:49 -0700 Committed r88870: <http://trac.webkit.org/changeset/88870> 97184 2011-06-14 16:23:04 -0700 2011-06-14 16:24:31 -0700 Patch bug-62676-20110614162303.patch text/plain 11781 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4ODY5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDggQEAKKzIwMTEtMDYtMTQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTdGFydCB1c2luZyB0aGUgbmV3IGVuY29kZS9kZWNvZGUg ZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MjY3NgorCisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9EYXRhUmVmZXJlbmNlLmNwcDoK KyAgICAgICAgKENvcmVJUEM6OkRhdGFSZWZlcmVuY2U6OmVuY29kZSk6CisgICAgICAgIFVzZSBl bmNvZGVWYXJpYWJsZUxlbmd0aEJ5dGVBcnJheS4KKworICAgICAgICAqIFNoYXJlZC9Vc2VyTWVz c2FnZUNvZGVycy5oOgorICAgICAgICAoV2ViS2l0OjpVc2VyTWVzc2FnZUVuY29kZXI6OmJhc2VF bmNvZGUpOgorICAgICAgICBVc2UgZW5jb2RlVmFyaWFibGVMZW5ndGhCeXRlQXJyYXkgYW5kIHRo ZSBuZXcgZGF0YVJlZmVyZW5jZSBhY2Nlc3NvcnMuCisKKyAgICAgICAgKFdlYktpdDo6VXNlck1l c3NhZ2VEZWNvZGVyOjpiYXNlRGVjb2RlKToKKyAgICAgICAgVXNlIGRlY29kZVZhcmlhYmxlTGVu Z3RoQnl0ZUFycmF5LgorIAorICAgICAgICAqIFNoYXJlZC9XZWJEYXRhLmg6CisgICAgICAgIChX ZWJLaXQ6OldlYkRhdGE6OmRhdGFSZWZlcmVuY2UpOgorICAgICAgICBSZXR1cm4gYSByZWZlcmVu Y2UgdG8gdGhlIGRhdGEuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViU2VyaWFsaXplZFNjcmlwdFZh bHVlLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGF0YVJl ZmVyZW5jZSk6CisgICAgICAgIERpdHRvLgorCisgICAgICAgICogU2hhcmVkL2NmL0FyZ3VtZW50 Q29kZXJzQ0YuY3BwOgorICAgICAgICAoQ29yZUlQQzo6ZW5jb2RlKToKKyAgICAgICAgVXNlIGVu Y29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5LgorCisgICAgICAgICogU2hhcmVkL21hYy9TYW5k Ym94RXh0ZW5zaW9uTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGU6OmVuY29kZSk6CisgICAgICAgIFVzZSBlbmNvZGVWYXJpYWJsZUxlbmd0aEJ5dGVBcnJh eS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EZWNvZGVyQWRhcHRlci5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkRlY29kZXJBZGFwdGVyOjpkZWNvZGVCeXRlcyk6CisgICAgICAgIFVz ZSBkZWNvZGVWYXJpYWJsZUxlbmd0aEJ5dGVBcnJheS4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9FbmNvZGVyQWRhcHRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkVuY29kZXJBZGFw dGVyOjpkYXRhUmVmZXJlbmNlKToKKyAgICAgICAgUmVuYW1lIGRhdGEoKSB0byBkYXRhUmVmZXJl bmNlKCkgdG8gaW5kaWNhdGUgdGhhdCBpdCByZXR1cm5zIGEgcmVmZXJlbmNlIHRvIHRoZSBkYXRh LgorCisgICAgICAgIChXZWJLaXQ6OkVuY29kZXJBZGFwdGVyOjplbmNvZGVCeXRlcyk6CisgICAg ICAgIFVzZSBlbmNvZGVWYXJpYWJsZUxlbmd0aEJ5dGVBcnJheS4KKwogMjAxMS0wNi0xNCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0RhdGFS ZWZlcmVuY2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJ UEMvRGF0YVJlZmVyZW5jZS5jcHAJKHJldmlzaW9uIDg4ODY5KQorKysgU291cmNlL1dlYktpdDIv UGxhdGZvcm0vQ29yZUlQQy9EYXRhUmVmZXJlbmNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMs NyArMzMsNyBAQCBuYW1lc3BhY2UgQ29yZUlQQyB7CiAKIHZvaWQgRGF0YVJlZmVyZW5jZTo6ZW5j b2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlcikgY29uc3QKIHsKLSAgICBlbmNvZGVyLT5lbmNv ZGVCeXRlcyhtX2RhdGEsIG1fc2l6ZSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlVmFyaWFibGVMZW5n dGhCeXRlQXJyYXkoKnRoaXMpOwogfQogCiBib29sIERhdGFSZWZlcmVuY2U6OmRlY29kZShBcmd1 bWVudERlY29kZXIqIGRlY29kZXIsIERhdGFSZWZlcmVuY2UmIGRhdGFSZWZlcmVuY2UpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaAkocmV2aXNpb24gODg4 NTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaW5jbHVkZSAiQXJndW1lbnREZWNvZGVyLmgi CiAjaW5jbHVkZSAiQXJndW1lbnRFbmNvZGVyLmgiCisjaW5jbHVkZSAiRGF0YVJlZmVyZW5jZS5o IgogI2luY2x1ZGUgIkltbXV0YWJsZUFycmF5LmgiCiAjaW5jbHVkZSAiSW1tdXRhYmxlRGljdGlv bmFyeS5oIgogI2luY2x1ZGUgIlNoYXJlYWJsZUJpdG1hcC5oIgpAQCAtOTcsNyArOTgsNyBAQCBw dWJsaWM6CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBBUElPYmplY3Q6OlR5cGVTZXJpYWxpemVk U2NyaXB0VmFsdWU6IHsKICAgICAgICAgICAgIFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogc2Ny aXB0VmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJTZXJpYWxpemVkU2NyaXB0VmFsdWUqPihtX3Jvb3Qp OwotICAgICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlQnl0ZXMoc2NyaXB0VmFsdWUtPmRhdGEoKS5k YXRhKCksIHNjcmlwdFZhbHVlLT5kYXRhKCkuc2l6ZSgpKTsKKyAgICAgICAgICAgIGVuY29kZXIt PmVuY29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5KHNjcmlwdFZhbHVlLT5kYXRhUmVmZXJlbmNl KCkpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBB UElPYmplY3Q6OlR5cGVEb3VibGU6IHsKQEAgLTE0Myw3ICsxNDQsNyBAQCBwdWJsaWM6CiAgICAg ICAgIH0KICAgICAgICAgY2FzZSBBUElPYmplY3Q6OlR5cGVEYXRhOiB7CiAgICAgICAgICAgICBX ZWJEYXRhKiBkYXRhID0gc3RhdGljX2Nhc3Q8V2ViRGF0YSo+KG1fcm9vdCk7Ci0gICAgICAgICAg ICBlbmNvZGVyLT5lbmNvZGVCeXRlcyhkYXRhLT5ieXRlcygpLCBkYXRhLT5zaXplKCkpOworICAg ICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlVmFyaWFibGVMZW5ndGhCeXRlQXJyYXkoZGF0YS0+ZGF0 YVJlZmVyZW5jZSgpKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAg ICAgIGNhc2UgQVBJT2JqZWN0OjpUeXBlQ2VydGlmaWNhdGVJbmZvOiB7CkBAIC0yNDMsMTAgKzI0 NCwxMiBAQCBwdWJsaWM6CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBj YXNlIEFQSU9iamVjdDo6VHlwZVNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTogewotICAgICAgICAgICAg VmVjdG9yPHVpbnQ4X3Q+IGJ1ZmZlcjsKLSAgICAgICAgICAgIGlmICghZGVjb2Rlci0+ZGVjb2Rl Qnl0ZXMoYnVmZmVyKSkKKyAgICAgICAgICAgIENvcmVJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YVJl ZmVyZW5jZTsKKyAgICAgICAgICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlVmFyaWFibGVMZW5ndGhC eXRlQXJyYXkoZGF0YVJlZmVyZW5jZSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgICAgICAgICAgY29kZXIubV9yb290ID0gV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlOjphZG9w dChidWZmZXIpOworICAgICAgICAgICAgCisgICAgICAgICAgICBWZWN0b3I8dWludDhfdD4gdmVj dG9yID0gZGF0YVJlZmVyZW5jZS52ZWN0b3IoKTsKKyAgICAgICAgICAgIGNvZGVyLm1fcm9vdCA9 IFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6YWRvcHQodmVjdG9yKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgQVBJT2JqZWN0OjpUeXBlRG91YmxlOiB7CkBA IC0zMDAsMTAgKzMwMywxMCBAQCBwdWJsaWM6CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICAgICAgfQogICAgICAgICBjYXNlIEFQSU9iamVjdDo6VHlwZURhdGE6IHsKLSAgICAgICAgICAg IFZlY3Rvcjx1aW50OF90PiBidWZmZXI7Ci0gICAgICAgICAgICBpZiAoIWRlY29kZXItPmRlY29k ZUJ5dGVzKGJ1ZmZlcikpCisgICAgICAgICAgICBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGFS ZWZlcmVuY2U7CisgICAgICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZVZhcmlhYmxlTGVuZ3Ro Qnl0ZUFycmF5KGRhdGFSZWZlcmVuY2UpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgICAgIGNvZGVyLm1fcm9vdCA9IFdlYkRhdGE6OmNyZWF0ZShidWZmZXIpOworICAg ICAgICAgICAgY29kZXIubV9yb290ID0gV2ViRGF0YTo6Y3JlYXRlKGRhdGFSZWZlcmVuY2UuZGF0 YSgpLCBkYXRhUmVmZXJlbmNlLnNpemUoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQogICAgICAgICBjYXNlIEFQSU9iamVjdDo6VHlwZUNlcnRpZmljYXRlSW5mbzogewpJbmRleDog U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkRhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViRGF0YS5oCShyZXZpc2lvbiA4ODg1OCkKKysrIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJEYXRhLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNkZWZp bmUgV2ViRGF0YV9oCiAKICNpbmNsdWRlICJBUElPYmplY3QuaCIKKyNpbmNsdWRlICJEYXRhUmVm ZXJlbmNlLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9y Lmg+CiAKQEAgLTcwLDYgKzcxLDggQEAgcHVibGljOgogICAgIGNvbnN0IHVuc2lnbmVkIGNoYXIq IGJ5dGVzKCkgY29uc3QgeyByZXR1cm4gbV9ieXRlczsgfQogICAgIHNpemVfdCBzaXplKCkgY29u c3QgeyByZXR1cm4gbV9zaXplOyB9CiAKKyAgICBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGFS ZWZlcmVuY2UoKSBjb25zdCB7IHJldHVybiBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlKG1fYnl0ZXMs IG1fc2l6ZSk7IH0KKwogcHJpdmF0ZToKICAgICBXZWJEYXRhKGNvbnN0IHVuc2lnbmVkIGNoYXIq IGJ5dGVzLCBzaXplX3Qgc2l6ZSwgRnJlZURhdGFGdW5jdGlvbiBmcmVlRGF0YUZ1bmN0aW9uLCBj b25zdCB2b2lkKiBjb250ZXh0KQogICAgICAgICA6IG1fYnl0ZXMoYnl0ZXMpCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oCShyZXZp c2lvbiA4ODg1OCkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJTZXJpYWxpemVkU2NyaXB0 VmFsdWUuaAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaW5jbHVkZSAiQVBJ T2JqZWN0LmgiCiAKKyNpbmNsdWRlICJEYXRhUmVmZXJlbmNlLmgiCiAjaW5jbHVkZSA8V2ViQ29y ZS9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAKQEAg LTU5LDggKzYwLDggQEAgcHVibGljOgogICAgIHsKICAgICAgICAgcmV0dXJuIG1fc2VyaWFsaXpl ZFNjcmlwdFZhbHVlLT5kZXNlcmlhbGl6ZShjb250ZXh0LCBleGNlcHRpb24pOwogICAgIH0KLSAg ICAKLSAgICBjb25zdCBWZWN0b3I8dWludDhfdD4mIGRhdGEoKSB7IHJldHVybiBtX3NlcmlhbGl6 ZWRTY3JpcHRWYWx1ZS0+ZGF0YSgpOyB9CisKKyAgICBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIGRh dGFSZWZlcmVuY2UoKSBjb25zdCB7IHJldHVybiBtX3NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS0+ZGF0 YSgpOyB9CiAKICAgICB2b2lkKiBpbnRlcm5hbFJlcHJlc2VudGF0aW9uKCkgeyByZXR1cm4gbV9z ZXJpYWxpemVkU2NyaXB0VmFsdWUuZ2V0KCk7IH0KIApJbmRleDogU291cmNlL1dlYktpdDIvU2hh cmVkL2NmL0FyZ3VtZW50Q29kZXJzQ0YuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9jZi9Bcmd1bWVudENvZGVyc0NGLmNwcAkocmV2aXNpb24gODg4NTgpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvY2YvQXJndW1lbnRDb2RlcnNDRi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI5MSw3ICsyOTEsNyBAQCB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIs IENGCiAgICAgQ0ZJbmRleCBsZW5ndGggPSBDRkRhdGFHZXRMZW5ndGgoZGF0YSk7CiAgICAgY29u c3QgVUludDgqIGJ5dGVQdHIgPSBDRkRhdGFHZXRCeXRlUHRyKGRhdGEpOwogCi0gICAgZW5jb2Rl ci0+ZW5jb2RlQnl0ZXMoYnl0ZVB0ciwgbGVuZ3RoKTsKKyAgICBlbmNvZGVyLT5lbmNvZGVWYXJp YWJsZUxlbmd0aEJ5dGVBcnJheShDb3JlSVBDOjpEYXRhUmVmZXJlbmNlKGJ5dGVQdHIsIGxlbmd0 aCkpOwogfQogCiBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFJldGFpblB0 cjxDRkRhdGFSZWY+JiByZXN1bHQpCkBAIC0zNzYsNyArMzc2LDcgQEAgdm9pZCBlbmNvZGUoQXJn dW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBDRgogICAgIEFTU0VSVF9VTlVTRUQocmVzdWx0LCByZXN1 bHQpOwogCiAgICAgZW5jb2Rlci0+ZW5jb2RlRW51bShudW1iZXJUeXBlKTsKLSAgICBlbmNvZGVy LT5lbmNvZGVCeXRlcyhidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKKyAgICBlbmNvZGVy LT5lbmNvZGVWYXJpYWJsZUxlbmd0aEJ5dGVBcnJheShidWZmZXIpOwogfQogCiBzdGF0aWMgc2l6 ZV90IHNpemVGb3JOdW1iZXJUeXBlKENGTnVtYmVyVHlwZSBudW1iZXJUeXBlKQpAQCAtNDY0LDcg KzQ2NCw3IEBAIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgQ0YKICAgICBB U1NFUlQobnVtQ29udmVydGVkQnl0ZXMgPT0gbGVuZ3RoKTsKIAogICAgIGVuY29kZXItPmVuY29k ZUVudW0oZW5jb2RpbmcpOwotICAgIGVuY29kZXItPmVuY29kZUJ5dGVzKGJ1ZmZlci5kYXRhKCks IGJ1ZmZlckxlbmd0aCk7CisgICAgZW5jb2Rlci0+ZW5jb2RlVmFyaWFibGVMZW5ndGhCeXRlQXJy YXkoYnVmZmVyKTsKIH0KIAogYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBS ZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+JiByZXN1bHQpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvbWFjL1NhbmRib3hFeHRlbnNpb25NYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvU2hhcmVkL21hYy9TYW5kYm94RXh0ZW5zaW9uTWFjLm1tCShyZXZpc2lvbiA4ODg2OSkKKysr IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2FuZGJveEV4dGVuc2lvbk1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNTYsNyArNTYsNyBAQCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU6On5IYW5k bGUoKQogdm9pZCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU6OmVuY29kZShDb3JlSVBDOjpBcmd1 bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3NhbmRib3hFeHRlbnNp b24pIHsKLSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlQnl0ZXMoMCwgMCk7CisgICAgICAgIGVuY29k ZXItPmVuY29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5KENvcmVJUEM6OkRhdGFSZWZlcmVuY2Uo KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTY0LDcgKzY0LDcgQEAgdm9pZCBTYW5k Ym94RXh0ZW5zaW9uOjpIYW5kbGU6OmVuY29kZShDbwogICAgIGNvbnN0IGNoYXIgKnNlcmlhbGl6 ZWRGb3JtYXQgPSBXS1NhbmRib3hFeHRlbnNpb25HZXRTZXJpYWxpemVkRm9ybWF0KG1fc2FuZGJv eEV4dGVuc2lvbiwgJmxlbmd0aCk7CiAgICAgQVNTRVJUKHNlcmlhbGl6ZWRGb3JtYXQpOwogCi0g ICAgZW5jb2Rlci0+ZW5jb2RlQnl0ZXMocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4o c2VyaWFsaXplZEZvcm1hdCksIGxlbmd0aCk7CisgICAgZW5jb2Rlci0+ZW5jb2RlVmFyaWFibGVM ZW5ndGhCeXRlQXJyYXkoQ29yZUlQQzo6RGF0YVJlZmVyZW5jZShyZWludGVycHJldF9jYXN0PGNv bnN0IHVpbnQ4X3QqPihzZXJpYWxpemVkRm9ybWF0KSwgbGVuZ3RoKSk7CiAKICAgICAvLyBFbmNv ZGluZyB3aWxsIGRlc3Ryb3kgdGhlIHNhbmRib3ggZXh0ZW5zaW9uIGxvY2FsbHkuCiAgICAgV0tT YW5kYm94RXh0ZW5zaW9uRGVzdHJveShtX3NhbmRib3hFeHRlbnNpb24pOwpJbmRleDogU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RlY29kZXJBZGFwdGVyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRGVjb2RlckFkYXB0ZXIuY3Bw CShyZXZpc2lvbiA4ODg1OCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9E ZWNvZGVyQWRhcHRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJEZWNvZGVyQWRhcHRlci5oIgogCisjaW5jbHVkZSAi RGF0YVJlZmVyZW5jZS5oIgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgogCiBu YW1lc3BhY2UgV2ViS2l0IHsKQEAgLTM3LDcgKzM4LDEyIEBAIERlY29kZXJBZGFwdGVyOjpEZWNv ZGVyQWRhcHRlcihjb25zdCB1aW4KIAogYm9vbCBEZWNvZGVyQWRhcHRlcjo6ZGVjb2RlQnl0ZXMo VmVjdG9yPHVpbnQ4X3Q+JiBieXRlcykKIHsKLSAgICByZXR1cm4gbV9kZWNvZGVyLmRlY29kZUJ5 dGVzKGJ5dGVzKTsKKyAgICBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGFSZWZlcmVuY2U7Cisg ICAgaWYgKCFtX2RlY29kZXIuZGVjb2RlVmFyaWFibGVMZW5ndGhCeXRlQXJyYXkoZGF0YVJlZmVy ZW5jZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGJ5dGVzID0gZGF0YVJlZmVyZW5j ZS52ZWN0b3IoKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogYm9vbCBEZWNvZGVyQWRhcHRlcjo6 ZGVjb2RlQm9vbChib29sJiB2YWx1ZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9FbmNvZGVyQWRhcHRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0VuY29kZXJBZGFwdGVyLmNwcAkocmV2aXNpb24gODg4NTgpCisr KyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRW5jb2RlckFkYXB0ZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNiwxNCArMzYsMTQgQEAgRW5jb2RlckFkYXB0ZXI6OkVuY29kZXJB ZGFwdGVyKCkKIHsKIH0KIAotQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSBFbmNvZGVyQWRhcHRlcjo6 ZGF0YSgpIGNvbnN0CitDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIEVuY29kZXJBZGFwdGVyOjpkYXRh UmVmZXJlbmNlKCkgY29uc3QKIHsKICAgICByZXR1cm4gQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSht X2VuY29kZXItPmJ1ZmZlcigpLCBtX2VuY29kZXItPmJ1ZmZlclNpemUoKSk7CiB9CiAKIHZvaWQg RW5jb2RlckFkYXB0ZXI6OmVuY29kZUJ5dGVzKGNvbnN0IHVpbnQ4X3QqIGJ5dGVzLCBzaXplX3Qg c2l6ZSkKIHsKLSAgICBtX2VuY29kZXItPmVuY29kZUJ5dGVzKGJ5dGVzLCBzaXplKTsKKyAgICBt X2VuY29kZXItPmVuY29kZVZhcmlhYmxlTGVuZ3RoQnl0ZUFycmF5KENvcmVJUEM6OkRhdGFSZWZl cmVuY2UoYnl0ZXMsIHNpemUpKTsKIH0KIAogdm9pZCBFbmNvZGVyQWRhcHRlcjo6ZW5jb2RlQm9v bChib29sIHZhbHVlKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Vu Y29kZXJBZGFwdGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0VuY29kZXJBZGFwdGVyLmgJKHJldmlzaW9uIDg4ODU4KQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0VuY29kZXJBZGFwdGVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTQxLDcgKzQxLDcgQEAgY2xhc3MgRW5jb2RlckFkYXB0ZXIgOiBwdWJsaWMgRW5jb2RlciB7CiBw dWJsaWM6CiAgICAgRW5jb2RlckFkYXB0ZXIoKTsKIAotICAgIENvcmVJUEM6OkRhdGFSZWZlcmVu Y2UgZGF0YSgpIGNvbnN0OworICAgIENvcmVJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YVJlZmVyZW5j ZSgpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBlbmNvZGVCeXRlcyhjb25z dCB1aW50OF90Kiwgc2l6ZV90KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJCYWNrRm9yd2FyZExpc3RQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkJhY2tGb3J3YXJkTGlzdFByb3h5LmNwcAkocmV2 aXNpb24gODg4NTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViQmFj a0ZvcndhcmRMaXN0UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OCw4ICs4OCw3IEBAIHN0 YXRpYyB2b2lkIHVwZGF0ZUJhY2tGb3J3YXJkSXRlbSh1aW50NjQKICAgICBFbmNvZGVyQWRhcHRl ciBlbmNvZGVyOwogICAgIGl0ZW0tPmVuY29kZUJhY2tGb3J3YXJkVHJlZShlbmNvZGVyKTsKIAot ICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2Vi UHJvY2Vzc1Byb3h5OjpBZGRCYWNrRm9yd2FyZEl0ZW0oaXRlbUlELAotICAgICAgICBpdGVtLT5v cmlnaW5hbFVSTFN0cmluZygpLCBpdGVtLT51cmxTdHJpbmcoKSwgaXRlbS0+dGl0bGUoKSwgZW5j b2Rlci5kYXRhKCkpLCAwKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCkt PnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6QWRkQmFja0ZvcndhcmRJdGVtKGl0ZW1J RCwgaXRlbS0+b3JpZ2luYWxVUkxTdHJpbmcoKSwgaXRlbS0+dXJsU3RyaW5nKCksIGl0ZW0tPnRp dGxlKCksIGVuY29kZXIuZGF0YVJlZmVyZW5jZSgpKSwgMCk7CiB9CiAKIHZvaWQgV2ViQmFja0Zv cndhcmRMaXN0UHJveHk6OmFkZEl0ZW1Gcm9tVUlQcm9jZXNzKHVpbnQ2NF90IGl0ZW1JRCwgUGFz c1JlZlB0cjxXZWJDb3JlOjpIaXN0b3J5SXRlbT4gcHJwSXRlbSkK