50640 2010-12-07 12:02:03 -0800 Move DOMWindow::setLocation logic into DOMWindow class and out of JavaScript binding 2010-12-10 16:23:16 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin aroben ossy rniwa webkit.review.bot oldest_to_newest 318374 0 darin 2010-12-07 12:02:03 -0800 Move DOMWindow::setLocation logic into DOMWindow class and out of JavaScript binding 318379 1 75834 darin 2010-12-07 12:06:33 -0800 Created attachment 75834 Patch 318397 2 75834 ggaren 2010-12-07 12:34:06 -0800 Comment on attachment 75834 Patch r=me 318618 3 webkit.review.bot 2010-12-07 21:45:39 -0800 Attachment 75834 did not pass style-queue: Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Updating OpenSource Incomplete data: Delta source ended unexpectedly at /usr/lib/git-core/git-svn line 5061 Died at WebKitTools/Scripts/update-webkit line 132. If any of these errors are false positives, please file a bug against check-webkit-style. 318795 4 darin 2010-12-08 08:22:47 -0800 Committed r73521: <http://trac.webkit.org/changeset/73521> 318845 5 ossy 2010-12-08 09:59:29 -0800 It broke the whole world. :o Could you guys fix it? 318874 6 darin 2010-12-08 10:36:33 -0800 I am in meetings all day and won’t have time to address this. Can someone roll it out for me? Sorry! 318893 7 ossy 2010-12-08 11:03:45 -0800 (In reply to comment #6) > I am in meetings all day and won’t have time to address this. Can someone roll it out for me? > > Sorry! Rolled out by http://trac.webkit.org/changeset/73532 318900 8 aroben 2010-12-08 11:13:56 -0800 I filed bug 50699 about the failures, but I guess we don't need it anymore. 319017 9 75834 ap 2010-12-08 14:05:09 -0800 Comment on attachment 75834 Patch Clearing review+ flag, since this has been rolled out. 319718 10 darin 2010-12-09 14:24:49 -0800 Committed r73647: <http://trac.webkit.org/changeset/73647> 319789 11 rniwa 2010-12-09 16:50:51 -0800 This broke XSS tests: http://build.webkit.org/results/Leopard%20Intel%20Debug%20(Tests)/r73656%20(24484)/results.html 319790 12 rniwa 2010-12-09 16:51:46 -0800 (In reply to comment #11) > This broke XSS tests: http://build.webkit.org/results/Leopard%20Intel%20Debug%20(Tests)/r73656%20(24484)/results.html I should have said "it seems like" this change broke XSS tests. 320492 13 darin 2010-12-10 16:23:16 -0800 (In reply to comment #12) > (In reply to comment #11) > > This broke XSS tests: http://build.webkit.org/results/Leopard%20Intel%20Debug%20(Tests)/r73656%20(24484)/results.html > > I should have said "it seems like" this change broke XSS tests. Yes, it broke those and the fix was <http://trac.webkit.org/changeset/73660>. Do you think there’s anything still broken after r73660? 75834 2010-12-07 12:06:33 -0800 2010-12-08 14:05:09 -0800 Patch bug-50640-20101207120631.patch text/plain 10593 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzQ1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMTItMDcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUg RE9NV2luZG93OjpzZXRMb2NhdGlvbiBsb2dpYyBpbnRvIERPTVdpbmRvdyBjbGFzcyBhbmQgb3V0 IG9mIEphdmFTY3JpcHQgYmluZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTA2NDAKKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NQmluZGlu Zy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmludEVycm9yTWVzc2FnZUZvckZyYW1lKTogUmVt b3ZlZCBib2R5OyBqdXN0IGNhbGwgdGhyb3VnaCB0bworICAgICAgICBET01XaW5kb3c6OnByaW50 RXJyb3JNZXNzYWdlLgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNET01XaW5kb3dCYXNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkpTRE9NV2luZG93QmFzZTo6Y3Jvc3NEb21haW5BY2Nlc3NF cnJvck1lc3NhZ2UpOiBSZW1vdmVkIGJvZHk7CisgICAgICAgIGp1c3QgY2FsbCB0aHJvdWdoIHRv IERPTVdpbmRvdzo6Y3Jvc3NEb21haW5BY2Nlc3NFcnJvck1lc3NhZ2UuCisKKyAgICAgICAgKiBi aW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RP TVdpbmRvdzo6c2V0TG9jYXRpb24pOiBDaGFuZ2VkIHRlcm1pbm9sb2d5IHRvIHVzZSBhY3RpdmVG cmFtZSBhbmQKKyAgICAgICAgZmlyc3RGcmFtZSwgcmF0aGVyIHRoYW4gdGhlIG9sZGVyIGxleGlj YWxGcmFtZSBhbmQgZHluYW1pY0ZyYW1lLiBSZW1vdmVkIG1vc3QKKyAgICAgICAgb2YgdGhlIGJv ZHkgYW5kIG1vdmVkIGl0IGludG8gRE9NV2luZG93OjpzZXRMb2NhdGlvbi4KKworICAgICAgICAq IHBhZ2UvRE9NV2luZG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6c2V0TG9j YXRpb24pOiBBZGRlZC4gRG9lcyBhbGwgdGhlIHNhbWUgd29yayB0aGF0CisgICAgICAgIEpTRE9N V2luZG93OjpzZXRMb2NhdGlvbiB1c2VkIHRvIGRvLCBidXQgaW4gYSB3YXkgdGhhdCdzIG5vdCBz cGVjaWZpYworICAgICAgICB0byBKYXZhU2NyaXB0LgorICAgICAgICAoV2ViQ29yZTo6RE9NV2lu ZG93OjpwcmludEVycm9yTWVzc2FnZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6RE9NV2lu ZG93Ojpjcm9zc0RvbWFpbkFjY2Vzc0Vycm9yTWVzc2FnZSk6IEFkZGVkLgorCisgICAgICAgICog cGFnZS9ET01XaW5kb3cuaDogQWRkZWQgc2V0TG9jYXRpb24sIHByaW50RXJyb3JNZXNzYWdlLCBh bmQKKyAgICAgICAgY3Jvc3NEb21haW5BY2Nlc3NFcnJvck1lc3NhZ2UuCisKIDIwMTAtMTItMDcg IFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFudG9uaW8gR29tZXMuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGlu Zy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3Bw CShyZXZpc2lvbiA3MzQ0OSkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjk3LDE2ICs2OTcsNyBAQCB2b2lkIHByaW50RXJyb3JNZXNz YWdlRm9yRnJhbWUoRnJhbWUqIGZyCiB7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJu OwotICAgIGlmIChtZXNzYWdlLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgU2V0 dGluZ3MqIHNldHRpbmdzID0gZnJhbWUtPnNldHRpbmdzKCk7Ci0gICAgaWYgKCFzZXR0aW5ncykK LSAgICAgICAgcmV0dXJuOwotICAgIGlmIChzZXR0aW5ncy0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxl ZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBmcmFtZS0+ZG9tV2luZG93KCktPmNvbnNvbGUo KS0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1lc3Nh Z2VMZXZlbCwgbWVzc2FnZSwgMSwgU3RyaW5nKCkpOyAvLyBGSVhNRTogcHJvdmlkZSBhIHJlYWwg bGluZSBudW1iZXIgYW5kIHNvdXJjZSBVUkwuCisgICAgZnJhbWUtPmRvbVdpbmRvdygpLT5wcmlu dEVycm9yTWVzc2FnZShtZXNzYWdlKTsKIH0KIAogRnJhbWUqIHRvTGV4aWNhbEZyYW1lKEV4ZWNT dGF0ZSogZXhlYykKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dCYXNlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5jcHAJ KHJldmlzaW9uIDczNDQ5KQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NywxNCArNzcsNyBAQCBTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiBKU0RPTVdpbmRvd0Jhc2U6CiAKIFN0cmluZyBKU0RPTVdpbmRvd0Jhc2U6OmNyb3NzRG9t YWluQWNjZXNzRXJyb3JNZXNzYWdlKGNvbnN0IEpTR2xvYmFsT2JqZWN0KiBvdGhlcikgY29uc3QK IHsKLSAgICBLVVJMIG9yaWdpblVSTCA9IGFzSlNET01XaW5kb3cob3RoZXIpLT5pbXBsKCktPnVy bCgpOwotICAgIEtVUkwgdGFyZ2V0VVJMID0gZCgpLT5zaGVsbC0+d2luZG93KCktPmltcGwoKS0+ dXJsKCk7Ci0gICAgaWYgKG9yaWdpblVSTC5pc051bGwoKSB8fCB0YXJnZXRVUkwuaXNOdWxsKCkp Ci0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLQotICAgIC8vIEZJWE1FOiB0aGlzIGVycm9yIG1l c3NhZ2Ugc2hvdWxkIGNvbnRhaW4gbW9yZSBzcGVjaWZpY3Mgb2Ygd2h5IHRoZSBzYW1lIG9yaWdp biBjaGVjayBoYXMgZmFpbGVkLgotICAgIHJldHVybiBtYWtlU3RyaW5nKCJVbnNhZmUgSmF2YVNj cmlwdCBhdHRlbXB0IHRvIGFjY2VzcyBmcmFtZSB3aXRoIFVSTCAiLCB0YXJnZXRVUkwuc3RyaW5n KCksCi0gICAgICAgICAgICAgICAgICAgICAgIiBmcm9tIGZyYW1lIHdpdGggVVJMICIsIG9yaWdp blVSTC5zdHJpbmcoKSwgIi4gRG9tYWlucywgcHJvdG9jb2xzIGFuZCBwb3J0cyBtdXN0IG1hdGNo LlxuIik7CisgICAgcmV0dXJuIGltcGwoKS0+Y3Jvc3NEb21haW5BY2Nlc3NFcnJvck1lc3NhZ2Uo YXNKU0RPTVdpbmRvdyhvdGhlciktPmltcGwoKS0+ZnJhbWUoKSk7CiB9CiAKIHZvaWQgSlNET01X aW5kb3dCYXNlOjpwcmludEVycm9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UpIGNvbnN0 CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcAkocmV2aXNp b24gNzM0NDkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzQsMTEgKzM0LDYgQEAKICNpbmNsdWRlICJIVE1MRG9jdW1lbnQu aCIKICNpbmNsdWRlICJIaXN0b3J5LmgiCiAjaW5jbHVkZSAiSlNBdWRpb0NvbnN0cnVjdG9yLmgi Ci0KLSNpZiBFTkFCTEUoV0VCX0FVRElPKQotI2luY2x1ZGUgIkpTQXVkaW9Db250ZXh0LmgiCi0j ZW5kaWYKLQogI2luY2x1ZGUgIkpTRE9NV2luZG93U2hlbGwuaCIKICNpbmNsdWRlICJKU0V2ZW50 LmgiCiAjaW5jbHVkZSAiSlNFdmVudExpc3RlbmVyLmgiCkBAIC01MSwyNyArNDYsOCBAQAogI2lu Y2x1ZGUgIkpTTWVzc2FnZVBvcnQuaCIKICNpbmNsdWRlICJKU01lc3NhZ2VQb3J0Q3VzdG9tLmgi CiAjaW5jbHVkZSAiSlNPcHRpb25Db25zdHJ1Y3Rvci5oIgotCi0jaWYgRU5BQkxFKFNIQVJFRF9X T1JLRVJTKQotI2luY2x1ZGUgIkpTU2hhcmVkV29ya2VyLmgiCi0jZW5kaWYKLQotI2lmIEVOQUJM RSgzRF9DQU5WQVMpIHx8IEVOQUJMRShCTE9CKQotI2luY2x1ZGUgIkpTQXJyYXlCdWZmZXIuaCIK LSNpbmNsdWRlICJKU0RhdGFWaWV3LmgiCi0jaW5jbHVkZSAiSlNJbnQ4QXJyYXkuaCIKLSNpbmNs dWRlICJKU1VpbnQ4QXJyYXkuaCIKLSNpbmNsdWRlICJKU0ludDMyQXJyYXkuaCIKLSNpbmNsdWRl ICJKU1VpbnQzMkFycmF5LmgiCi0jaW5jbHVkZSAiSlNJbnQxNkFycmF5LmgiCi0jaW5jbHVkZSAi SlNVaW50MTZBcnJheS5oIgotI2luY2x1ZGUgIkpTRmxvYXQzMkFycmF5LmgiCi0jZW5kaWYKICNp bmNsdWRlICJKU1dlYktpdENTU01hdHJpeC5oIgogI2luY2x1ZGUgIkpTV2ViS2l0UG9pbnQuaCIK LSNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMpCi0jaW5jbHVkZSAiSlNXZWJTb2NrZXQuaCIKLSNlbmRp ZgogI2luY2x1ZGUgIkpTV29ya2VyLmgiCiAjaW5jbHVkZSAiSlNYTUxIdHRwUmVxdWVzdC5oIgog I2luY2x1ZGUgIkpTWFNMVFByb2Nlc3Nvci5oIgpAQCAtOTQsNiArNzAsMzAgQEAKICNpbmNsdWRl IDxydW50aW1lL1Byb3RvdHlwZUZ1bmN0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQXRvbWlj U3RyaW5nLmg+CiAKKyNpZiBFTkFCTEUoM0RfQ0FOVkFTKSB8fCBFTkFCTEUoQkxPQikKKyNpbmNs dWRlICJKU0FycmF5QnVmZmVyLmgiCisjaW5jbHVkZSAiSlNEYXRhVmlldy5oIgorI2luY2x1ZGUg IkpTRmxvYXQzMkFycmF5LmgiCisjaW5jbHVkZSAiSlNJbnQxNkFycmF5LmgiCisjaW5jbHVkZSAi SlNJbnQzMkFycmF5LmgiCisjaW5jbHVkZSAiSlNJbnQ4QXJyYXkuaCIKKyNpbmNsdWRlICJKU1Vp bnQxNkFycmF5LmgiCisjaW5jbHVkZSAiSlNVaW50MzJBcnJheS5oIgorI2luY2x1ZGUgIkpTVWlu dDhBcnJheS5oIgorI2VuZGlmCisKKyNpZiBFTkFCTEUoU0hBUkVEX1dPUktFUlMpCisjaW5jbHVk ZSAiSlNTaGFyZWRXb3JrZXIuaCIKKyNlbmRpZgorCisjaWYgRU5BQkxFKFdFQl9BVURJTykKKyNp bmNsdWRlICJKU0F1ZGlvQ29udGV4dC5oIgorI2VuZGlmCisKKyNpZiBFTkFCTEUoV0VCX1NPQ0tF VFMpCisjaW5jbHVkZSAiSlNXZWJTb2NrZXQuaCIKKyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2Ug SlNDOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC00OTAsMTUgKzQ5MCwxOCBAQCBKU1ZhbHVl IEpTRE9NV2luZG93Ojpsb2NhdGlvbihFeGVjU3RhdGUqCiAKIHZvaWQgSlNET01XaW5kb3c6OnNl dExvY2F0aW9uKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSkKIHsKLSAgICBGcmFtZSog bGV4aWNhbEZyYW1lID0gdG9MZXhpY2FsRnJhbWUoZXhlYyk7Ci0gICAgaWYgKCFsZXhpY2FsRnJh bWUpCisgICAgRnJhbWUqIGFjdGl2ZUZyYW1lID0gdG9MZXhpY2FsRnJhbWUoZXhlYyk7CisgICAg aWYgKCFhY3RpdmVGcmFtZSkKKyAgICAgICAgcmV0dXJuOworICAgIEZyYW1lKiBmaXJzdEZyYW1l ID0gdG9EeW5hbWljRnJhbWUoZXhlYyk7CisgICAgaWYgKCFmaXJzdEZyYW1lKQogICAgICAgICBy ZXR1cm47CiAKICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCiAgICAgLy8gVG8gYXZvaWQg YnJlYWtpbmcgb2xkIHdpZGdldHMsIG1ha2UgInZhciBsb2NhdGlvbiA9IiBpbiBhIHRvcC1sZXZl bCBmcmFtZSBjcmVhdGUKICAgICAvLyBhIHByb3BlcnR5IG5hbWVkICJsb2NhdGlvbiIgaW5zdGVh ZCBvZiBwZXJmb3JtaW5nIGEgbmF2aWdhdGlvbiAoPHJkYXI6Ly9wcm9ibGVtLzU2ODgwMzk+KS4K LSAgICBpZiAoU2V0dGluZ3MqIHNldHRpbmdzID0gbGV4aWNhbEZyYW1lLT5zZXR0aW5ncygpKSB7 Ci0gICAgICAgIGlmIChzZXR0aW5ncy0+dXNlc0Rhc2hib2FyZEJhY2t3YXJkQ29tcGF0aWJpbGl0 eU1vZGUoKSAmJiAhbGV4aWNhbEZyYW1lLT50cmVlKCktPnBhcmVudCgpKSB7CisgICAgaWYgKFNl dHRpbmdzKiBzZXR0aW5ncyA9IGFjdGl2ZUZyYW1lLT5zZXR0aW5ncygpKSB7CisgICAgICAgIGlm IChzZXR0aW5ncy0+dXNlc0Rhc2hib2FyZEJhY2t3YXJkQ29tcGF0aWJpbGl0eU1vZGUoKSAmJiAh YWN0aXZlRnJhbWUtPnRyZWUoKS0+cGFyZW50KCkpIHsKICAgICAgICAgICAgIGlmIChhbGxvd3NB Y2Nlc3NGcm9tKGV4ZWMpKQogICAgICAgICAgICAgICAgIHB1dERpcmVjdChJZGVudGlmaWVyKGV4 ZWMsICJsb2NhdGlvbiIpLCB2YWx1ZSk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC01MDYsMjEg KzUwOSwxMSBAQCB2b2lkIEpTRE9NV2luZG93OjpzZXRMb2NhdGlvbihFeGVjU3RhdGUqCiAgICAg fQogI2VuZGlmCiAKLSAgICBGcmFtZSogZnJhbWUgPSBpbXBsKCktPmZyYW1lKCk7Ci0gICAgQVNT RVJUKGZyYW1lKTsKLQotICAgIEtVUkwgdXJsID0gY29tcGxldGVVUkwoZXhlYywgdXN0cmluZ1Rv U3RyaW5nKHZhbHVlLnRvU3RyaW5nKGV4ZWMpKSk7Ci0gICAgaWYgKHVybC5pc051bGwoKSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgaWYgKCFzaG91bGRBbGxvd05hdmlnYXRpb24oZXhlYywgZnJh bWUpKQorICAgIFVTdHJpbmcgbG9jYXRpb25TdHJpbmcgPSB2YWx1ZS50b1N0cmluZyhleGVjKTsK KyAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlm ICghcHJvdG9jb2xJc0phdmFTY3JpcHQodXJsKSB8fCBhbGxvd3NBY2Nlc3NGcm9tKGV4ZWMpKSB7 Ci0gICAgICAgIC8vIFdlIHdhbnQgYSBuZXcgaGlzdG9yeSBpdGVtIGlmIHRoaXMgSlMgd2FzIGNh bGxlZCB2aWEgYSB1c2VyIGdlc3R1cmUuCi0gICAgICAgIGZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1 bGVyKCktPnNjaGVkdWxlTG9jYXRpb25DaGFuZ2UobGV4aWNhbEZyYW1lLT5kb2N1bWVudCgpLT5z ZWN1cml0eU9yaWdpbigpLAotICAgICAgICAgICAgdXJsLCBsZXhpY2FsRnJhbWUtPmxvYWRlcigp LT5vdXRnb2luZ1JlZmVycmVyKCksICFsZXhpY2FsRnJhbWUtPnNjcmlwdCgpLT5hbnlQYWdlSXNQ cm9jZXNzaW5nVXNlckdlc3R1cmUoKSwgZmFsc2UpOwotICAgIH0KKyAgICBpbXBsKCktPnNldExv Y2F0aW9uKHVzdHJpbmdUb1N0cmluZyhsb2NhdGlvblN0cmluZyksIGFjdGl2ZUZyYW1lLCBmaXJz dEZyYW1lKTsKIH0KIAogSlNWYWx1ZSBKU0RPTVdpbmRvdzo6Y3J5cHRvKEV4ZWNTdGF0ZSopIGNv bnN0CkluZGV4OiBXZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BhZ2UvRE9NV2luZG93LmNwcAkocmV2aXNpb24gNzM0NDkpCisrKyBXZWJDb3JlL3BhZ2Uv RE9NV2luZG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYxOCw0ICsxNjE4LDYxIEBAIHZvaWQg RE9NV2luZG93OjpyZXZva2VPYmplY3RVUkwoY29uc3QgU3QKIH0KICNlbmRpZgogCit2b2lkIERP TVdpbmRvdzo6c2V0TG9jYXRpb24oY29uc3QgU3RyaW5nJiBsb2NhdGlvbiwgRnJhbWUqIGFjdGl2 ZUZyYW1lLCBGcmFtZSogZmlyc3RGcmFtZSkKK3sKKyAgICBpZiAoIWFjdGl2ZUZyYW1lKQorICAg ICAgICByZXR1cm47CisgICAgaWYgKCFmaXJzdEZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAg ICBLVVJMIGxvY2F0aW9uVVJMID0gZmlyc3RGcmFtZS0+bG9hZGVyKCktPmNvbXBsZXRlVVJMKGxv Y2F0aW9uKTsKKyAgICBpZiAobG9jYXRpb25VUkwuaXNOdWxsKCkpCisgICAgICAgIHJldHVybjsK KworICAgIGlmICghYWN0aXZlRnJhbWUtPmxvYWRlcigpLT5zaG91bGRBbGxvd05hdmlnYXRpb24o bV9mcmFtZSkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChwcm90b2NvbElzSmF2YVNjcmlw dChsb2NhdGlvblVSTCkpIHsKKyAgICAgICAgLy8gRklYTUU6IElzIHRoZXJlIHNvbWUgd2F5IHRv IGVsaW1pbmF0ZSB0aGUgbmVlZCBmb3IgYSBzZXBhcmF0ZSAiYWN0aXZlRnJhbWUgIT0gbV9mcmFt ZSIgY2hlY2s/CisgICAgICAgIC8vIEZJWE1FOiBUaGUgbmFtZSBjYW5BY2Nlc3Mgc2VlbXMgdG8g YmUgYSByb3VuZGFib3V0IHdheSB0byBhc2sgImNhbiBleGVjdXRlIHNjcmlwdCIuCisgICAgICAg IC8vIENhbiB3ZSBuYW1lIHRoZSBTZWN1cml0eU9yaWdpbiBmdW5jdGlvbiBiZXR0ZXIgdG8gbWFr ZSB0aGlzIG1vcmUgY2xlYXI/CisgICAgICAgIGlmIChhY3RpdmVGcmFtZSAhPSBtX2ZyYW1lICYm ICFhY3RpdmVGcmFtZS0+ZG9tV2luZG93KCktPnNlY3VyaXR5T3JpZ2luKCktPmNhbkFjY2Vzcyhz ZWN1cml0eU9yaWdpbigpKSkgeworICAgICAgICAgICAgcHJpbnRFcnJvck1lc3NhZ2UoY3Jvc3NE b21haW5BY2Nlc3NFcnJvck1lc3NhZ2UoYWN0aXZlRnJhbWUpKTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorICAgIH0KKworICAgIC8vIFdlIHdhbnQgYSBuZXcgaGlzdG9yeSBpdGVt IGlmIHdlIGFyZSBwcm9jZXNzaW5nIGEgdXNlciBnZXN0dXJlLgorICAgIG1fZnJhbWUtPm5hdmln YXRpb25TY2hlZHVsZXIoKS0+c2NoZWR1bGVMb2NhdGlvbkNoYW5nZShhY3RpdmVGcmFtZS0+ZG9j dW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwKKyAgICAgICAgbG9jYXRpb25VUkwsIGFjdGl2ZUZy YW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpLAorICAgICAgICAhYWN0aXZlRnJhbWUt PnNjcmlwdCgpLT5hbnlQYWdlSXNQcm9jZXNzaW5nVXNlckdlc3R1cmUoKSwgZmFsc2UpOworfQor Cit2b2lkIERPTVdpbmRvdzo6cHJpbnRFcnJvck1lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNzYWdl KQoreworICAgIGlmIChtZXNzYWdlLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAg U2V0dGluZ3MqIHNldHRpbmdzID0gbV9mcmFtZS0+c2V0dGluZ3MoKTsKKyAgICBpZiAoIXNldHRp bmdzKQorICAgICAgICByZXR1cm47CisgICAgaWYgKHNldHRpbmdzLT5wcml2YXRlQnJvd3NpbmdF bmFibGVkKCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIEZJWE1FOiBBZGQgYXJndW1lbnRz IHNvIHRoYXQgd2UgY2FuIHByb3ZpZGUgYSBjb3JyZWN0IHNvdXJjZSBVUkwgYW5kIGxpbmUgbnVt YmVyLgorICAgIGNvbnNvbGUoKS0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3Nh Z2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgMSwgU3RyaW5nKCkpOworfQorCitT dHJpbmcgRE9NV2luZG93Ojpjcm9zc0RvbWFpbkFjY2Vzc0Vycm9yTWVzc2FnZShGcmFtZSogYWN0 aXZlRnJhbWUpCit7CisgICAgY29uc3QgS1VSTCYgYWN0aXZlRnJhbWVVUkwgPSBhY3RpdmVGcmFt ZS0+ZG9tV2luZG93KCktPnVybCgpOworICAgIGlmIChhY3RpdmVGcmFtZVVSTC5pc051bGwoKSkK KyAgICAgICAgcmV0dXJuIFN0cmluZygpOworCisgICAgLy8gRklYTUU6IFRoaXMgZXJyb3IgbWVz c2FnZSBzaG91bGQgY29udGFpbiBtb3JlIHNwZWNpZmljcyBvZiB3aHkgdGhlIHNhbWUgb3JpZ2lu IGNoZWNrIGhhcyBmYWlsZWQuCisgICAgLy8gUGVyaGFwcyB3ZSBzaG91bGQgaW52b2x2ZSB0aGUg c2VjdXJpdHkgb3JpZ2luIG9iamVjdCBpbiBjb21wb3NpbmcgaXQuCisgICAgcmV0dXJuIG1ha2VT dHJpbmcoIlVuc2FmZSBKYXZhU2NyaXB0IGF0dGVtcHQgdG8gYWNjZXNzIGZyYW1lIHdpdGggVVJM ICIsIG1fdXJsLnN0cmluZygpLAorICAgICAgICAiIGZyb20gZnJhbWUgd2l0aCBVUkwgIiwgYWN0 aXZlRnJhbWVVUkwuc3RyaW5nKCksICIuIERvbWFpbnMsIHByb3RvY29scyBhbmQgcG9ydHMgbXVz dCBtYXRjaC4iKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9w YWdlL0RPTVdpbmRvdy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9ET01XaW5kb3cuaAko cmV2aXNpb24gNzM0NDkpCisrKyBXZWJDb3JlL3BhZ2UvRE9NV2luZG93LmgJKHdvcmtpbmcgY29w eSkKQEAgLTE0MSw2ICsxNDEsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjZW5kaWYKICAgICAg ICAgTG9jYXRpb24qIGxvY2F0aW9uKCkgY29uc3Q7CiAKKyAgICAgICAgdm9pZCBzZXRMb2NhdGlv bihjb25zdCBTdHJpbmcmIGxvY2F0aW9uLCBGcmFtZSogYWN0aXZlRnJhbWUsIEZyYW1lKiBmaXJz dEZyYW1lKTsKKwogICAgICAgICBET01TZWxlY3Rpb24qIGdldFNlbGVjdGlvbigpOwogCiAgICAg ICAgIEVsZW1lbnQqIGZyYW1lRWxlbWVudCgpIGNvbnN0OwpAQCAtMjI2LDYgKzIyOCw5IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBDb25zb2xlKiBjb25zb2xlKCkgY29uc3Q7CiAK KyAgICAgICAgdm9pZCBwcmludEVycm9yTWVzc2FnZShjb25zdCBTdHJpbmcmKTsKKyAgICAgICAg U3RyaW5nIGNyb3NzRG9tYWluQWNjZXNzRXJyb3JNZXNzYWdlKEZyYW1lKiBhY3RpdmVGcmFtZSk7 CisKICNpZiBFTkFCTEUoT0ZGTElORV9XRUJfQVBQTElDQVRJT05TKQogICAgICAgICBET01BcHBs aWNhdGlvbkNhY2hlKiBhcHBsaWNhdGlvbkNhY2hlKCkgY29uc3Q7CiAjZW5kaWYK