117891 2013-06-21 14:07:20 -0700 fourthTier: Merge r146932 and 146933 so that we can profile from DumpRenderTree 2013-06-21 15:44:31 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 902664 0 fpizlo 2013-06-21 14:07:20 -0700 Patch forthcoming. 902668 1 205215 fpizlo 2013-06-21 14:11:51 -0700 Created attachment 205215 the patch 902675 2 205215 mhahnenberg 2013-06-21 14:24:01 -0700 Comment on attachment 205215 the patch r=me 902692 3 fpizlo 2013-06-21 15:44:31 -0700 Landed in http://trac.webkit.org/changeset/151856 205215 2013-06-21 14:11:51 -0700 2013-06-21 14:24:01 -0700 the patch blah.patch text/plain 22276 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUxODU1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDEzLTA2LTIxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg Zm91cnRoVGllcjogTWVyZ2UgcjE0NjkzMiBhbmQgMTQ2OTMzIHNvIHRoYXQgd2UgY2FuIHByb2Zp bGUgZnJvbSBEdW1wUmVuZGVyVHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE3ODkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisgICAgICAgIAorICAgICAgICBNZXJnaW5nIHRoZSBKU0MgcGFydCBvZiB0aGVzZSBjaGFu Z2VzIHJlcXVpcmVkIGNyZWF0aW5nIGEgZnJlc2ggVk0gdG8gSlNPTmlmeQorICAgICAgICB0aGUg cHJvZmlsZXIgZGF0YWJhc2UsIGJlY2F1c2UgdGhhdCdzIHRoZSBvbmx5IHRydWx5IHNhZmUgd2F5 IHRvIGRvIGl0LiBUaGlzCisgICAgICAgIGlzIGJlY2F1c2Ugd2UgZG9uJ3QgcmVhbGx5IGtub3cg d2hlbiB0aGUgcHJvZmlsZXIgd291bGQgYmUgYXNrZWQgdG8gZHVtcCBKU09OLAorICAgICAgICBh bmQgd2UgbWlnaHQgYmUgaW4gdGhlIG1pZGRsZSBvZiBWTSBzaHV0ZG93bi4gVGhhdCdzIGEgYnVn IGluIHRoZSBUb1QgdmVyc2lvbgorICAgICAgICBvZiB0aGlzLCBidXQgd2UgZGlkbid0IGNhdGNo IGl0IGJlY2F1c2Ugd2UgZGlkbid0IGhhdmUgZW5vdWdoIGFzc2VydGlvbnMgdG8KKyAgICAgICAg dGhhdCBlZmZlY3QuCisKKyAgICAgICAgKiBqc2MuY3BwOgorICAgICAgICAoanNjbWFpbik6Cisg ICAgICAgICogcHJvZmlsZXIvUHJvZmlsZXJEYXRhYmFzZS5jcHA6CisgICAgICAgIChQcm9maWxl cik6CisgICAgICAgIChKU0M6OlByb2ZpbGVyOjpEYXRhYmFzZTo6RGF0YWJhc2UpOgorICAgICAg ICAoSlNDOjpQcm9maWxlcjo6RGF0YWJhc2U6On5EYXRhYmFzZSk6CisgICAgICAgIChKU0M6OlBy b2ZpbGVyOjpEYXRhYmFzZTo6dG9KU09OKToKKyAgICAgICAgKEpTQzo6UHJvZmlsZXI6OkRhdGFi YXNlOjpyZWdpc3RlclRvU2F2ZUF0RXhpdCk6CisgICAgICAgIChKU0M6OlByb2ZpbGVyOjpEYXRh YmFzZTo6YWRkRGF0YWJhc2VUb0F0RXhpdCk6CisgICAgICAgIChKU0M6OlByb2ZpbGVyOjpEYXRh YmFzZTo6cmVtb3ZlRGF0YWJhc2VGcm9tQXRFeGl0KToKKyAgICAgICAgKEpTQzo6UHJvZmlsZXI6 OkRhdGFiYXNlOjpwZXJmb3JtQXRFeGl0U2F2ZSk6CisgICAgICAgIChKU0M6OlByb2ZpbGVyOjpE YXRhYmFzZTo6cmVtb3ZlRmlyc3RBdEV4aXREYXRhYmFzZSk6CisgICAgICAgIChKU0M6OlByb2Zp bGVyOjpEYXRhYmFzZTo6YXRFeGl0Q2FsbGJhY2spOgorICAgICAgICAqIHByb2ZpbGVyL1Byb2Zp bGVyRGF0YWJhc2UuaDoKKyAgICAgICAgKERhdGFiYXNlKToKKyAgICAgICAgKEpTQzo6UHJvZmls ZXI6OkRhdGFiYXNlOjpkYXRhYmFzZUlEKToKKyAgICAgICAgKiBydW50aW1lL1ZNLmNwcDoKKyAg ICAgICAgKEpTQzo6Vk06OlZNKToKKyAgICAgICAgKEpTQzo6Vk06OmNyZWF0ZUNvbnRleHRHcm91 cCk6CisgICAgICAgIChKU0M6OlZNOjpjcmVhdGUpOgorICAgICAgICAoSlNDOjpWTTo6Y3JlYXRl TGVha2VkKToKKyAgICAgICAgKEpTQzo6Vk06OnNoYXJlZEluc3RhbmNlKToKKyAgICAgICAgKiBy dW50aW1lL1ZNLmg6CisgICAgICAgIChWTSk6CisKIDIwMTMtMDYtMjEgIEZpbGlwIFBpemxvICA8 ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBNZXJnZSB0cnVuayByMTQ2NTQ4LgpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2pzYy5jcHAJKHJldmlzaW9uIDE1MTg0NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qc2MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NjAsOCArNzYwLDggQEAgaW50IGpzY21h aW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgIEpTTG9ja0hvbGRlciBsb2NrKHZtLmdldCgp KTsKICAgICBpbnQgcmVzdWx0OwogCi0gICAgaWYgKG9wdGlvbnMubV9wcm9maWxlKQotICAgICAg ICB2bS0+bV9wZXJCeXRlY29kZVByb2ZpbGVyID0gYWRvcHRQdHIobmV3IFByb2ZpbGVyOjpEYXRh YmFzZSgqdm0pKTsKKyAgICBpZiAob3B0aW9ucy5tX3Byb2ZpbGUgJiYgIXZtLT5tX3BlckJ5dGVj b2RlUHJvZmlsZXIpCisgICAgICAgIHZtLT5tX3BlckJ5dGVjb2RlUHJvZmlsZXIgPSBhZG9wdFB0 cihuZXcgUHJvZmlsZXI6OkRhdGFiYXNlKCkpOwogICAgIAogICAgIEdsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0ID0gR2xvYmFsT2JqZWN0OjpjcmVhdGUoKnZtLCBHbG9iYWxPYmplY3Q6OmNyZWF0 ZVN0cnVjdHVyZSgqdm0sIGpzTnVsbCgpKSwgb3B0aW9ucy5tX2FyZ3VtZW50cyk7CiAgICAgYm9v bCBzdWNjZXNzID0gcnVuV2l0aFNjcmlwdHMoZ2xvYmFsT2JqZWN0LCBvcHRpb25zLm1fc2NyaXB0 cywgb3B0aW9ucy5tX2R1bXApOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVy L1Byb2ZpbGVyRGF0YWJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wcm9maWxlci9Qcm9maWxlckRhdGFiYXNlLmNwcAkocmV2aXNpb24gMTUxODQ3KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVyRGF0YWJhc2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMiBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIsIDIwMTMgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0zMywxMyArMzMsMjQgQEAKIAogbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBQcm9m aWxlciB7CiAKLURhdGFiYXNlOjpEYXRhYmFzZShWTSYgdm0pCi0gICAgOiBtX3ZtKHZtKQorc3Rh dGljIHZvbGF0aWxlIGludCBkYXRhYmFzZUNvdW50ZXI7CitzdGF0aWMgU3BpbkxvY2sgcmVnaXN0 cmF0aW9uTG9jayA9IFNQSU5MT0NLX0lOSVRJQUxJWkVSOworc3RhdGljIGludCBkaWRSZWdpc3Rl ckF0RXhpdDsKK3N0YXRpYyBEYXRhYmFzZSogZmlyc3REYXRhYmFzZTsKKworRGF0YWJhc2U6OkRh dGFiYXNlKCkKKyAgICA6IG1fZGF0YWJhc2VJRChhdG9taWNJbmNyZW1lbnQoJmRhdGFiYXNlQ291 bnRlcikpCisgICAgLCBtX3Nob3VsZFNhdmVBdEV4aXQoZmFsc2UpCisgICAgLCBtX25leHRSZWdp c3RlcmVkRGF0YWJhc2UoMCkKIHsKIH0KIAogRGF0YWJhc2U6On5EYXRhYmFzZSgpCiB7CisgICAg aWYgKG1fc2hvdWxkU2F2ZUF0RXhpdCkgeworICAgICAgICByZW1vdmVEYXRhYmFzZUZyb21BdEV4 aXQoKTsKKyAgICAgICAgcGVyZm9ybUF0RXhpdFNhdmUoKTsKKyAgICB9CiB9CiAKIEJ5dGVjb2Rl cyogRGF0YWJhc2U6OmVuc3VyZUJ5dGVjb2Rlc0ZvcihDb2RlQmxvY2sqIGNvZGVCbG9jaykKQEAg LTkzLDggKzEwNCwxMCBAQCBKU1ZhbHVlIERhdGFiYXNlOjp0b0pTKEV4ZWNTdGF0ZSogZXhlYykg CiAKIFN0cmluZyBEYXRhYmFzZTo6dG9KU09OKCkgY29uc3QKIHsKKyAgICBSZWZQdHI8Vk0+IHZt ID0gVk06OmNyZWF0ZShTbWFsbEhlYXAsIERpc2FibGVQcm9maWxpbmcpOworICAgIEpTTG9ja0hv bGRlciBsb2NrKHZtLmdldCgpKTsKICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0g SlNHbG9iYWxPYmplY3Q6OmNyZWF0ZSgKLSAgICAgICAgbV92bSwgSlNHbG9iYWxPYmplY3Q6OmNy ZWF0ZVN0cnVjdHVyZShtX3ZtLCBqc051bGwoKSkpOworICAgICAgICAqdm0sIEpTR2xvYmFsT2Jq ZWN0OjpjcmVhdGVTdHJ1Y3R1cmUoKnZtLCBqc051bGwoKSkpOwogICAgIAogICAgIHJldHVybiBK U09OU3RyaW5naWZ5KGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpLCB0b0pTKGdsb2JhbE9iamVj dC0+Z2xvYmFsRXhlYygpKSwgMCk7CiB9CkBAIC0xMDksNSArMTIyLDYyIEBAIGJvb2wgRGF0YWJh c2U6OnNhdmUoY29uc3QgY2hhciogZmlsZW5hbWUKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAordm9p ZCBEYXRhYmFzZTo6cmVnaXN0ZXJUb1NhdmVBdEV4aXQoY29uc3QgY2hhciogZmlsZW5hbWUpCit7 CisgICAgbV9hdEV4aXRTYXZlRmlsZW5hbWUgPSBmaWxlbmFtZTsKKyAgICAKKyAgICBpZiAobV9z aG91bGRTYXZlQXRFeGl0KQorICAgICAgICByZXR1cm47CisgICAgCisgICAgYWRkRGF0YWJhc2VU b0F0RXhpdCgpOworICAgIG1fc2hvdWxkU2F2ZUF0RXhpdCA9IHRydWU7Cit9CisKK3ZvaWQgRGF0 YWJhc2U6OmFkZERhdGFiYXNlVG9BdEV4aXQoKQoreworICAgIGlmIChhdG9taWNJbmNyZW1lbnQo JmRpZFJlZ2lzdGVyQXRFeGl0KSA9PSAxKQorICAgICAgICBhdGV4aXQoYXRFeGl0Q2FsbGJhY2sp OworICAgIAorICAgIFRDTWFsbG9jX1NwaW5Mb2NrSG9sZGVyIGhvbGRlcigmcmVnaXN0cmF0aW9u TG9jayk7CisgICAgbV9uZXh0UmVnaXN0ZXJlZERhdGFiYXNlID0gZmlyc3REYXRhYmFzZTsKKyAg ICBmaXJzdERhdGFiYXNlID0gdGhpczsKK30KKwordm9pZCBEYXRhYmFzZTo6cmVtb3ZlRGF0YWJh c2VGcm9tQXRFeGl0KCkKK3sKKyAgICBUQ01hbGxvY19TcGluTG9ja0hvbGRlciBob2xkZXIoJnJl Z2lzdHJhdGlvbkxvY2spOworICAgIGZvciAoRGF0YWJhc2UqKiBjdXJyZW50ID0gJmZpcnN0RGF0 YWJhc2U7ICpjdXJyZW50OyBjdXJyZW50ID0gJigqY3VycmVudCktPm1fbmV4dFJlZ2lzdGVyZWRE YXRhYmFzZSkgeworICAgICAgICBpZiAoKmN1cnJlbnQgIT0gdGhpcykKKyAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAqY3VycmVudCA9IG1fbmV4dFJlZ2lzdGVyZWREYXRhYmFzZTsKKyAg ICAgICAgbV9uZXh0UmVnaXN0ZXJlZERhdGFiYXNlID0gMDsKKyAgICAgICAgbV9zaG91bGRTYXZl QXRFeGl0ID0gZmFsc2U7CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwordm9pZCBEYXRhYmFz ZTo6cGVyZm9ybUF0RXhpdFNhdmUoKSBjb25zdAoreworICAgIHNhdmUobV9hdEV4aXRTYXZlRmls ZW5hbWUuZGF0YSgpKTsKK30KKworRGF0YWJhc2UqIERhdGFiYXNlOjpyZW1vdmVGaXJzdEF0RXhp dERhdGFiYXNlKCkKK3sKKyAgICBUQ01hbGxvY19TcGluTG9ja0hvbGRlciBob2xkZXIoJnJlZ2lz dHJhdGlvbkxvY2spOworICAgIERhdGFiYXNlKiByZXN1bHQgPSBmaXJzdERhdGFiYXNlOworICAg IGlmIChyZXN1bHQpIHsKKyAgICAgICAgZmlyc3REYXRhYmFzZSA9IHJlc3VsdC0+bV9uZXh0UmVn aXN0ZXJlZERhdGFiYXNlOworICAgICAgICByZXN1bHQtPm1fbmV4dFJlZ2lzdGVyZWREYXRhYmFz ZSA9IDA7CisgICAgICAgIHJlc3VsdC0+bV9zaG91bGRTYXZlQXRFeGl0ID0gZmFsc2U7CisgICAg fQorICAgIHJldHVybiByZXN1bHQ7Cit9CisKK3ZvaWQgRGF0YWJhc2U6OmF0RXhpdENhbGxiYWNr KCkKK3sKKyAgICB3aGlsZSAoRGF0YWJhc2UqIGRhdGFiYXNlID0gcmVtb3ZlRmlyc3RBdEV4aXRE YXRhYmFzZSgpKQorICAgICAgICBkYXRhYmFzZS0+cGVyZm9ybUF0RXhpdFNhdmUoKTsKK30KKwog fSB9IC8vIG5hbWVzcGFjZSBKU0M6OlByb2ZpbGVyCiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9wcm9maWxlci9Qcm9maWxlckRhdGFiYXNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVyRGF0YWJhc2UuaAkocmV2aXNpb24gMTUxODQ3 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVyRGF0YWJhc2UuaAko d29ya2luZyBjb3B5KQpAQCAtNDMsOSArNDMsMTEgQEAgbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFj ZSBQcm9maWxlciB7CiBjbGFzcyBEYXRhYmFzZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FU RUQ7IFdURl9NQUtFX05PTkNPUFlBQkxFKERhdGFiYXNlKTsKIHB1YmxpYzoKLSAgICBKU19FWFBP UlRfUFJJVkFURSBEYXRhYmFzZShWTSYpOworICAgIEpTX0VYUE9SVF9QUklWQVRFIERhdGFiYXNl KCk7CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgfkRhdGFiYXNlKCk7CiAgICAgCisgICAgaW50IGRh dGFiYXNlSUQoKSBjb25zdCB7IHJldHVybiBtX2RhdGFiYXNlSUQ7IH0KKyAgICAKICAgICBCeXRl Y29kZXMqIGVuc3VyZUJ5dGVjb2Rlc0ZvcihDb2RlQmxvY2sqKTsKICAgICB2b2lkIG5vdGlmeURl c3RydWN0aW9uKENvZGVCbG9jayopOwogICAgIApAQCAtNjUsNyArNjcsMTcgQEAgcHVibGljOgog ICAgIC8vIHNhdmUgZmFpbGVkLgogICAgIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgc2F2ZShjb25z dCBjaGFyKiBmaWxlbmFtZSkgY29uc3Q7CiAKKyAgICB2b2lkIHJlZ2lzdGVyVG9TYXZlQXRFeGl0 KGNvbnN0IGNoYXIqIGZpbGVuYW1lKTsKKyAgICAKIHByaXZhdGU6CisgICAgdm9pZCBhZGREYXRh YmFzZVRvQXRFeGl0KCk7CisgICAgdm9pZCByZW1vdmVEYXRhYmFzZUZyb21BdEV4aXQoKTsKKyAg ICB2b2lkIHBlcmZvcm1BdEV4aXRTYXZlKCkgY29uc3Q7CisgICAgc3RhdGljIERhdGFiYXNlKiBy ZW1vdmVGaXJzdEF0RXhpdERhdGFiYXNlKCk7CisgICAgc3RhdGljIHZvaWQgYXRFeGl0Q2FsbGJh Y2soKTsKKyAgICAKKyAgICBpbnQgbV9kYXRhYmFzZUlEOworCiAgICAgLy8gVXNlIGEgZnVsbC1i bG93biBhZGFwdGl2ZSBtdXRleCBiZWNhdXNlOgogICAgIC8vIC0gVGhlcmUgaXMgb25seSBvbmUg UHJvZmlsZXJEYXRhYmFzZSBwZXIgVk0uIFRoZSBzaXplIG92ZXJoZWFkIG9mIHRoZSBzeXN0ZW0n cwogICAgIC8vICAgbXV0ZXggaXMgbmVnbGlnaWJsZSBpZiB5b3Ugb25seSBoYXZlIG9uZSBvZiB0 aGVtLgpAQCAtODAsMTEgKzkyLDE0IEBAIHByaXZhdGU6CiAgICAgdHlwZWRlZiBNdXRleCBMb2Nr OwogICAgIHR5cGVkZWYgTXV0ZXhMb2NrZXIgTG9ja2VyOwogICAgIAotICAgIFZNJiBtX3ZtOwog ICAgIFNlZ21lbnRlZFZlY3RvcjxCeXRlY29kZXM+IG1fYnl0ZWNvZGVzOwogICAgIEhhc2hNYXA8 Q29kZUJsb2NrKiwgQnl0ZWNvZGVzKj4gbV9ieXRlY29kZXNNYXA7CiAgICAgVmVjdG9yPFJlZlB0 cjxDb21waWxhdGlvbj4gPiBtX2NvbXBpbGF0aW9uczsKICAgICBMb2NrIG1fbG9jazsKKworICAg IGJvb2wgbV9zaG91bGRTYXZlQXRFeGl0OworICAgIENTdHJpbmcgbV9hdEV4aXRTYXZlRmlsZW5h bWU7CisgICAgRGF0YWJhc2UqIG1fbmV4dFJlZ2lzdGVyZWREYXRhYmFzZTsKIH07CiAKIH0gfSAv LyBuYW1lc3BhY2UgSlNDOjpQcm9maWxlcgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvVk0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L1ZNLmNwcAkocmV2aXNpb24gMTUxODQ3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvVk0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Miw3ICs2Miw5IEBACiAjaW5jbHVkZSAiU3Ry aWN0RXZhbEFjdGl2YXRpb24uaCIKICNpbmNsdWRlICJTdHJvbmdJbmxpbmVzLmgiCiAjaW5jbHVk ZSAiVW5saW5rZWRDb2RlQmxvY2suaCIKKyNpbmNsdWRlIDx3dGYvUHJvY2Vzc0lELmg+CiAjaW5j bHVkZSA8d3RmL1JldGFpblB0ci5oPgorI2luY2x1ZGUgPHd0Zi9TdHJpbmdQcmludFN0cmVhbS5o PgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KICNpbmNsdWRlIDx3dGYvV1RGVGhyZWFkRGF0 YS5oPgogCkBAIC0xMzIsNyArMTM0LDcgQEAgc3RhdGljIGJvb2wgZW5hYmxlQXNzZW1ibGVyKEV4 ZWN1dGFibGVBbAogfQogI2VuZGlmIC8vIEVOQUJMRSghQVNTRU1CTEVSKQogCi1WTTo6Vk0oVk1U eXBlIHZtVHlwZSwgSGVhcFR5cGUgaGVhcFR5cGUpCitWTTo6Vk0oVk1UeXBlIHZtVHlwZSwgSGVh cFR5cGUgaGVhcFR5cGUsIFByb2ZpbGluZ01vZGUgcHJvZmlsaW5nTW9kZSkKICAgICA6CiAjaWYg RU5BQkxFKEFTU0VNQkxFUikKICAgICAgIGV4ZWN1dGFibGVBbGxvY2F0b3IoKnRoaXMpLApAQCAt MjQzLDggKzI0NSwxNiBAQCBWTTo6Vk0oVk1UeXBlIHZtVHlwZSwgSGVhcFR5cGUgaGVhcFR5cGUp CiAKICAgICBMTEludDo6RGF0YTo6cGVyZm9ybUFzc2VydGlvbnMoKnRoaXMpOwogICAgIAotICAg IGlmIChPcHRpb25zOjplbmFibGVQcm9maWxlcigpKQotICAgICAgICBtX3BlckJ5dGVjb2RlUHJv ZmlsZXIgPSBhZG9wdFB0cihuZXcgUHJvZmlsZXI6OkRhdGFiYXNlKCp0aGlzKSk7CisgICAgaWYg KHByb2ZpbGluZ01vZGUgPT0gTm9ybWFsUHJvZmlsaW5nICYmIE9wdGlvbnM6OmVuYWJsZVByb2Zp bGVyKCkpIHsKKyAgICAgICAgbV9wZXJCeXRlY29kZVByb2ZpbGVyID0gYWRvcHRQdHIobmV3IFBy b2ZpbGVyOjpEYXRhYmFzZSgpKTsKKworICAgICAgICBTdHJpbmdQcmludFN0cmVhbSBwYXRoT3V0 OworICAgICAgICBjb25zdCBjaGFyKiBwcm9maWxlclBhdGggPSBnZXRlbnYoIkpTQ19QUk9GSUxF Ul9QQVRIIik7CisgICAgICAgIGlmIChwcm9maWxlclBhdGgpCisgICAgICAgICAgICBwYXRoT3V0 LnByaW50KHByb2ZpbGVyUGF0aCwgIi8iKTsKKyAgICAgICAgcGF0aE91dC5wcmludCgiSlNDUHJv ZmlsZS0iLCBnZXRDdXJyZW50UHJvY2Vzc0lEKCksICItIiwgbV9wZXJCeXRlY29kZVByb2ZpbGVy LT5kYXRhYmFzZUlEKCksICIuanNvbiIpOworICAgICAgICBtX3BlckJ5dGVjb2RlUHJvZmlsZXIt PnJlZ2lzdGVyVG9TYXZlQXRFeGl0KHBhdGhPdXQudG9DU3RyaW5nKCkuZGF0YSgpKTsKKyAgICB9 CiAKICNpZiBFTkFCTEUoREZHX0pJVCkKICAgICBpZiAoY2FuVXNlSklUKCkpCkBAIC0zMjgsMTkg KzMzOCwxOSBAQCBWTTo6flZNKCkKICNlbmRpZgogfQogCi1QYXNzUmVmUHRyPFZNPiBWTTo6Y3Jl YXRlQ29udGV4dEdyb3VwKEhlYXBUeXBlIGhlYXBUeXBlKQorUGFzc1JlZlB0cjxWTT4gVk06OmNy ZWF0ZUNvbnRleHRHcm91cChIZWFwVHlwZSBoZWFwVHlwZSwgUHJvZmlsaW5nTW9kZSBwcm9maWxp bmdNb2RlKQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgVk0oQVBJQ29udGV4dEdyb3VwLCBo ZWFwVHlwZSkpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgVk0oQVBJQ29udGV4dEdyb3VwLCBo ZWFwVHlwZSwgcHJvZmlsaW5nTW9kZSkpOwogfQogCi1QYXNzUmVmUHRyPFZNPiBWTTo6Y3JlYXRl KEhlYXBUeXBlIGhlYXBUeXBlKQorUGFzc1JlZlB0cjxWTT4gVk06OmNyZWF0ZShIZWFwVHlwZSBo ZWFwVHlwZSwgUHJvZmlsaW5nTW9kZSBwcm9maWxpbmdNb2RlKQogewotICAgIHJldHVybiBhZG9w dFJlZihuZXcgVk0oRGVmYXVsdCwgaGVhcFR5cGUpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3 IFZNKERlZmF1bHQsIGhlYXBUeXBlLCBwcm9maWxpbmdNb2RlKSk7CiB9CiAKLVBhc3NSZWZQdHI8 Vk0+IFZNOjpjcmVhdGVMZWFrZWQoSGVhcFR5cGUgaGVhcFR5cGUpCitQYXNzUmVmUHRyPFZNPiBW TTo6Y3JlYXRlTGVha2VkKEhlYXBUeXBlIGhlYXBUeXBlLCBQcm9maWxpbmdNb2RlIHByb2ZpbGlu Z01vZGUpCiB7Ci0gICAgcmV0dXJuIGNyZWF0ZShoZWFwVHlwZSk7CisgICAgcmV0dXJuIGNyZWF0 ZShoZWFwVHlwZSwgcHJvZmlsaW5nTW9kZSk7CiB9CiAKIGJvb2wgVk06OnNoYXJlZEluc3RhbmNl RXhpc3RzKCkKQEAgLTM1Myw3ICszNjMsNyBAQCBWTSYgVk06OnNoYXJlZEluc3RhbmNlKCkKICAg ICBHbG9iYWxKU0xvY2sgZ2xvYmFsTG9jazsKICAgICBWTSomIGluc3RhbmNlID0gc2hhcmVkSW5z dGFuY2VJbnRlcm5hbCgpOwogICAgIGlmICghaW5zdGFuY2UpIHsKLSAgICAgICAgaW5zdGFuY2Ug PSBhZG9wdFJlZihuZXcgVk0oQVBJU2hhcmVkLCBTbWFsbEhlYXApKS5sZWFrUmVmKCk7CisgICAg ICAgIGluc3RhbmNlID0gYWRvcHRSZWYobmV3IFZNKEFQSVNoYXJlZCwgU21hbGxIZWFwLCBOb3Jt YWxQcm9maWxpbmcpKS5sZWFrUmVmKCk7CiAgICAgICAgIGluc3RhbmNlLT5tYWtlVXNhYmxlRnJv bU11bHRpcGxlVGhyZWFkcygpOwogICAgIH0KICAgICByZXR1cm4gKmluc3RhbmNlOwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVk0uaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCShyZXZpc2lvbiAxNTE4NDcpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsNiArMTY2 LDggQEAgbmFtZXNwYWNlIEpTQyB7CiAjZW5kaWYKICNlbmRpZgogCisgICAgZW51bSBQcm9maWxp bmdNb2RlIHsgTm9ybWFsUHJvZmlsaW5nLCBEaXNhYmxlUHJvZmlsaW5nIH07CisKICAgICBjbGFz cyBWTSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxWTT4gewogICAgIHB1YmxpYzoKICAg ICAgICAgLy8gV2ViQ29yZSBoYXMgYSBvbmUtdG8tb25lIG1hcHBpbmcgb2YgdGhyZWFkcyB0byBW TXM7CkBAIC0xODcsOSArMTg5LDkgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHN0YXRpYyBi b29sIHNoYXJlZEluc3RhbmNlRXhpc3RzKCk7CiAgICAgICAgIEpTX0VYUE9SVF9QUklWQVRFIHN0 YXRpYyBWTSYgc2hhcmVkSW5zdGFuY2UoKTsKIAotICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBz dGF0aWMgUGFzc1JlZlB0cjxWTT4gY3JlYXRlKEhlYXBUeXBlID0gU21hbGxIZWFwKTsKLSAgICAg ICAgSlNfRVhQT1JUX1BSSVZBVEUgc3RhdGljIFBhc3NSZWZQdHI8Vk0+IGNyZWF0ZUxlYWtlZChI ZWFwVHlwZSA9IFNtYWxsSGVhcCk7Ci0gICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPFZNPiBjcmVh dGVDb250ZXh0R3JvdXAoSGVhcFR5cGUgPSBTbWFsbEhlYXApOworICAgICAgICBKU19FWFBPUlRf UFJJVkFURSBzdGF0aWMgUGFzc1JlZlB0cjxWTT4gY3JlYXRlKEhlYXBUeXBlID0gU21hbGxIZWFw LCBQcm9maWxpbmdNb2RlID0gTm9ybWFsUHJvZmlsaW5nKTsKKyAgICAgICAgSlNfRVhQT1JUX1BS SVZBVEUgc3RhdGljIFBhc3NSZWZQdHI8Vk0+IGNyZWF0ZUxlYWtlZChIZWFwVHlwZSA9IFNtYWxs SGVhcCwgUHJvZmlsaW5nTW9kZSA9IE5vcm1hbFByb2ZpbGluZyk7CisgICAgICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFZNPiBjcmVhdGVDb250ZXh0R3JvdXAoSGVhcFR5cGUgPSBTbWFsbEhlYXAsIFBy b2ZpbGluZ01vZGUgPSBOb3JtYWxQcm9maWxpbmcpOwogICAgICAgICBKU19FWFBPUlRfUFJJVkFU RSB+Vk0oKTsKIAogICAgICAgICB2b2lkIG1ha2VVc2FibGVGcm9tTXVsdGlwbGVUaHJlYWRzKCkg eyBoZWFwLm1hY2hpbmVUaHJlYWRzKCkubWFrZVVzYWJsZUZyb21NdWx0aXBsZVRocmVhZHMoKTsg fQpAQCAtNDgzLDcgKzQ4NSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHByaXZhdGU6CiAgICAg ICAgIGZyaWVuZCBjbGFzcyBMTEludE9mZnNldHNFeHRyYWN0b3I7CiAgICAgICAgIAotICAgICAg ICBWTShWTVR5cGUsIEhlYXBUeXBlKTsKKyAgICAgICAgVk0oVk1UeXBlLCBIZWFwVHlwZSwgUHJv ZmlsaW5nTW9kZSk7CiAgICAgICAgIHN0YXRpYyBWTSomIHNoYXJlZEluc3RhbmNlSW50ZXJuYWwo KTsKICAgICAgICAgdm9pZCBjcmVhdGVOYXRpdmVUaHVuaygpOwogI2lmIEVOQUJMRShBU1NFTUJM RVIpCkluZGV4OiBTb3VyY2UvV1RGL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RG L0NoYW5nZUxvZwkocmV2aXNpb24gMTUxODU1KQorKysgU291cmNlL1dURi9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwyNiBAQAorMjAxMy0wNi0yMSAgRmlsaXAgUGl6bG8gIDxm cGl6bG9AYXBwbGUuY29tPgorCisgICAgICAgIGZvdXJ0aFRpZXI6IE1lcmdlIHIxNDY5MzIgYW5k IDE0NjkzMyBzbyB0aGF0IHdlIGNhbiBwcm9maWxlIGZyb20gRHVtcFJlbmRlclRyZWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzg5MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIFdU RiBwYXJ0IG9mIHRoaXMgY2hhbmdlIGlzIGEgc3RyYWlnaHQtdXAgbWVyZ2Ugd2l0aCBub3RoaW5n IGludGVyZXN0aW5nLgorCisgICAgICAgICogR05VbWFrZWZpbGUubGlzdC5hbToKKyAgICAgICAg KiBXVEYuZ3lwaToKKyAgICAgICAgKiBXVEYucHJvOgorICAgICAgICAqIFdURi52Y3Byb2ovV1RG LnZjcHJvajoKKyAgICAgICAgKiBXVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAg ICAgKiB3dGYvQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICogd3RmL01ldGFBbGxvY2F0b3IuY3Bw OgorICAgICAgICAoV1RGOjpNZXRhQWxsb2NhdG9yOjpkdW1wUHJvZmlsZSk6CisgICAgICAgICog d3RmL1Byb2Nlc3NJRC5oOiBBZGRlZC4KKyAgICAgICAgKFdURik6CisgICAgICAgIChXVEY6Omdl dEN1cnJlbnRQcm9jZXNzSUQpOgorICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwOgor ICAgICAgICAoV1RGOjpTdHJpbmdTdGF0czo6cHJpbnRTdGF0cyk6CisKIDIwMTMtMDYtMTggIEZp bGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBmb3VydGhUaWVyOiBERkcg c2hvdWxkIGhhdmUgc3dpdGNoX2NoYXIKSW5kZXg6IFNvdXJjZS9XVEYvR05VbWFrZWZpbGUubGlz dC5hbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL0dOVW1ha2VmaWxlLmxpc3QuYW0JKHJldmlz aW9uIDE1MTg0NykKKysrIFNvdXJjZS9XVEYvR05VbWFrZWZpbGUubGlzdC5hbQkod29ya2luZyBj b3B5KQpAQCAtMTM5LDYgKzEzOSw3IEBAIHd0Zl9zb3VyY2VzICs9IFwKICAgICBTb3VyY2UvV1RG L3d0Zi9Qb3NzaWJseU51bGwuaCBcCiAgICAgU291cmNlL1dURi93dGYvUHJpbnRTdHJlYW0uY3Bw IFwKICAgICBTb3VyY2UvV1RGL3d0Zi9QcmludFN0cmVhbS5oIFwKKyAgICBTb3VyY2UvV1RGL3d0 Zi9Qcm9jZXNzSUQuaCBcCiAgICAgU291cmNlL1dURi93dGYvUmFuZG9tTnVtYmVyLmNwcCBcCiAg ICAgU291cmNlL1dURi93dGYvUmFuZG9tTnVtYmVyLmggXAogICAgIFNvdXJjZS9XVEYvd3RmL1Jh bmRvbU51bWJlclNlZWQuaCBcCkluZGV4OiBTb3VyY2UvV1RGL1dURi5neXBpCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XVEYvV1RGLmd5cGkJKHJldmlzaW9uIDE1MTg0NykKKysrIFNvdXJjZS9XVEYv V1RGLmd5cGkJKHdvcmtpbmcgY29weSkKQEAgLTg0LDYgKzg0LDcgQEAKICAgICAgICAgICAgICd3 dGYvUGxhdGZvcm0uaCcsCiAgICAgICAgICAgICAnd3RmL1Bvc3NpYmx5TnVsbC5oJywKICAgICAg ICAgICAgICd3dGYvUHJpbnRTdHJlYW0uaCcsCisgICAgICAgICAgICAnd3RmL1Byb2Nlc3NJRC5o JywKICAgICAgICAgICAgICd3dGYvUmFuZG9tTnVtYmVyLmgnLAogICAgICAgICAgICAgJ3d0Zi9S YXdQb2ludGVyLmgnLAogICAgICAgICAgICAgJ3d0Zi9SZWZDb3VudGVkLmgnLApJbmRleDogU291 cmNlL1dURi9XVEYucHJvCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvV1RGLnBybwkocmV2aXNp b24gMTUxODQ3KQorKysgU291cmNlL1dURi9XVEYucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0xMzAs NiArMTMwLDcgQEAgSEVBREVSUyArPSBcCiAgICAgUGxhdGZvcm0uaCBcCiAgICAgUG9zc2libHlO dWxsLmggXAogICAgIFByaW50U3RyZWFtLmggXAorICAgIFByb2Nlc3NJRC5oIFwKICAgICBSYW5k b21OdW1iZXIuaCBcCiAgICAgUmFuZG9tTnVtYmVyU2VlZC5oIFwKICAgICBSYXdQb2ludGVyLmgg XApJbmRleDogU291cmNlL1dURi9XVEYudmNwcm9qL1dURi52Y3Byb2oKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dURi9XVEYudmNwcm9qL1dURi52Y3Byb2oJKHJldmlzaW9uIDE1MTg0NykKKysrIFNv dXJjZS9XVEYvV1RGLnZjcHJvai9XVEYudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0xMTI5LDYg KzExMjksMTAgQEAKIAkJCT4KIAkJPC9GaWxlPgogCQk8RmlsZQorCQkJUmVsYXRpdmVQYXRoPSIu Llx3dGZcUHJvY2Vzc0lELmgiCisJCQk+CisJCTwvRmlsZT4KKwkJPEZpbGUKIAkJCVJlbGF0aXZl UGF0aD0iLi5cd3RmXFJhbmRvbU51bWJlci5jcHAiCiAJCQk+CiAJCTwvRmlsZT4KSW5kZXg6IFNv dXJjZS9XVEYvV1RGLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dURi9XVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMTUxODQ3KQor KysgU291cmNlL1dURi9XVEYueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5 KQpAQCAtMzAsNiArMzAsNyBAQAogCQkwRjlEMzM2MTE2NURCQTczMDA1QUQzODcgLyogRmlsZVBy aW50U3RyZWFtLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSAwRjlEMzM1QzE2NURCQTczMDA1QUQzODcgLyogRmlsZVByaW50U3RyZWFtLmggKi87IH07CiAJ CTBGOUQzMzYyMTY1REJBNzMwMDVBRDM4NyAvKiBQcmludFN0cmVhbS5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjlEMzM1RDE2NURCQTczMDA1QUQz ODcgLyogUHJpbnRTdHJlYW0uY3BwICovOyB9OwogCQkwRjlEMzM2MzE2NURCQTczMDA1QUQzODcg LyogUHJpbnRTdHJlYW0uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDBGOUQzMzVFMTY1REJBNzMwMDVBRDM4NyAvKiBQcmludFN0cmVhbS5oICovOyB9Owor CQkwRkM0NDg4MzE2RkU5RkUxMDA4NDRCRTkgLyogUHJvY2Vzc0lELmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRkM0NDg4MjE2RkU5RkUxMDA4NDRCRTkg LyogUHJvY2Vzc0lELmggKi87IH07CiAJCTBGQzRFREU2MTY5NjE0OTYwMEY2NTA0MSAvKiBDb21t YVByaW50ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDBGQzRFREU1MTY5NjE0OTYwMEY2NTA0MSAvKiBDb21tYVByaW50ZXIuaCAqLzsgfTsKIAkJMEZE ODFBQzUxNTRGQjIyRTAwOTgzRTcyIC8qIEZhc3RCaXRWZWN0b3IuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGRDgxQUM0MTU0RkIyMkUwMDk4M0U3MiAv KiBGYXN0Qml0VmVjdG9yLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoKTsgfTsgfTsK IAkJMEZEREJGQTcxNjY2REZBMzAwQzU1RkVGIC8qIFN0cmluZ1ByaW50U3RyZWFtLmNwcCBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGRERCRkE1MTY2NkRG QTMwMEM1NUZFRiAvKiBTdHJpbmdQcmludFN0cmVhbS5jcHAgKi87IH07CkBAIC0zNDQsNiArMzQ1 LDcgQEAKIAkJMEY5RDMzNUMxNjVEQkE3MzAwNUFEMzg3IC8qIEZpbGVQcmludFN0cmVhbS5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBGaWxlUHJpbnRTdHJlYW0uaDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEY5RDMzNUQxNjVEQkE3MzAwNUFEMzg3IC8qIFByaW50 U3RyZWFtLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByaW50U3Ry ZWFtLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEY5RDMzNUUxNjVEQkE3MzAw NUFEMzg3IC8qIFByaW50U3RyZWFtLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFByaW50U3RyZWFtLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTBGQzQ0ODgyMTZG RTlGRTEwMDg0NEJFOSAvKiBQcm9jZXNzSUQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gUHJvY2Vzc0lELmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGQzRFREU1 MTY5NjE0OTYwMEY2NTA0MSAvKiBDb21tYVByaW50ZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBwYXRoID0gQ29tbWFQcmludGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTBGRDgxQUM0MTU0RkIyMkUwMDk4M0U3MiAvKiBGYXN0Qml0VmVjdG9yLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEZhc3RCaXRWZWN0b3IuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJMEZEREJGQTUxNjY2REZBMzAwQzU1RkVGIC8qIFN0cmluZ1ByaW50U3RyZWFt LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFN0cmluZ1ByaW50U3Ry ZWFtLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTg0Niw2ICs4NDgsNyBAQAog CQkJCUE4QTQ3MkYzMTUxQTgyNUIwMDQxMjNGRiAvKiBQb3NzaWJseU51bGwuaCAqLywKIAkJCQkw RjlEMzM1RDE2NURCQTczMDA1QUQzODcgLyogUHJpbnRTdHJlYW0uY3BwICovLAogCQkJCTBGOUQz MzVFMTY1REJBNzMwMDVBRDM4NyAvKiBQcmludFN0cmVhbS5oICovLAorCQkJCTBGQzQ0ODgyMTZG RTlGRTEwMDg0NEJFOSAvKiBQcm9jZXNzSUQuaCAqLywKIAkJCQkxNDNGNjExRDE1NjVGMEY5MDBE QjUxNEEgLyogUkFNU2l6ZS5jcHAgKi8sCiAJCQkJMTQzRjYxMUUxNTY1RjBGOTAwREI1MTRBIC8q IFJBTVNpemUuaCAqLywKIAkJCQlBOEE0NzJGQjE1MUE4MjVCMDA0MTIzRkYgLyogUmFuZG9tTnVt YmVyLmNwcCAqLywKQEAgLTEzMDIsNiArMTMwNSw3IEBACiAJCQkJOTc0Q0ZDOEUxNkE0RjMyNzAw NkQ1NDA0IC8qIFdlYWtQdHIuaCBpbiBIZWFkZXJzICovLAogCQkJCUE4QTQ3NDQ2MTUxQTgyNUIw MDQxMjNGRiAvKiBXVEZTdHJpbmcuaCBpbiBIZWFkZXJzICovLAogCQkJCUE4QTQ3NDg3MTUxQTgy NUIwMDQxMjNGRiAvKiBXVEZUaHJlYWREYXRhLmggaW4gSGVhZGVycyAqLywKKwkJCQkwRkM0NDg4 MzE2RkU5RkUxMDA4NDRCRTkgLyogUHJvY2Vzc0lELmggaW4gSGVhZGVycyAqLywKIAkJCSk7CiAJ CQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKSW5kZXg6IFNv dXJjZS9XVEYvd3RmL0NNYWtlTGlzdHMudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3Rm L0NNYWtlTGlzdHMudHh0CShyZXZpc2lvbiAxNTE4NDcpCisrKyBTb3VyY2UvV1RGL3d0Zi9DTWFr ZUxpc3RzLnR4dAkod29ya2luZyBjb3B5KQpAQCAtODksNiArODksNyBAQCBzZXQoV1RGX0hFQURF UlMKICAgICBQbGF0Zm9ybS5oCiAgICAgUG9zc2libHlOdWxsLmgKICAgICBQcmludFN0cmVhbS5o CisgICAgUHJvY2Vzc0lELmgKICAgICBSYW5kb21OdW1iZXIuaAogICAgIFJhbmRvbU51bWJlclNl ZWQuaAogICAgIFJhd1BvaW50ZXIuaApJbmRleDogU291cmNlL1dURi93dGYvTWV0YUFsbG9jYXRv ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvTWV0YUFsbG9jYXRvci5jcHAJKHJl dmlzaW9uIDE1MTg0NykKKysrIFNvdXJjZS9XVEYvd3RmL01ldGFBbGxvY2F0b3IuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAKICNpbmNsdWRlIDx3dGYvRGF0YUxvZy5oPgog I2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+CisjaW5jbHVkZSA8d3RmL1Byb2Nlc3NJRC5oPgog CiBuYW1lc3BhY2UgV1RGIHsKIApAQCAtNDQ5LDggKzQ1MCw5IEBAIHZvaWQgTWV0YUFsbG9jYXRv cjo6ZnJlZUZyZWVTcGFjZU5vZGUoRnIKICNpZiBFTkFCTEUoTUVUQV9BTExPQ0FUT1JfUFJPRklM RSkKIHZvaWQgTWV0YUFsbG9jYXRvcjo6ZHVtcFByb2ZpbGUoKQogewotICAgIGRhdGFMb2dGKCIl ZDogTWV0YUFsbG9jYXRvciglcCk6IG51bSBhbGxvY2F0aW9ucyA9ICV1LCBudW0gZnJlZXMgPSAl dSwgYWxsb2NhdGVkID0gJWx1LCByZXNlcnZlZCA9ICVsdSwgY29tbWl0dGVkID0gJWx1XG4iLAot ICAgICAgICAgICAgZ2V0cGlkKCksIHRoaXMsIG1fbnVtQWxsb2NhdGlvbnMsIG1fbnVtRnJlZXMs IG1fYnl0ZXNBbGxvY2F0ZWQsIG1fYnl0ZXNSZXNlcnZlZCwgbV9ieXRlc0NvbW1pdHRlZCk7Cisg ICAgZGF0YUxvZ0YoCisgICAgICAgICIlZDogTWV0YUFsbG9jYXRvciglcCk6IG51bSBhbGxvY2F0 aW9ucyA9ICV1LCBudW0gZnJlZXMgPSAldSwgYWxsb2NhdGVkID0gJWx1LCByZXNlcnZlZCA9ICVs dSwgY29tbWl0dGVkID0gJWx1XG4iLAorICAgICAgICBnZXRDdXJyZW50UHJvY2Vzc0lEKCksIHRo aXMsIG1fbnVtQWxsb2NhdGlvbnMsIG1fbnVtRnJlZXMsIG1fYnl0ZXNBbGxvY2F0ZWQsIG1fYnl0 ZXNSZXNlcnZlZCwgbV9ieXRlc0NvbW1pdHRlZCk7CiB9CiAjZW5kaWYKIApJbmRleDogU291cmNl L1dURi93dGYvUHJvY2Vzc0lELmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvUHJvY2Vz c0lELmgJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV1RGL3d0Zi9Qcm9jZXNzSUQuaAkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDU1IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhF CisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElS RUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09O U0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBS T0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBE QVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENB VVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0Ug T1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuIAorICovCisKKyNpZm5kZWYgUHJvY2Vzc0lEX2gKKyNkZWZpbmUgUHJvY2Vzc0lEX2gK KworI2luY2x1ZGUgPHd0Zi9QbGF0Zm9ybS5oPgorCisjaWYgT1MoVU5JWCkKKyNpbmNsdWRlIDx1 bmlzdGQuaD4KKyNlbmRpZgorCisjaWYgUExBVEZPUk0oV0lOKQorI2luY2x1ZGUgPHdpbmRvd3Mu aD4KKyNlbmRpZgorCituYW1lc3BhY2UgV1RGIHsKKworaW5saW5lIGludCBnZXRDdXJyZW50UHJv Y2Vzc0lEKCkKK3sKKyNpZiBQTEFURk9STShXSU4pCisgICAgcmV0dXJuIEdldEN1cnJlbnRQcm9j ZXNzSWQoKTsKKyNlbHNlCisgICAgcmV0dXJuIGdldHBpZCgpOworI2VuZGlmCit9CisKK30gLy8g bmFtZXNwYWNlIFdURgorCit1c2luZyBXVEY6OmdldEN1cnJlbnRQcm9jZXNzSUQ7CisKKyNlbmRp ZiAvLyBQcm9jZXNzSURfaAorCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAJKHJl dmlzaW9uIDE1MTg0NykKKysrIFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJBdG9taWNTdHJpbmcuaCIK ICNpbmNsdWRlICJTdHJpbmdCdWZmZXIuaCIKICNpbmNsdWRlICJTdHJpbmdIYXNoLmgiCisjaW5j bHVkZSA8d3RmL1Byb2Nlc3NJRC5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNp bmNsdWRlIDx3dGYvV1RGVGhyZWFkRGF0YS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcu aD4KQEAgLTgzLDcgKzg0LDcgQEAgdm9pZCBTdHJpbmdTdGF0czo6cmVtb3ZlU3RyaW5nKFN0cmlu Z0ltcAogCiB2b2lkIFN0cmluZ1N0YXRzOjpwcmludFN0YXRzKCkKIHsKLSAgICBkYXRhTG9nRigi U3RyaW5nIHN0YXRzIGZvciBwcm9jZXNzIGlkICVkOlxuIiwgZ2V0cGlkKCkpOworICAgIGRhdGFM b2dGKCJTdHJpbmcgc3RhdHMgZm9yIHByb2Nlc3MgaWQgJWQ6XG4iLCBnZXRDdXJyZW50UHJvY2Vz c0lEKCkpOwogCiAgICAgdW5zaWduZWQgbG9uZyBsb25nIHRvdGFsTnVtYmVyQ2hhcmFjdGVycyA9 IG1fdG90YWw4Qml0RGF0YSArIG1fdG90YWwxNkJpdERhdGE7CiAgICAgZG91YmxlIHBlcmNlbnQ4 Qml0ID0gbV90b3RhbE51bWJlclN0cmluZ3MgPyAoKGRvdWJsZSltX251bWJlcjhCaXRTdHJpbmdz ICogMTAwKSAvIChkb3VibGUpbV90b3RhbE51bWJlclN0cmluZ3MgOiAwLjA7Cg==