68579 2011-09-21 15:34:37 -0700 Remove checks for Leopard-only Objective-C APIs 2011-09-21 15:40:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 471217 0 andersca 2011-09-21 15:34:37 -0700 Remove checks for Leopard-only Objective-C APIs 471220 1 108246 andersca 2011-09-21 15:36:26 -0700 Created attachment 108246 Patch 471222 2 108246 darin 2011-09-21 15:37:39 -0700 Comment on attachment 108246 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108246&action=review > Source/WebCore/ChangeLog:8 > + No new tests. (OOPS!) OOPS! 471224 3 andersca 2011-09-21 15:40:07 -0700 Committed r95675: <http://trac.webkit.org/changeset/95675> 108246 2011-09-21 15:36:26 -0700 2011-09-21 15:37:39 -0700 Patch bug-68579-20110921153627.patch text/plain 12206 andersca SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1Njc0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDktMjEgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgY2hlY2tzIGZv ciBMZW9wYXJkLW9ubHkgT2JqZWN0aXZlLUMgQVBJcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njg1NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAq IGJyaWRnZS9vYmpjL29iamNfY2xhc3MubW06CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpPYmpj Q2xhc3M6Om1ldGhvZHNOYW1lZCk6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpPYmpjQ2xhc3M6 OmZpZWxkTmFtZWQpOgorICAgICAgICAqIGJyaWRnZS9vYmpjL29iamNfaW5zdGFuY2UubW06Cisg ICAgICAgIChhbGxvY2F0ZUF1dG9SZWxlYXNlUG9vbCk6CisgICAgICAgICogYnJpZGdlL29iamMv b2JqY19ydW50aW1lLm1tOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6T2JqY0ZpZWxkOjpPYmpj RmllbGQpOgorICAgICAgICAqIHBhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbToKKwogMjAxMS0w OS0yMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJl bW92ZSBXaWRnZXQ6OmJlZm9yZU1vdXNlRG93biBhbmQgV2lkZ2V0OjphZnRlck1vdXNlRG93bgpJ bmRleDogU291cmNlL1dlYkNvcmUvYnJpZGdlL29iamMvb2JqY19jbGFzcy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uvb2JqYy9vYmpjX2NsYXNzLm1tCShyZXZpc2lvbiA5 NTY3MikKKysrIFNvdXJjZS9XZWJDb3JlL2JyaWRnZS9vYmpjL29iamNfY2xhc3MubW0JKHdvcmtp bmcgY29weSkKQEAgLTk2LDUxICs5NiwzNCBAQCBNZXRob2RMaXN0IE9iamNDbGFzczo6bWV0aG9k c05hbWVkKGNvbnN0CiAKICAgICBDbGFzc1N0cnVjdFB0ciB0aGlzQ2xhc3MgPSBfaXNhOwogICAg IHdoaWxlICh0aGlzQ2xhc3MgJiYgbWV0aG9kTGlzdC5pc0VtcHR5KCkpIHsKLSNpZiBkZWZpbmVk KE9CSkNfQVBJX1ZFUlNJT04pICYmIE9CSkNfQVBJX1ZFUlNJT04gPj0gMgogICAgICAgICB1bnNp Z25lZCBudW1NZXRob2RzSW5DbGFzcyA9IDA7CiAgICAgICAgIE1ldGhvZFN0cnVjdFB0ciogb2Jq Y01ldGhvZExpc3QgPSBjbGFzc19jb3B5TWV0aG9kTGlzdCh0aGlzQ2xhc3MsICZudW1NZXRob2Rz SW5DbGFzcyk7Ci0jZWxzZQotICAgICAgICB2b2lkKiBpdGVyYXRvciA9IDA7Ci0gICAgICAgIHN0 cnVjdCBvYmpjX21ldGhvZF9saXN0KiBvYmpjTWV0aG9kTGlzdDsKLSAgICAgICAgd2hpbGUgKChv YmpjTWV0aG9kTGlzdCA9IGNsYXNzX25leHRNZXRob2RMaXN0KHRoaXNDbGFzcywgJml0ZXJhdG9y KSkpIHsKLSAgICAgICAgICAgIHVuc2lnbmVkIG51bU1ldGhvZHNJbkNsYXNzID0gb2JqY01ldGhv ZExpc3QtPm1ldGhvZF9jb3VudDsKLSNlbmRpZgotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IG51bU1ldGhvZHNJbkNsYXNzOyBpKyspIHsKLSNpZiBkZWZpbmVkKE9CSkNfQVBJ X1ZFUlNJT04pICYmIE9CSkNfQVBJX1ZFUlNJT04gPj0gMgotICAgICAgICAgICAgICAgIE1ldGhv ZFN0cnVjdFB0ciBvYmpjTWV0aG9kID0gb2JqY01ldGhvZExpc3RbaV07Ci0gICAgICAgICAgICAg ICAgU0VMIG9iamNNZXRob2RTZWxlY3RvciA9IG1ldGhvZF9nZXROYW1lKG9iamNNZXRob2QpOwot I2Vsc2UKLSAgICAgICAgICAgICAgICBzdHJ1Y3Qgb2JqY19tZXRob2QqIG9iamNNZXRob2QgPSAm b2JqY01ldGhvZExpc3QtPm1ldGhvZF9saXN0W2ldOwotICAgICAgICAgICAgICAgIFNFTCBvYmpj TWV0aG9kU2VsZWN0b3IgPSBvYmpjTWV0aG9kLT5tZXRob2RfbmFtZTsKLSNlbmRpZgotICAgICAg ICAgICAgICAgIGNvbnN0IGNoYXIqIG9iamNNZXRob2RTZWxlY3Rvck5hbWUgPSBzZWxfZ2V0TmFt ZShvYmpjTWV0aG9kU2VsZWN0b3IpOwotICAgICAgICAgICAgICAgIE5TU3RyaW5nKiBtYXBwZWRO YW1lID0gbmlsOworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbnVtTWV0aG9kc0lu Q2xhc3M7IGkrKykgeworICAgICAgICAgICAgTWV0aG9kU3RydWN0UHRyIG9iamNNZXRob2QgPSBv YmpjTWV0aG9kTGlzdFtpXTsKKyAgICAgICAgICAgIFNFTCBvYmpjTWV0aG9kU2VsZWN0b3IgPSBt ZXRob2RfZ2V0TmFtZShvYmpjTWV0aG9kKTsKKyAgICAgICAgICAgIGNvbnN0IGNoYXIqIG9iamNN ZXRob2RTZWxlY3Rvck5hbWUgPSBzZWxfZ2V0TmFtZShvYmpjTWV0aG9kU2VsZWN0b3IpOworICAg ICAgICAgICAgTlNTdHJpbmcqIG1hcHBlZE5hbWUgPSBuaWw7CiAKLSAgICAgICAgICAgICAgICAv LyBTZWUgaWYgdGhlIGNsYXNzIHdhbnRzIHRvIGV4Y2x1ZGUgdGhlIHNlbGVjdG9yIGZyb20gdmlz aWJpbGl0eSBpbiBKYXZhU2NyaXB0LgotICAgICAgICAgICAgICAgIGlmIChbdGhpc0NsYXNzIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoaXNTZWxlY3RvckV4Y2x1ZGVkRnJvbVdlYlNjcmlw dDopXSkKLSAgICAgICAgICAgICAgICAgICAgaWYgKFt0aGlzQ2xhc3MgaXNTZWxlY3RvckV4Y2x1 ZGVkRnJvbVdlYlNjcmlwdDpvYmpjTWV0aG9kU2VsZWN0b3JdKQotICAgICAgICAgICAgICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgICAgICAvLyBTZWUgaWYgdGhlIGNsYXNzIHdhbnRzIHRv IGV4Y2x1ZGUgdGhlIHNlbGVjdG9yIGZyb20gdmlzaWJpbGl0eSBpbiBKYXZhU2NyaXB0LgorICAg ICAgICAgICAgaWYgKFt0aGlzQ2xhc3MgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihpc1Nl bGVjdG9yRXhjbHVkZWRGcm9tV2ViU2NyaXB0OildKQorICAgICAgICAgICAgICAgIGlmIChbdGhp c0NsYXNzIGlzU2VsZWN0b3JFeGNsdWRlZEZyb21XZWJTY3JpcHQ6b2JqY01ldGhvZFNlbGVjdG9y XSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgICAgICAgICAvLyBT ZWUgaWYgdGhlIGNsYXNzIHdhbnQgdG8gcHJvdmlkZSBhIGRpZmZlcmVudCBuYW1lIGZvciB0aGUg c2VsZWN0b3IgaW4gSmF2YVNjcmlwdC4KLSAgICAgICAgICAgICAgICAvLyBOb3RlIHRoYXQgd2Ug ZG8gbm90IGRvIGFueSBjaGVja3MgdG8gZ3VhcmFudGVlIHVuaXF1ZW5lc3MuIFRoYXQncyB0aGUg cmVzcG9uc2libGl0eQotICAgICAgICAgICAgICAgIC8vIG9mIHRoZSBjbGFzcy4KLSAgICAgICAg ICAgICAgICBpZiAoW3RoaXNDbGFzcyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlNj cmlwdE5hbWVGb3JTZWxlY3RvcjopXSkKLSAgICAgICAgICAgICAgICAgICAgbWFwcGVkTmFtZSA9 IFt0aGlzQ2xhc3Mgd2ViU2NyaXB0TmFtZUZvclNlbGVjdG9yOm9iamNNZXRob2RTZWxlY3Rvcl07 CisgICAgICAgICAgICAvLyBTZWUgaWYgdGhlIGNsYXNzIHdhbnQgdG8gcHJvdmlkZSBhIGRpZmZl cmVudCBuYW1lIGZvciB0aGUgc2VsZWN0b3IgaW4gSmF2YVNjcmlwdC4KKyAgICAgICAgICAgIC8v IE5vdGUgdGhhdCB3ZSBkbyBub3QgZG8gYW55IGNoZWNrcyB0byBndWFyYW50ZWUgdW5pcXVlbmVz cy4gVGhhdCdzIHRoZSByZXNwb25zaWJsaXR5CisgICAgICAgICAgICAvLyBvZiB0aGUgY2xhc3Mu CisgICAgICAgICAgICBpZiAoW3RoaXNDbGFzcyByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KHdlYlNjcmlwdE5hbWVGb3JTZWxlY3RvcjopXSkKKyAgICAgICAgICAgICAgICBtYXBwZWROYW1l ID0gW3RoaXNDbGFzcyB3ZWJTY3JpcHROYW1lRm9yU2VsZWN0b3I6b2JqY01ldGhvZFNlbGVjdG9y XTsKIAotICAgICAgICAgICAgICAgIGlmICgobWFwcGVkTmFtZSAmJiBbbWFwcGVkTmFtZSBpc0Vx dWFsOihOU1N0cmluZyopbWV0aG9kTmFtZS5nZXQoKV0pIHx8IHN0cmNtcChvYmpjTWV0aG9kU2Vs ZWN0b3JOYW1lLCBidWZmZXIpID09IDApIHsKLSAgICAgICAgICAgICAgICAgICAgTWV0aG9kKiBh TWV0aG9kID0gbmV3IE9iamNNZXRob2QodGhpc0NsYXNzLCBvYmpjTWV0aG9kU2VsZWN0b3IpOyAv LyBkZWxldGVkIHdoZW4gdGhlIGRpY3Rpb25hcnkgaXMgZGVzdHJveWVkCi0gICAgICAgICAgICAg ICAgICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKF9tZXRob2RzLmdldCgpLCBtZXRob2ROYW1lLmdl dCgpLCBhTWV0aG9kKTsKLSAgICAgICAgICAgICAgICAgICAgbWV0aG9kTGlzdC5hcHBlbmQoYU1l dGhvZCk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIGlmICgobWFwcGVkTmFtZSAmJiBbbWFwcGVkTmFtZSBpc0VxdWFsOihOU1N0cmlu ZyopbWV0aG9kTmFtZS5nZXQoKV0pIHx8IHN0cmNtcChvYmpjTWV0aG9kU2VsZWN0b3JOYW1lLCBi dWZmZXIpID09IDApIHsKKyAgICAgICAgICAgICAgICBNZXRob2QqIGFNZXRob2QgPSBuZXcgT2Jq Y01ldGhvZCh0aGlzQ2xhc3MsIG9iamNNZXRob2RTZWxlY3Rvcik7IC8vIGRlbGV0ZWQgd2hlbiB0 aGUgZGljdGlvbmFyeSBpcyBkZXN0cm95ZWQKKyAgICAgICAgICAgICAgICBDRkRpY3Rpb25hcnlB ZGRWYWx1ZShfbWV0aG9kcy5nZXQoKSwgbWV0aG9kTmFtZS5nZXQoKSwgYU1ldGhvZCk7CisgICAg ICAgICAgICAgICAgbWV0aG9kTGlzdC5hcHBlbmQoYU1ldGhvZCk7CisgICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICB9Ci0jaWYgZGVmaW5lZChPQkpDX0FQSV9WRVJTSU9OKSAmJiBP QkpDX0FQSV9WRVJTSU9OID49IDIKLSAgICAgICAgICAgIHRoaXNDbGFzcyA9IGNsYXNzX2dldFN1 cGVyY2xhc3ModGhpc0NsYXNzKTsKLSAgICAgICAgICAgIGZyZWUob2JqY01ldGhvZExpc3QpOwot I2Vsc2UKICAgICAgICAgfQotICAgICAgICB0aGlzQ2xhc3MgPSB0aGlzQ2xhc3MtPnN1cGVyX2Ns YXNzOwotI2VuZGlmCisgICAgICAgIHRoaXNDbGFzcyA9IGNsYXNzX2dldFN1cGVyY2xhc3ModGhp c0NsYXNzKTsKKyAgICAgICAgZnJlZShvYmpjTWV0aG9kTGlzdCk7CiAgICAgfQogCiAgICAgaWYg KGJ1ZmZlciAhPSBmaXhlZFNpemVCdWZmZXIpCkBAIC0xOTEsNDggKzE3NCwzNCBAQCBGaWVsZCog T2JqY0NsYXNzOjpmaWVsZE5hbWVkKGNvbnN0IElkZW50CiAgICAgICAgIC8vIGludHJvc3BlY3Rp b24uCiAKICAgICAgICAgd2hpbGUgKHRoaXNDbGFzcykgewotI2lmIGRlZmluZWQoT0JKQ19BUElf VkVSU0lPTikgJiYgT0JKQ19BUElfVkVSU0lPTiA+PSAyCiAgICAgICAgICAgICB1bnNpZ25lZCBu dW1GaWVsZHNJbkNsYXNzID0gMDsKICAgICAgICAgICAgIEl2YXJTdHJ1Y3RQdHIqIGl2YXJzSW5D bGFzcyA9IGNsYXNzX2NvcHlJdmFyTGlzdCh0aGlzQ2xhc3MsICZudW1GaWVsZHNJbkNsYXNzKTsK LSNlbHNlCi0gICAgICAgICAgICBzdHJ1Y3Qgb2JqY19pdmFyX2xpc3QqIGZpZWxkc0luQ2xhc3Mg PSB0aGlzQ2xhc3MtPml2YXJzOwotICAgICAgICAgICAgaWYgKGZpZWxkc0luQ2xhc3MpIHsKLSAg ICAgICAgICAgICAgICB1bnNpZ25lZCBudW1GaWVsZHNJbkNsYXNzID0gZmllbGRzSW5DbGFzcy0+ aXZhcl9jb3VudDsKLSNlbmRpZgotICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBudW1GaWVsZHNJbkNsYXNzOyBpKyspIHsKLSNpZiBkZWZpbmVkKE9CSkNfQVBJX1ZFUlNJ T04pICYmIE9CSkNfQVBJX1ZFUlNJT04gPj0gMgotICAgICAgICAgICAgICAgICAgICBJdmFyU3Ry dWN0UHRyIG9iamNJVmFyID0gaXZhcnNJbkNsYXNzW2ldOwotICAgICAgICAgICAgICAgICAgICBj b25zdCBjaGFyKiBvYmpjSXZhck5hbWUgPSBpdmFyX2dldE5hbWUob2JqY0lWYXIpOwotI2Vsc2UK LSAgICAgICAgICAgICAgICAgICAgSXZhclN0cnVjdFB0ciBvYmpjSVZhciA9ICZmaWVsZHNJbkNs YXNzLT5pdmFyX2xpc3RbaV07Ci0gICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIqIG9iamNJ dmFyTmFtZSA9IG9iamNJVmFyLT5pdmFyX25hbWU7Ci0jZW5kaWYKLSAgICAgICAgICAgICAgICAg ICAgTlNTdHJpbmcqIG1hcHBlZE5hbWUgPSAwOwotCi0gICAgICAgICAgICAgICAgICAgIC8vIFNl ZSBpZiB0aGUgY2xhc3Mgd2FudHMgdG8gZXhjbHVkZSB0aGUgc2VsZWN0b3IgZnJvbSB2aXNpYmls aXR5IGluIEphdmFTY3JpcHQuCi0gICAgICAgICAgICAgICAgICAgIGlmIChbdGhpc0NsYXNzIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoaXNLZXlFeGNsdWRlZEZyb21XZWJTY3JpcHQ6KV0p Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoW3RoaXNDbGFzcyBpc0tleUV4Y2x1ZGVkRnJv bVdlYlNjcmlwdDpvYmpjSXZhck5hbWVdKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgICAgICAgICAgICAgIC8vIFNlZSBpZiB0aGUgY2xhc3Mgd2FudCB0 byBwcm92aWRlIGEgZGlmZmVyZW50IG5hbWUgZm9yIHRoZSBzZWxlY3RvciBpbiBKYXZhU2NyaXB0 LgotICAgICAgICAgICAgICAgICAgICAvLyBOb3RlIHRoYXQgd2UgZG8gbm90IGRvIGFueSBjaGVj a3MgdG8gZ3VhcmFudGVlIHVuaXF1ZW5lc3MuIFRoYXQncyB0aGUgcmVzcG9uc2libGl0eQotICAg ICAgICAgICAgICAgICAgICAvLyBvZiB0aGUgY2xhc3MuCi0gICAgICAgICAgICAgICAgICAgIGlm IChbdGhpc0NsYXNzIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViU2NyaXB0TmFtZUZv cktleTopXSkKLSAgICAgICAgICAgICAgICAgICAgICAgIG1hcHBlZE5hbWUgPSBbdGhpc0NsYXNz IHdlYlNjcmlwdE5hbWVGb3JLZXk6b2JqY0l2YXJOYW1lXTsKLQotICAgICAgICAgICAgICAgICAg ICBpZiAoKG1hcHBlZE5hbWUgJiYgW21hcHBlZE5hbWUgaXNFcXVhbDooTlNTdHJpbmcqKWZpZWxk TmFtZS5nZXQoKV0pIHx8IHN0cmNtcChvYmpjSXZhck5hbWUsIGpzTmFtZS5kYXRhKCkpID09IDAp IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGFGaWVsZCA9IG5ldyBPYmpjRmllbGQob2JqY0lW YXIpOyAvLyBkZWxldGVkIHdoZW4gdGhlIGRpY3Rpb25hcnkgaXMgZGVzdHJveWVkCi0gICAgICAg ICAgICAgICAgICAgICAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShfZmllbGRzLmdldCgpLCBmaWVs ZE5hbWUuZ2V0KCksIGFGaWVsZCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgbnVtRmllbGRzSW5DbGFzczsgaSsrKSB7CisgICAgICAgICAgICAgICAgSXZhclN0cnVjdFB0 ciBvYmpjSVZhciA9IGl2YXJzSW5DbGFzc1tpXTsKKyAgICAgICAgICAgICAgICBjb25zdCBjaGFy KiBvYmpjSXZhck5hbWUgPSBpdmFyX2dldE5hbWUob2JqY0lWYXIpOworICAgICAgICAgICAgICAg IE5TU3RyaW5nKiBtYXBwZWROYW1lID0gMDsKKworICAgICAgICAgICAgICAgIC8vIFNlZSBpZiB0 aGUgY2xhc3Mgd2FudHMgdG8gZXhjbHVkZSB0aGUgc2VsZWN0b3IgZnJvbSB2aXNpYmlsaXR5IGlu IEphdmFTY3JpcHQuCisgICAgICAgICAgICAgICAgaWYgKFt0aGlzQ2xhc3MgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3Rvcihpc0tleUV4Y2x1ZGVkRnJvbVdlYlNjcmlwdDopXSkKKyAgICAgICAg ICAgICAgICAgICAgaWYgKFt0aGlzQ2xhc3MgaXNLZXlFeGNsdWRlZEZyb21XZWJTY3JpcHQ6b2Jq Y0l2YXJOYW1lXSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAg ICAgICAgICAgLy8gU2VlIGlmIHRoZSBjbGFzcyB3YW50IHRvIHByb3ZpZGUgYSBkaWZmZXJlbnQg bmFtZSBmb3IgdGhlIHNlbGVjdG9yIGluIEphdmFTY3JpcHQuCisgICAgICAgICAgICAgICAgLy8g Tm90ZSB0aGF0IHdlIGRvIG5vdCBkbyBhbnkgY2hlY2tzIHRvIGd1YXJhbnRlZSB1bmlxdWVuZXNz LiBUaGF0J3MgdGhlIHJlc3BvbnNpYmxpdHkKKyAgICAgICAgICAgICAgICAvLyBvZiB0aGUgY2xh c3MuCisgICAgICAgICAgICAgICAgaWYgKFt0aGlzQ2xhc3MgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3Rvcih3ZWJTY3JpcHROYW1lRm9yS2V5OildKQorICAgICAgICAgICAgICAgICAgICBtYXBw ZWROYW1lID0gW3RoaXNDbGFzcyB3ZWJTY3JpcHROYW1lRm9yS2V5Om9iamNJdmFyTmFtZV07CisK KyAgICAgICAgICAgICAgICBpZiAoKG1hcHBlZE5hbWUgJiYgW21hcHBlZE5hbWUgaXNFcXVhbDoo TlNTdHJpbmcqKWZpZWxkTmFtZS5nZXQoKV0pIHx8IHN0cmNtcChvYmpjSXZhck5hbWUsIGpzTmFt ZS5kYXRhKCkpID09IDApIHsKKyAgICAgICAgICAgICAgICAgICAgYUZpZWxkID0gbmV3IE9iamNG aWVsZChvYmpjSVZhcik7IC8vIGRlbGV0ZWQgd2hlbiB0aGUgZGljdGlvbmFyeSBpcyBkZXN0cm95 ZWQKKyAgICAgICAgICAgICAgICAgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoX2ZpZWxkcy5nZXQo KSwgZmllbGROYW1lLmdldCgpLCBhRmllbGQpOworICAgICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgICAgICB9Ci0jaWYgZGVmaW5lZChPQkpDX0FQSV9WRVJTSU9OKSAmJiBPQkpD X0FQSV9WRVJTSU9OID49IDIKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgdGhpc0NsYXNz ID0gY2xhc3NfZ2V0U3VwZXJjbGFzcyh0aGlzQ2xhc3MpOwogICAgICAgICAgICAgZnJlZShpdmFy c0luQ2xhc3MpOwotI2Vsc2UKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHRoaXNDbGFzcyA9 IHRoaXNDbGFzcy0+c3VwZXJfY2xhc3M7Ci0jZW5kaWYKICAgICAgICAgfQogICAgIH0KIApJbmRl eDogU291cmNlL1dlYkNvcmUvYnJpZGdlL29iamMvb2JqY19pbnN0YW5jZS5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9icmlkZ2Uvb2JqYy9vYmpjX2luc3RhbmNlLm1tCShyZXZpc2lv biA5NTY3MikKKysrIFNvdXJjZS9XZWJDb3JlL2JyaWRnZS9vYmpjL29iamNfaW5zdGFuY2UubW0J KHdvcmtpbmcgY29weSkKQEAgLTEzMCwxMyArMTMwLDEyIEBAIE9iamNJbnN0YW5jZTo6fk9iamNJ bnN0YW5jZSgpIAogCiBzdGF0aWMgTlNBdXRvcmVsZWFzZVBvb2wqIGFsbG9jYXRlQXV0b1JlbGVh c2VQb29sKCkKIHsKLSNpZiBkZWZpbmVkKE9CSkNfQVBJX1ZFUlNJT04pICYmIE9CSkNfQVBJX1ZF UlNJT04gPj0gMgogICAgIC8vIElmIEdDIGlzIGVuYWJsZWQgYW4gYXV0b3JlbGVhc2UgcG9vbCBp cyB1bm5lY2Vzc2FyeSwgYW5kIHRoZQogICAgIC8vIHBvb2wgY2Fubm90IGJlIHByb3RlY3RlZCBm cm9tIEdDIHNvIG1heSBiZSBjb2xsZWN0ZWQgbGVhZGluZwogICAgIC8vIHRvIGEgY3Jhc2ggd2hl biB3ZSB0cnkgdG8gZHJhaW4gdGhlIHJlbGVhc2UgcG9vbC4KICAgICBpZiAob2JqY19jb2xsZWN0 aW5nRW5hYmxlZCgpKQogICAgICAgICByZXR1cm4gbmlsOwotI2VuZGlmCisKICAgICByZXR1cm4g W1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2JyaWRnZS9vYmpjL29iamNfcnVudGltZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9icmlkZ2Uvb2JqYy9vYmpjX3J1bnRpbWUubW0JKHJldmlzaW9uIDk1NjcyKQorKysgU291 cmNlL1dlYkNvcmUvYnJpZGdlL29iamMvb2JqY19ydW50aW1lLm1tCSh3b3JraW5nIGNvcHkpCkBA IC03NiwxMSArNzYsNyBAQCBOU01ldGhvZFNpZ25hdHVyZSogT2JqY01ldGhvZDo6Z2V0TWV0aG9k CiAKIE9iamNGaWVsZDo6T2JqY0ZpZWxkKEl2YXIgaXZhcikgCiAgICAgOiBfaXZhcihpdmFyKQot I2lmIGRlZmluZWQoT0JKQ19BUElfVkVSU0lPTikgJiYgT0JKQ19BUElfVkVSU0lPTiA+PSAyCiAg ICAgLCBfbmFtZShBZG9wdENGLCBDRlN0cmluZ0NyZWF0ZVdpdGhDU3RyaW5nKDAsIGl2YXJfZ2V0 TmFtZShfaXZhciksIGtDRlN0cmluZ0VuY29kaW5nQVNDSUkpKQotI2Vsc2UKLSAgICAsIF9uYW1l KEFkb3B0Q0YsIENGU3RyaW5nQ3JlYXRlV2l0aENTdHJpbmcoMCwgX2l2YXItPml2YXJfbmFtZSwg a0NGU3RyaW5nRW5jb2RpbmdBU0NJSSkpCi0jZW5kaWYKIHsKIH0KIApJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQkocmV2aXNpb24gOTU2NzMpCisrKyBT b3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0JKHdvcmtpbmcgY29weSkK QEAgLTUyLDE1ICs1Miw2IEBACiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4KICNpbmNsdWRl IDx3dGYvU3RkTGliRXh0cmFzLmg+CiAKLSNpZiAhKGRlZmluZWQoT0JKQ19BUElfVkVSU0lPTikg JiYgT0JKQ19BUElfVkVSU0lPTiA+IDApCi1zdGF0aWMgaW5saW5lIElNUCBtZXRob2Rfc2V0SW1w bGVtZW50YXRpb24oTWV0aG9kIG0sIElNUCBpKQotewotICAgIElNUCBvaSA9IG0tPm1ldGhvZF9p bXA7Ci0gICAgbS0+bWV0aG9kX2ltcCA9IGk7Ci0gICAgcmV0dXJuIG9pOwotfQotI2VuZGlmCi0K IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCkluZGV4OiBT b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCShyZXZpc2lvbiA5NTY3NCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDExLTA5LTIxICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGNoZWNrcyBm b3IgTGVvcGFyZC1vbmx5IE9iamVjdGl2ZS1DIEFQSXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY2FuIGFsd2F5cyBhc3N1bWUgdGhhdCBPQkpDX0FQ SV9WRVJTSU9OIGlzIGF0IGxlYXN0IDIsIGl0J3MgYmVlbiAyIHNpbmNlIExlb3BhcmQuCisKKyAg ICAgICAgKiBNaXNjL1dlYk5TT2JqZWN0RXh0cmFzLmg6CisKIDIwMTEtMDktMjEgIEFuZHJhcyBC ZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBSZW1vdmUgUXQg c3BlY2lmaWMgY29kZSBmcm9tIGNzcy9TZWxlY3RvckNoZWNrZXIuY3BwCkluZGV4OiBTb3VyY2Uv V2ViS2l0L21hYy9NaXNjL1dlYk5TT2JqZWN0RXh0cmFzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9tYWMvTWlzYy9XZWJOU09iamVjdEV4dHJhcy5oCShyZXZpc2lvbiA5NTY0NykKKysr IFNvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViTlNPYmplY3RFeHRyYXMuaAkod29ya2luZyBjb3B5 KQpAQCAtNDIsMTcgKzQyLDYgQEAgc3RhdGljIGlubGluZSBpZCBXZWJDRkF1dG9yZWxlYXNlKENG VHlwZQogICAgIHJldHVybiAoaWQpb2JqOwogfQogCi0jaWYgIShkZWZpbmVkKE9CSkNfQVBJX1ZF UlNJT04pICYmIE9CSkNfQVBJX1ZFUlNJT04gPiAwKQotCi1zdGF0aWMgaW5saW5lIElNUCBtZXRo b2Rfc2V0SW1wbGVtZW50YXRpb24oTWV0aG9kIG0sIElNUCBpKQotewotICAgIElNUCBvaSA9IG0t Pm1ldGhvZF9pbXA7Ci0gICAgbS0+bWV0aG9kX2ltcCA9IGk7Ci0gICAgcmV0dXJuIG9pOwotfQot Ci0jZW5kaWYKLQogQGludGVyZmFjZSBOU09iamVjdCAoV2ViTlNPYmplY3RFeHRyYXMpCiArIChp ZClfd2Via2l0X2ludm9rZU9uTWFpblRocmVhZDsKIC0gKGlkKV93ZWJraXRfaW52b2tlT25NYWlu VGhyZWFkOwo=