93382 2012-08-07 12:17:21 -0700 Rewire the same-origin checks for the JavaScriptCore bindings through BindingSecurity 2012-08-09 14:23:17 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93654 75793 93407 1 abarth abarth darin eric gyuyoung.kim ossy rakuco sam webkit.review.bot oldest_to_newest 689264 0 abarth 2012-08-07 12:17:21 -0700 Rewire the same-origin checks for the JavaScriptCore bindings through BindingSecurity 689272 1 156972 abarth 2012-08-07 12:23:48 -0700 Created attachment 156972 Patch 689275 2 156973 abarth 2012-08-07 12:25:09 -0700 Created attachment 156973 Patch 689290 3 156973 gyuyoung.kim 2012-08-07 12:47:02 -0700 Comment on attachment 156973 Patch Attachment 156973 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13445851 689332 4 156989 abarth 2012-08-07 13:30:43 -0700 Created attachment 156989 hopefully builds on EFL now 689347 5 156989 eric 2012-08-07 13:52:08 -0700 Comment on attachment 156989 hopefully builds on EFL now I wonder what, if any, perf affect this has on DOM benchmarks. 689354 6 abarth 2012-08-07 14:03:29 -0700 > I wonder what, if any, perf affect this has on DOM benchmarks. I'll run the perf tests before landing, but I don't expect any trouble. 689563 7 abarth 2012-08-07 16:12:17 -0700 The work to rewrite allowsAccessFrom through BindingSecurity is in Bug 93407. 689649 8 sam 2012-08-07 17:25:39 -0700 This seems OK to me, but I would like to see the extra indirect go away. A follow up patch would be fine for that. 689883 9 abarth 2012-08-07 22:24:33 -0700 Thanks. Will do. 691014 10 abarth 2012-08-08 17:41:09 -0700 Committed r125126: <http://trac.webkit.org/changeset/125126> 691834 11 ossy 2012-08-09 14:15:53 -0700 (In reply to comment #10) > Committed r125126: <http://trac.webkit.org/changeset/125126> It caused an assertion on Qt and on GTK. Could you check it, please? https://bugs.webkit.org/show_bug.cgi?id=93654 691844 12 abarth 2012-08-09 14:23:17 -0700 > It caused an assertion on Qt and on GTK. Could you check it, please? https://bugs.webkit.org/show_bug.cgi?id=93654 Certainly. 156972 2012-08-07 12:23:48 -0700 2012-08-07 12:25:07 -0700 Patch bug-93382-20120807122353.patch text/plain 5212 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdmYTBhMmFhNmY5YmM2 MDUxNjUxNmE5MzdmYTRlMDhjZWExMmZmNC4uOWNiYmVmODM1Nzc4NTM4Y2Q4NjAwZjM4ZmQ1Mzcy ZjZmODY2NWM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTA4LTA3ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV3aXJlIHRoZSBzYW1lLW9y aWdpbiBjaGVja3MgZm9yIHRoZSBKYXZhU2NyaXB0Q29yZSBiaW5kaW5ncyB0aHJvdWdoIEJpbmRp bmdTZWN1cml0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTMzODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIHBhdGNoIHJld2lyZXMgdGhlIHNhbWUtb3JpZ2luIHBvbGljeSBjaGVja3MgaW4gdGhl IEphdmFTY3JpcHRDb3JlCisgICAgICAgIGJpbmRpbmdzIHRvIHVzZSB0aGUgaW1wbGVtZW50YXRp b24gaW4gQmluZGluZ1NlY3VyaXR5LmNwcCwgd2hpY2ggaXMgbm93CisgICAgICAgIHNoYXJlZCBi eSBKYXZhU2NyaXB0Q29yZSBhbmQgVjguIFRoZXJlIGFyZSBzdGlsbCBhIGZldyBwbGFjZXMgd2Vy ZSB3ZQorICAgICAgICB1c2UgdGhlIEpTRE9NV2luZG93Q3VzdG9tLWJhc2VkIGNvZGUgcGF0aCwg YnV0IEkgcGxhbiB0byBjaGFuZ2UgdGhvc2UKKyAgICAgICAgaW4gYSBmb2xsb3cgdXAgcGF0Y2gg aW4gdGhlIGludGVyZXN0IG9mIGtlZXBpbmcgdGhpcyBwYXRjaCBhcyBzbWFsbCBhcworICAgICAg ICBwb3NzaWJsZS4KKworICAgICAgICBUaGlzIHBhdGNoIGFzIHR3byBtYWluIGJlbmVmaXRzOgor CisgICAgICAgIDEpIFdlIG5vIGxvbmdlciBuZWVkIHRvIG1haW50YWluIGR1cGxpY2F0ZSBjb2Rl IGluIHRoZSBKU0MgYW5kIHRoZSBWOAorICAgICAgICAgICBiaW5kaW5ncyBmb3IgYXMgZGVsaWNh dGUgYW4gYXJlYSBhcyB0aGUgc2FtZS1vcmlnaW4gY2hlY2suCisgICAgICAgICAgIFByZXZpb3Vz bHksIHRoZSB0d28gaW1wbGVtZW50YXRpb25zIGFjY29tcGxpc2hlZCB0aGUgc2FtZSB0YXNrIHVz aW5nCisgICAgICAgICAgIGEgc2xpZ2h0bHkgZGlmZmVyZW50IG1lY2hhbnNpbS4gQWZ0ZXIgdGhp cyBwYXRjaCwgdGhleSB1c2UgdGhlIHNhbWUKKyAgICAgICAgICAgbWVjaGFuaXNtLCB3aGljaCBt ZWFucyB3ZSBvbmx5IG5lZWQgdG8gY29udmluY2Ugb3Vyc2VsdmVzIHRoYXQgb25lCisgICAgICAg ICAgIGltcGxlbWVudGF0aW9uIGlzIGNvcnJlY3QuCisKKyAgICAgICAgMikgVGhpcyBwYXRjaCB3 aWxsIG1ha2UgaXQgZWFzaWVyIHRvIHJlbW92ZSBET01XaW5kb3c6Om1fc2VjdXJpdHlPcmlnaW4K KyAgICAgICAgICAgYmVjYXVzZSB0aGVyZSB3aWxsIGJlIG9ubHkgb25lIHBpZWNlIG9mIGNvZGUg dGhhdCBuZWVkcyB0byBjaGFuZ2UuCisgICAgICAgICAgIFByaW9yIHRvIHRoaXMgcGF0Y2gsIHdl IHdvdWxkIGhhdmUgaGFkIHRvIGNoYW5nZSBib3RoCisgICAgICAgICAgIGltcGxlbWVudGF0aW9u cyBvZiB0aGUgc2FtZS1vcmlnaW4gcG9saWN5IG5vdCB0byByZWx5IHVwb24KKyAgICAgICAgICAg RE9NV2luZG93OjptX3NlY3VyaXR5T3JpZ2luLgorCisgICAgICAgICogYmluZGluZ3MvanMvQmlu ZGluZ1N0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmltbWVkaWF0ZWx5UmVwb3J0VW5zYWZl QWNjZXNzVG8pOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogYmluZGluZ3MvanMvQmlu ZGluZ1N0YXRlLmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9K U0RPTUJpbmRpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkQWxsb3dBY2Nlc3NUb05v ZGUpOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKToKKwogMjAx Mi0wOC0wNyAgR2VvcmdlIFN0YWlrb3MgIDxzdGFpa29zQHdlYmtpdC5vcmc+CiAKICAgICAgICAg W0JsYWNrQmVycnldIFdlIHNob3VsZCBmYWlsIHRoZSBIVFRQIGF1dGggc2lsZW50bHkgZm9yIG5v bi1tYWluIGxvYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9CaW5k aW5nU3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvQmluZGluZ1N0YXRlLmNw cAppbmRleCA4MjU0NjhiNTdiOTUxOGVlZGUwNGY3YTMxOTlmODRiY2EwZmIwMTlkLi4zNDVhMzgy YzFiYzU0YzBkZTBlMWFkNzNiNDc2MTNmMGI5NmZlZjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9CaW5kaW5nU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0JpbmRpbmdTdGF0ZS5jcHAKQEAgLTQ3LDQgKzQ3LDEwIEBAIERPTVdpbmRvdyog Zmlyc3RET01XaW5kb3coRXhlY1N0YXRlKiBleGVjKQogICAgIHJldHVybiBhc0pTRE9NV2luZG93 KGV4ZWMtPmR5bmFtaWNHbG9iYWxPYmplY3QoKSktPmltcGwoKTsKIH0KIAordm9pZCBpbW1lZGlh dGVseVJlcG9ydFVuc2FmZUFjY2Vzc1RvKEV4ZWNTdGF0ZSogZXhlYywgRG9jdW1lbnQqIHRhcmdl dCkKK3sKKyAgICBET01XaW5kb3cqIGFjdGl2ZSA9IGFjdGl2ZURPTVdpbmRvdyhleGVjKTsKKyAg ICBwcmludEVycm9yTWVzc2FnZUZvckZyYW1lKHRhcmdldC0+ZnJhbWUoKSwgdGFyZ2V0LT5kb21X aW5kb3coKS0+Y3Jvc3NEb21haW5BY2Nlc3NFcnJvck1lc3NhZ2UoYWN0aXZlKSk7Cit9CisKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0JpbmRpbmdTdGF0ZS5oIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvQmluZGluZ1N0YXRlLmgKaW5kZXggMjgxYjliMzMz Y2RhYjQ1OTkwMDNhZmRkNTIwYmJhNWNiMWRlZTc3YS4uZGUxMzBmZTJiMWNjMGY0Mjk4MTMxZWUw NWFkMzI4MTg4M2M0ZTU4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv QmluZGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvQmluZGluZ1N0 YXRlLmgKQEAgLTQ4LDcgKzQ4LDcgQEAgRE9NV2luZG93KiBmaXJzdERPTVdpbmRvdyhCaW5kaW5n U3RhdGUqKTsKIGlubGluZSBGcmFtZSogYWN0aXZlRnJhbWUoQmluZGluZ1N0YXRlKikgeyByZXR1 cm4gMDsgfQogaW5saW5lIEZyYW1lKiBmaXJzdEZyYW1lKEJpbmRpbmdTdGF0ZSopIHsgcmV0dXJu IDA7IH0KIAotaW5saW5lIHZvaWQgaW1tZWRpYXRlbHlSZXBvcnRVbnNhZmVBY2Nlc3NUbyhCaW5k aW5nU3RhdGUqLCBEb2N1bWVudCopIHsgfQordm9pZCBpbW1lZGlhdGVseVJlcG9ydFVuc2FmZUFj Y2Vzc1RvKEJpbmRpbmdTdGF0ZSosIERvY3VtZW50KiB0YXJnZXQpOwogCiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3BwCmluZGV4IGUwN2E5MzJlMzM0MzQy MjBmYTIyMjI5YzI4ZWUzZGQ1MjgwNmUwZmUuLjM2ODk1MGQyNDk0MjBmNmVjZjEyYTM1NjQ5YTE3 YzkyZjhkZDIyMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9N QmluZGluZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5n LmNwcApAQCAtMjEsNiArMjEsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkpT RE9NQmluZGluZy5oIgogCisjaW5jbHVkZSAiQmluZGluZ1NlY3VyaXR5LmgiCiAjaW5jbHVkZSAi RE9NT2JqZWN0SGFzaFRhYmxlTWFwLmgiCiAjaW5jbHVkZSAiRE9NU3RyaW5nTGlzdC5oIgogI2lu Y2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKQEAgLTIyMywyMyArMjI0LDIyIEBAIHZvaWQgc2V0RE9N RXhjZXB0aW9uKEV4ZWNTdGF0ZSogZXhlYywgRXhjZXB0aW9uQ29kZSBlYykKIAogYm9vbCBzaG91 bGRBbGxvd0FjY2Vzc1RvTm9kZShFeGVjU3RhdGUqIGV4ZWMsIE5vZGUqIG5vZGUpCiB7Ci0gICAg cmV0dXJuIG5vZGUgJiYgc2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKGV4ZWMsIG5vZGUtPmRvY3Vt ZW50KCktPmZyYW1lKCkpOworICAgIHJldHVybiBCaW5kaW5nU2VjdXJpdHk6OnNob3VsZEFsbG93 QWNjZXNzVG9Ob2RlKGV4ZWMsIG5vZGUpOwogfQogCiBib29sIHNob3VsZEFsbG93QWNjZXNzVG9G cmFtZShFeGVjU3RhdGUqIGV4ZWMsIEZyYW1lKiBmcmFtZSkKIHsKLSAgICBpZiAoIWZyYW1lKQot ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgSlNET01XaW5kb3cqIHdpbmRvdyA9IHRvSlNET01X aW5kb3coZnJhbWUsIGN1cnJlbnRXb3JsZChleGVjKSk7Ci0gICAgcmV0dXJuIHdpbmRvdyAmJiB3 aW5kb3ctPmFsbG93c0FjY2Vzc0Zyb20oZXhlYyk7CisgICAgcmV0dXJuIEJpbmRpbmdTZWN1cml0 eTo6c2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKGV4ZWMsIGZyYW1lKTsKIH0KIAogYm9vbCBzaG91 bGRBbGxvd0FjY2Vzc1RvRnJhbWUoRXhlY1N0YXRlKiBleGVjLCBGcmFtZSogZnJhbWUsIFN0cmlu ZyYgbWVzc2FnZSkKIHsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgSlNET01XaW5kb3cqIHdpbmRvdyA9IHRvSlNET01XaW5kb3coZnJhbWUsIGN1cnJlbnRXb3Js ZChleGVjKSk7Ci0gICAgcmV0dXJuIHdpbmRvdyAmJiB3aW5kb3ctPmFsbG93c0FjY2Vzc0Zyb20o ZXhlYywgbWVzc2FnZSk7CisgICAgYm9vbCByZXN1bHQgPSBCaW5kaW5nU2VjdXJpdHk6OnNob3Vs ZEFsbG93QWNjZXNzVG9GcmFtZShleGVjLCBmcmFtZSwgRG9Ob3RSZXBvcnRTZWN1cml0eUVycm9y KTsKKyAgICAvLyBGSVhNRTogVGhlIGZvbGxvd2luZyBsaW5lIG9mIGNvZGUgc2hvdWxkIG1vdmUg c29tZXdoZXJlIHRoYXQgaXQgY2FuIGJlIHNoYXJlZCB3aXRoIGltbWVkaWF0ZWx5UmVwb3J0VW5z YWZlQWNjZXNzVG8uCisgICAgbWVzc2FnZSA9IGZyYW1lLT5kb21XaW5kb3coKS0+Y3Jvc3NEb21h aW5BY2Nlc3NFcnJvck1lc3NhZ2UoYWN0aXZlRE9NV2luZG93KGV4ZWMpKTsKKyAgICByZXR1cm4g cmVzdWx0OwogfQogCiB2b2lkIHByaW50RXJyb3JNZXNzYWdlRm9yRnJhbWUoRnJhbWUqIGZyYW1l LCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCg== 156973 2012-08-07 12:25:09 -0700 2012-08-07 13:30:41 -0700 Patch bug-93382-20120807122514.patch text/plain 5178 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdmYTBhMmFhNmY5YmM2 MDUxNjUxNmE5MzdmYTRlMDhjZWExMmZmNC4uOWNiYmVmODM1Nzc4NTM4Y2Q4NjAwZjM4ZmQ1Mzcy ZjZmODY2NWM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTA4LTA3ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV3aXJlIHRoZSBzYW1lLW9y aWdpbiBjaGVja3MgZm9yIHRoZSBKYXZhU2NyaXB0Q29yZSBiaW5kaW5ncyB0aHJvdWdoIEJpbmRp bmdTZWN1cml0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTMzODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIHBhdGNoIHJld2lyZXMgdGhlIHNhbWUtb3JpZ2luIHBvbGljeSBjaGVja3MgaW4gdGhl IEphdmFTY3JpcHRDb3JlCisgICAgICAgIGJpbmRpbmdzIHRvIHVzZSB0aGUgaW1wbGVtZW50YXRp b24gaW4gQmluZGluZ1NlY3VyaXR5LmNwcCwgd2hpY2ggaXMgbm93CisgICAgICAgIHNoYXJlZCBi eSBKYXZhU2NyaXB0Q29yZSBhbmQgVjguIFRoZXJlIGFyZSBzdGlsbCBhIGZldyBwbGFjZXMgd2Vy ZSB3ZQorICAgICAgICB1c2UgdGhlIEpTRE9NV2luZG93Q3VzdG9tLWJhc2VkIGNvZGUgcGF0aCwg YnV0IEkgcGxhbiB0byBjaGFuZ2UgdGhvc2UKKyAgICAgICAgaW4gYSBmb2xsb3cgdXAgcGF0Y2gg aW4gdGhlIGludGVyZXN0IG9mIGtlZXBpbmcgdGhpcyBwYXRjaCBhcyBzbWFsbCBhcworICAgICAg ICBwb3NzaWJsZS4KKworICAgICAgICBUaGlzIHBhdGNoIGFzIHR3byBtYWluIGJlbmVmaXRzOgor CisgICAgICAgIDEpIFdlIG5vIGxvbmdlciBuZWVkIHRvIG1haW50YWluIGR1cGxpY2F0ZSBjb2Rl IGluIHRoZSBKU0MgYW5kIHRoZSBWOAorICAgICAgICAgICBiaW5kaW5ncyBmb3IgYXMgZGVsaWNh dGUgYW4gYXJlYSBhcyB0aGUgc2FtZS1vcmlnaW4gY2hlY2suCisgICAgICAgICAgIFByZXZpb3Vz bHksIHRoZSB0d28gaW1wbGVtZW50YXRpb25zIGFjY29tcGxpc2hlZCB0aGUgc2FtZSB0YXNrIHVz aW5nCisgICAgICAgICAgIGEgc2xpZ2h0bHkgZGlmZmVyZW50IG1lY2hhbnNpbS4gQWZ0ZXIgdGhp cyBwYXRjaCwgdGhleSB1c2UgdGhlIHNhbWUKKyAgICAgICAgICAgbWVjaGFuaXNtLCB3aGljaCBt ZWFucyB3ZSBvbmx5IG5lZWQgdG8gY29udmluY2Ugb3Vyc2VsdmVzIHRoYXQgb25lCisgICAgICAg ICAgIGltcGxlbWVudGF0aW9uIGlzIGNvcnJlY3QuCisKKyAgICAgICAgMikgVGhpcyBwYXRjaCB3 aWxsIG1ha2UgaXQgZWFzaWVyIHRvIHJlbW92ZSBET01XaW5kb3c6Om1fc2VjdXJpdHlPcmlnaW4K KyAgICAgICAgICAgYmVjYXVzZSB0aGVyZSB3aWxsIGJlIG9ubHkgb25lIHBpZWNlIG9mIGNvZGUg dGhhdCBuZWVkcyB0byBjaGFuZ2UuCisgICAgICAgICAgIFByaW9yIHRvIHRoaXMgcGF0Y2gsIHdl IHdvdWxkIGhhdmUgaGFkIHRvIGNoYW5nZSBib3RoCisgICAgICAgICAgIGltcGxlbWVudGF0aW9u cyBvZiB0aGUgc2FtZS1vcmlnaW4gcG9saWN5IG5vdCB0byByZWx5IHVwb24KKyAgICAgICAgICAg RE9NV2luZG93OjptX3NlY3VyaXR5T3JpZ2luLgorCisgICAgICAgICogYmluZGluZ3MvanMvQmlu ZGluZ1N0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmltbWVkaWF0ZWx5UmVwb3J0VW5zYWZl QWNjZXNzVG8pOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogYmluZGluZ3MvanMvQmlu ZGluZ1N0YXRlLmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9K U0RPTUJpbmRpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkQWxsb3dBY2Nlc3NUb05v ZGUpOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKToKKwogMjAx Mi0wOC0wNyAgR2VvcmdlIFN0YWlrb3MgIDxzdGFpa29zQHdlYmtpdC5vcmc+CiAKICAgICAgICAg W0JsYWNrQmVycnldIFdlIHNob3VsZCBmYWlsIHRoZSBIVFRQIGF1dGggc2lsZW50bHkgZm9yIG5v bi1tYWluIGxvYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9CaW5k aW5nU3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvQmluZGluZ1N0YXRlLmNw cAppbmRleCA4MjU0NjhiNTdiOTUxOGVlZGUwNGY3YTMxOTlmODRiY2EwZmIwMTlkLi43MmEyYThh MTM4Mjk2ZmIzMDcwYTRjOGM1ZTZhMDU5ZDc1OGNmODA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9CaW5kaW5nU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0JpbmRpbmdTdGF0ZS5jcHAKQEAgLTQ3LDQgKzQ3LDkgQEAgRE9NV2luZG93KiBm aXJzdERPTVdpbmRvdyhFeGVjU3RhdGUqIGV4ZWMpCiAgICAgcmV0dXJuIGFzSlNET01XaW5kb3co ZXhlYy0+ZHluYW1pY0dsb2JhbE9iamVjdCgpKS0+aW1wbCgpOwogfQogCit2b2lkIGltbWVkaWF0 ZWx5UmVwb3J0VW5zYWZlQWNjZXNzVG8oRXhlY1N0YXRlKiBleGVjLCBEb2N1bWVudCogdGFyZ2V0 KQoreworICAgIHByaW50RXJyb3JNZXNzYWdlRm9yRnJhbWUodGFyZ2V0LT5mcmFtZSgpLCB0YXJn ZXQtPmRvbVdpbmRvdygpLT5jcm9zc0RvbWFpbkFjY2Vzc0Vycm9yTWVzc2FnZShhY3RpdmVET01X aW5kb3coZXhlYykpKTsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvQmluZGluZ1N0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9CaW5kaW5n U3RhdGUuaAppbmRleCAyODFiOWIzMzNjZGFiNDU5OTAwM2FmZGQ1MjBiYmE1Y2IxZGVlNzdhLi5k ZTEzMGZlMmIxY2MwZjQyOTgxMzFlZTA1YWQzMjgxODgzYzRlNThlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9CaW5kaW5nU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9CaW5kaW5nU3RhdGUuaApAQCAtNDgsNyArNDgsNyBAQCBET01XaW5kb3cq IGZpcnN0RE9NV2luZG93KEJpbmRpbmdTdGF0ZSopOwogaW5saW5lIEZyYW1lKiBhY3RpdmVGcmFt ZShCaW5kaW5nU3RhdGUqKSB7IHJldHVybiAwOyB9CiBpbmxpbmUgRnJhbWUqIGZpcnN0RnJhbWUo QmluZGluZ1N0YXRlKikgeyByZXR1cm4gMDsgfQogCi1pbmxpbmUgdm9pZCBpbW1lZGlhdGVseVJl cG9ydFVuc2FmZUFjY2Vzc1RvKEJpbmRpbmdTdGF0ZSosIERvY3VtZW50KikgeyB9Cit2b2lkIGlt bWVkaWF0ZWx5UmVwb3J0VW5zYWZlQWNjZXNzVG8oQmluZGluZ1N0YXRlKiwgRG9jdW1lbnQqIHRh cmdldCk7CiAKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNE T01CaW5kaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5j cHAKaW5kZXggZTA3YTkzMmUzMzQzNDIyMGZhMjIyMjljMjhlZTNkZDUyODA2ZTBmZS4uMzY4OTUw ZDI0OTQyMGY2ZWNmMTJhMzU2NDlhMTdjOTJmOGRkMjIyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCiAKKyNpbmNsdWRlICJCaW5kaW5n U2VjdXJpdHkuaCIKICNpbmNsdWRlICJET01PYmplY3RIYXNoVGFibGVNYXAuaCIKICNpbmNsdWRl ICJET01TdHJpbmdMaXN0LmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZS5oIgpAQCAtMjIzLDIz ICsyMjQsMjIgQEAgdm9pZCBzZXRET01FeGNlcHRpb24oRXhlY1N0YXRlKiBleGVjLCBFeGNlcHRp b25Db2RlIGVjKQogCiBib29sIHNob3VsZEFsbG93QWNjZXNzVG9Ob2RlKEV4ZWNTdGF0ZSogZXhl YywgTm9kZSogbm9kZSkKIHsKLSAgICByZXR1cm4gbm9kZSAmJiBzaG91bGRBbGxvd0FjY2Vzc1Rv RnJhbWUoZXhlYywgbm9kZS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSk7CisgICAgcmV0dXJuIEJpbmRp bmdTZWN1cml0eTo6c2hvdWxkQWxsb3dBY2Nlc3NUb05vZGUoZXhlYywgbm9kZSk7CiB9CiAKIGJv b2wgc2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKEV4ZWNTdGF0ZSogZXhlYywgRnJhbWUqIGZyYW1l KQogewotICAgIGlmICghZnJhbWUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBKU0RPTVdp bmRvdyogd2luZG93ID0gdG9KU0RPTVdpbmRvdyhmcmFtZSwgY3VycmVudFdvcmxkKGV4ZWMpKTsK LSAgICByZXR1cm4gd2luZG93ICYmIHdpbmRvdy0+YWxsb3dzQWNjZXNzRnJvbShleGVjKTsKKyAg ICByZXR1cm4gQmluZGluZ1NlY3VyaXR5OjpzaG91bGRBbGxvd0FjY2Vzc1RvRnJhbWUoZXhlYywg ZnJhbWUpOwogfQogCiBib29sIHNob3VsZEFsbG93QWNjZXNzVG9GcmFtZShFeGVjU3RhdGUqIGV4 ZWMsIEZyYW1lKiBmcmFtZSwgU3RyaW5nJiBtZXNzYWdlKQogewogICAgIGlmICghZnJhbWUpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBKU0RPTVdpbmRvdyogd2luZG93ID0gdG9KU0RPTVdp bmRvdyhmcmFtZSwgY3VycmVudFdvcmxkKGV4ZWMpKTsKLSAgICByZXR1cm4gd2luZG93ICYmIHdp bmRvdy0+YWxsb3dzQWNjZXNzRnJvbShleGVjLCBtZXNzYWdlKTsKKyAgICBib29sIHJlc3VsdCA9 IEJpbmRpbmdTZWN1cml0eTo6c2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKGV4ZWMsIGZyYW1lLCBE b05vdFJlcG9ydFNlY3VyaXR5RXJyb3IpOworICAgIC8vIEZJWE1FOiBUaGUgZm9sbG93aW5nIGxp bmUgb2YgY29kZSBzaG91bGQgbW92ZSBzb21ld2hlcmUgdGhhdCBpdCBjYW4gYmUgc2hhcmVkIHdp dGggaW1tZWRpYXRlbHlSZXBvcnRVbnNhZmVBY2Nlc3NUby4KKyAgICBtZXNzYWdlID0gZnJhbWUt PmRvbVdpbmRvdygpLT5jcm9zc0RvbWFpbkFjY2Vzc0Vycm9yTWVzc2FnZShhY3RpdmVET01XaW5k b3coZXhlYykpOworICAgIHJldHVybiByZXN1bHQ7CiB9CiAKIHZvaWQgcHJpbnRFcnJvck1lc3Nh Z2VGb3JGcmFtZShGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkK 156989 2012-08-07 13:30:43 -0700 2012-08-07 13:52:08 -0700 hopefully builds on EFL now bug-93382-20120807133018.patch text/plain 5672 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdmYTBhMmFhNmY5YmM2 MDUxNjUxNmE5MzdmYTRlMDhjZWExMmZmNC4uOWNiYmVmODM1Nzc4NTM4Y2Q4NjAwZjM4ZmQ1Mzcy ZjZmODY2NWM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTA4LTA3ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV3aXJlIHRoZSBzYW1lLW9y aWdpbiBjaGVja3MgZm9yIHRoZSBKYXZhU2NyaXB0Q29yZSBiaW5kaW5ncyB0aHJvdWdoIEJpbmRp bmdTZWN1cml0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTMzODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIHBhdGNoIHJld2lyZXMgdGhlIHNhbWUtb3JpZ2luIHBvbGljeSBjaGVja3MgaW4gdGhl IEphdmFTY3JpcHRDb3JlCisgICAgICAgIGJpbmRpbmdzIHRvIHVzZSB0aGUgaW1wbGVtZW50YXRp b24gaW4gQmluZGluZ1NlY3VyaXR5LmNwcCwgd2hpY2ggaXMgbm93CisgICAgICAgIHNoYXJlZCBi eSBKYXZhU2NyaXB0Q29yZSBhbmQgVjguIFRoZXJlIGFyZSBzdGlsbCBhIGZldyBwbGFjZXMgd2Vy ZSB3ZQorICAgICAgICB1c2UgdGhlIEpTRE9NV2luZG93Q3VzdG9tLWJhc2VkIGNvZGUgcGF0aCwg YnV0IEkgcGxhbiB0byBjaGFuZ2UgdGhvc2UKKyAgICAgICAgaW4gYSBmb2xsb3cgdXAgcGF0Y2gg aW4gdGhlIGludGVyZXN0IG9mIGtlZXBpbmcgdGhpcyBwYXRjaCBhcyBzbWFsbCBhcworICAgICAg ICBwb3NzaWJsZS4KKworICAgICAgICBUaGlzIHBhdGNoIGFzIHR3byBtYWluIGJlbmVmaXRzOgor CisgICAgICAgIDEpIFdlIG5vIGxvbmdlciBuZWVkIHRvIG1haW50YWluIGR1cGxpY2F0ZSBjb2Rl IGluIHRoZSBKU0MgYW5kIHRoZSBWOAorICAgICAgICAgICBiaW5kaW5ncyBmb3IgYXMgZGVsaWNh dGUgYW4gYXJlYSBhcyB0aGUgc2FtZS1vcmlnaW4gY2hlY2suCisgICAgICAgICAgIFByZXZpb3Vz bHksIHRoZSB0d28gaW1wbGVtZW50YXRpb25zIGFjY29tcGxpc2hlZCB0aGUgc2FtZSB0YXNrIHVz aW5nCisgICAgICAgICAgIGEgc2xpZ2h0bHkgZGlmZmVyZW50IG1lY2hhbnNpbS4gQWZ0ZXIgdGhp cyBwYXRjaCwgdGhleSB1c2UgdGhlIHNhbWUKKyAgICAgICAgICAgbWVjaGFuaXNtLCB3aGljaCBt ZWFucyB3ZSBvbmx5IG5lZWQgdG8gY29udmluY2Ugb3Vyc2VsdmVzIHRoYXQgb25lCisgICAgICAg ICAgIGltcGxlbWVudGF0aW9uIGlzIGNvcnJlY3QuCisKKyAgICAgICAgMikgVGhpcyBwYXRjaCB3 aWxsIG1ha2UgaXQgZWFzaWVyIHRvIHJlbW92ZSBET01XaW5kb3c6Om1fc2VjdXJpdHlPcmlnaW4K KyAgICAgICAgICAgYmVjYXVzZSB0aGVyZSB3aWxsIGJlIG9ubHkgb25lIHBpZWNlIG9mIGNvZGUg dGhhdCBuZWVkcyB0byBjaGFuZ2UuCisgICAgICAgICAgIFByaW9yIHRvIHRoaXMgcGF0Y2gsIHdl IHdvdWxkIGhhdmUgaGFkIHRvIGNoYW5nZSBib3RoCisgICAgICAgICAgIGltcGxlbWVudGF0aW9u cyBvZiB0aGUgc2FtZS1vcmlnaW4gcG9saWN5IG5vdCB0byByZWx5IHVwb24KKyAgICAgICAgICAg RE9NV2luZG93OjptX3NlY3VyaXR5T3JpZ2luLgorCisgICAgICAgICogYmluZGluZ3MvanMvQmlu ZGluZ1N0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmltbWVkaWF0ZWx5UmVwb3J0VW5zYWZl QWNjZXNzVG8pOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogYmluZGluZ3MvanMvQmlu ZGluZ1N0YXRlLmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9K U0RPTUJpbmRpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkQWxsb3dBY2Nlc3NUb05v ZGUpOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKToKKwogMjAx Mi0wOC0wNyAgR2VvcmdlIFN0YWlrb3MgIDxzdGFpa29zQHdlYmtpdC5vcmc+CiAKICAgICAgICAg W0JsYWNrQmVycnldIFdlIHNob3VsZCBmYWlsIHRoZSBIVFRQIGF1dGggc2lsZW50bHkgZm9yIG5v bi1tYWluIGxvYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dCBi L1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CmluZGV4IGM1NzBmMDg5NjNhYzE3ODI1Mjgy ODk4NjIxOGQyYTgxOGFkYjJhZTMuLmMyZTAzZjZhNWJkYjMzYjc4OTUyN2M2M2QxZmJkYmUyN2Q4 YTdhNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CkBAIC05NzEsNiArOTcxLDcgQEAgU0VUKFdlYkNv cmVfU09VUkNFUwogICAgIGJpbmRpbmdzL1NjcmlwdENvbnRyb2xsZXJCYXNlLmNwcAogCiAgICAg YmluZGluZ3MvZ2VuZXJpYy9BY3RpdmVET01DYWxsYmFjay5jcHAKKyAgICBiaW5kaW5ncy9nZW5l cmljL0JpbmRpbmdTZWN1cml0eS5jcHAKICAgICBiaW5kaW5ncy9nZW5lcmljL1J1bnRpbWVFbmFi bGVkRmVhdHVyZXMuY3BwCiAKICAgICBjc3MvQ1NTQXNwZWN0UmF0aW9WYWx1ZS5jcHAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0JpbmRpbmdTdGF0ZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9CaW5kaW5nU3RhdGUuY3BwCmluZGV4IDgyNTQ2OGI1N2I5 NTE4ZWVkZTA0ZjdhMzE5OWY4NGJjYTBmYjAxOWQuLjcyYTJhOGExMzgyOTZmYjMwNzBhNGM4YzVl NmEwNTlkNzU4Y2Y4MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0Jp bmRpbmdTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvQmluZGluZ1N0 YXRlLmNwcApAQCAtNDcsNCArNDcsOSBAQCBET01XaW5kb3cqIGZpcnN0RE9NV2luZG93KEV4ZWNT dGF0ZSogZXhlYykKICAgICByZXR1cm4gYXNKU0RPTVdpbmRvdyhleGVjLT5keW5hbWljR2xvYmFs T2JqZWN0KCkpLT5pbXBsKCk7CiB9CiAKK3ZvaWQgaW1tZWRpYXRlbHlSZXBvcnRVbnNhZmVBY2Nl c3NUbyhFeGVjU3RhdGUqIGV4ZWMsIERvY3VtZW50KiB0YXJnZXQpCit7CisgICAgcHJpbnRFcnJv ck1lc3NhZ2VGb3JGcmFtZSh0YXJnZXQtPmZyYW1lKCksIHRhcmdldC0+ZG9tV2luZG93KCktPmNy b3NzRG9tYWluQWNjZXNzRXJyb3JNZXNzYWdlKGFjdGl2ZURPTVdpbmRvdyhleGVjKSkpOworfQor CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9CaW5kaW5nU3RhdGUu aCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0JpbmRpbmdTdGF0ZS5oCmluZGV4IDI4MWI5 YjMzM2NkYWI0NTk5MDAzYWZkZDUyMGJiYTVjYjFkZWU3N2EuLmRlMTMwZmUyYjFjYzBmNDI5ODEz MWVlMDVhZDMyODE4ODNjNGU1OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0JpbmRpbmdTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0JpbmRp bmdTdGF0ZS5oCkBAIC00OCw3ICs0OCw3IEBAIERPTVdpbmRvdyogZmlyc3RET01XaW5kb3coQmlu ZGluZ1N0YXRlKik7CiBpbmxpbmUgRnJhbWUqIGFjdGl2ZUZyYW1lKEJpbmRpbmdTdGF0ZSopIHsg cmV0dXJuIDA7IH0KIGlubGluZSBGcmFtZSogZmlyc3RGcmFtZShCaW5kaW5nU3RhdGUqKSB7IHJl dHVybiAwOyB9CiAKLWlubGluZSB2b2lkIGltbWVkaWF0ZWx5UmVwb3J0VW5zYWZlQWNjZXNzVG8o QmluZGluZ1N0YXRlKiwgRG9jdW1lbnQqKSB7IH0KK3ZvaWQgaW1tZWRpYXRlbHlSZXBvcnRVbnNh ZmVBY2Nlc3NUbyhCaW5kaW5nU3RhdGUqLCBEb2N1bWVudCogdGFyZ2V0KTsKIAogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcAppbmRleCBlMDdhOTMyZTMz NDM0MjIwZmEyMjIyOWMyOGVlM2RkNTI4MDZlMGZlLi4zNjg5NTBkMjQ5NDIwZjZlY2YxMmEzNTY0 OWExN2M5MmY4ZGQyMjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0RPTUJpbmRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmlu ZGluZy5jcHAKQEAgLTIxLDYgKzIxLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl ICJKU0RPTUJpbmRpbmcuaCIKIAorI2luY2x1ZGUgIkJpbmRpbmdTZWN1cml0eS5oIgogI2luY2x1 ZGUgIkRPTU9iamVjdEhhc2hUYWJsZU1hcC5oIgogI2luY2x1ZGUgIkRPTVN0cmluZ0xpc3QuaCIK ICNpbmNsdWRlICJFeGNlcHRpb25Db2RlLmgiCkBAIC0yMjMsMjMgKzIyNCwyMiBAQCB2b2lkIHNl dERPTUV4Y2VwdGlvbihFeGVjU3RhdGUqIGV4ZWMsIEV4Y2VwdGlvbkNvZGUgZWMpCiAKIGJvb2wg c2hvdWxkQWxsb3dBY2Nlc3NUb05vZGUoRXhlY1N0YXRlKiBleGVjLCBOb2RlKiBub2RlKQogewot ICAgIHJldHVybiBub2RlICYmIHNob3VsZEFsbG93QWNjZXNzVG9GcmFtZShleGVjLCBub2RlLT5k b2N1bWVudCgpLT5mcmFtZSgpKTsKKyAgICByZXR1cm4gQmluZGluZ1NlY3VyaXR5OjpzaG91bGRB bGxvd0FjY2Vzc1RvTm9kZShleGVjLCBub2RlKTsKIH0KIAogYm9vbCBzaG91bGRBbGxvd0FjY2Vz c1RvRnJhbWUoRXhlY1N0YXRlKiBleGVjLCBGcmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKCFmcmFt ZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIEpTRE9NV2luZG93KiB3aW5kb3cgPSB0b0pT RE9NV2luZG93KGZyYW1lLCBjdXJyZW50V29ybGQoZXhlYykpOwotICAgIHJldHVybiB3aW5kb3cg JiYgd2luZG93LT5hbGxvd3NBY2Nlc3NGcm9tKGV4ZWMpOworICAgIHJldHVybiBCaW5kaW5nU2Vj dXJpdHk6OnNob3VsZEFsbG93QWNjZXNzVG9GcmFtZShleGVjLCBmcmFtZSk7CiB9CiAKIGJvb2wg c2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKEV4ZWNTdGF0ZSogZXhlYywgRnJhbWUqIGZyYW1lLCBT dHJpbmcmIG1lc3NhZ2UpCiB7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgIEpTRE9NV2luZG93KiB3aW5kb3cgPSB0b0pTRE9NV2luZG93KGZyYW1lLCBjdXJyZW50 V29ybGQoZXhlYykpOwotICAgIHJldHVybiB3aW5kb3cgJiYgd2luZG93LT5hbGxvd3NBY2Nlc3NG cm9tKGV4ZWMsIG1lc3NhZ2UpOworICAgIGJvb2wgcmVzdWx0ID0gQmluZGluZ1NlY3VyaXR5Ojpz aG91bGRBbGxvd0FjY2Vzc1RvRnJhbWUoZXhlYywgZnJhbWUsIERvTm90UmVwb3J0U2VjdXJpdHlF cnJvcik7CisgICAgLy8gRklYTUU6IFRoZSBmb2xsb3dpbmcgbGluZSBvZiBjb2RlIHNob3VsZCBt b3ZlIHNvbWV3aGVyZSB0aGF0IGl0IGNhbiBiZSBzaGFyZWQgd2l0aCBpbW1lZGlhdGVseVJlcG9y dFVuc2FmZUFjY2Vzc1RvLgorICAgIG1lc3NhZ2UgPSBmcmFtZS0+ZG9tV2luZG93KCktPmNyb3Nz RG9tYWluQWNjZXNzRXJyb3JNZXNzYWdlKGFjdGl2ZURPTVdpbmRvdyhleGVjKSk7CisgICAgcmV0 dXJuIHJlc3VsdDsKIH0KIAogdm9pZCBwcmludEVycm9yTWVzc2FnZUZvckZyYW1lKEZyYW1lKiBm cmFtZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQo=