101282 2012-11-05 16:55:29 -0800 Need a way to send and receive messages between the WKWebProcessPlugIn object and the client 2012-11-05 21:52:45 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam oldest_to_newest 759047 0 sam 2012-11-05 16:55:29 -0800 Need a way to send and receive messages between the WKWebProcessPlugIn object and the client 759048 1 sam 2012-11-05 16:55:51 -0800 <rdar://problem/12582237> 759058 2 172445 sam 2012-11-05 17:03:15 -0800 Created attachment 172445 Patch 759237 3 sam 2012-11-05 21:52:45 -0800 Committed r133558: <http://trac.webkit.org/changeset/133558> 172445 2012-11-05 17:03:15 -0800 2012-11-05 17:06:33 -0800 Patch bug-101282-20121105170131.patch text/plain 15891 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMzU0MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDEyLTExLTA1ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTmVlZCBhIHdheSB0byBzZW5kIGFuZCBy ZWNlaXZlIG1lc3NhZ2VzIGJldHdlZW4gdGhlIFdLV2ViUHJvY2Vzc1BsdWdJbiBvYmplY3QgYW5k IHRoZSBjbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwMTI4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFQSSB3aXNlLCB0aGlzIGFkZHM6CisgICAgICAgICAgICAtIEEgY29ubmVjdGlvbiBwcm9w ZXJ0eSBvbiB0aGUgV0tXZWJQcm9jZXNzUGx1Z0luQ29udHJvbGxlcgorICAgICAgICAgICAgLSBB IG1ldGhvZCB0byBzZW5kIG1lc3NhZ2VzIGFjcm9zcyBhIFdLQ29ubmVjdGlvbiAoc2VuZE1lc3Nh Z2VXaXRoTmFtZTpib2R5KS4KKworICAgICAgICBJdCBhbHNvIGltcGxlbWVudHMgbWVzc2FnZSBz ZW5kaW5nIGFuZCByZWNlaXZpbmcgZm9yIFdLQ29ubmVjdGlvbi4gTWVzc2FnZSBib2RpZXMgYXJl IGN1cnJlbnRseQorICAgICAgICByZXN0cmljdGVkIHRvIGJlaW5nIG9iamVjdCBncmFwaHMgd2l0 aCB2YWx1ZXMgdGhhdCBhcmUgcHJvcGVydHkgbGlzdCB0eXBlcywgYnV0IGluIHRoZSBmdXR1cmUs IHNob3VsZAorICAgICAgICBzdXBwb3J0IGFsbCB0eXBlcyBjb25mb3JtaW5nIHRvIHRoZSBOU1Nl Y3VyZUNvZGluZyBwcm90b2NvbC4KKworICAgICAgICAqIFNoYXJlZC9XZWJDb25uZWN0aW9uLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29ubmVjdGlvbjo6cG9zdE1lc3NhZ2UpOgorICAgICAg ICAoV2ViS2l0OjpXZWJDb25uZWN0aW9uOjpoYW5kbGVNZXNzYWdlKToKKyAgICAgICAgKiBTaGFy ZWQvV2ViQ29ubmVjdGlvbi5oOgorICAgICAgICAoV2ViQ29ubmVjdGlvbik6CisgICAgICAgICog U2hhcmVkL1dlYkNvbm5lY3Rpb24ubWVzc2FnZXMuaW46CisgICAgICAgIFN3aXRjaCBIYW5kbGVN ZXNzYWdlIHRvIGJlIGEgdmFyaWFkaWMgbWVzc2FnZSB0byBhdm9pZCBhbiBleHRyYSBjb3B5IGFu ZCBzdXBwb3J0IGF0dGFjaG1lbnRzIGNvcnJlY3RseS4KKworICAgICAgICAqIFNoYXJlZC9tYWMv QXJndW1lbnRDb2RlcnNNYWMuaDoKKyAgICAgICAgKiBTaGFyZWQvbWFjL0FyZ3VtZW50Q29kZXJz TWFjLm1tOgorICAgICAgICAoQ29yZUlQQzo6dHlwZUZyb21PYmplY3QpOgorICAgICAgICAoQ29y ZUlQQzo6ZW5jb2RlKToKKyAgICAgICAgKENvcmVJUEM6OmRlY29kZSk6CisgICAgICAgIEFkZCBz dXBwb3J0IGZvciBlbmNvZGluZy9kZWNvZGluZyBOU0FycmF5LCBOU0RhdGUgYW5kIE5TRGF0YS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLQ29ubmVjdGlvbi5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvbWFjL1dLQ29ubmVjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb25uZWN0 aW9uIHNlbmRNZXNzYWdlV2l0aE5hbWU6Ym9keTpdKToKKyAgICAgICAgKGRpZFJlY2VpdmVNZXNz YWdlKToKKyAgICAgICAgSW1wbGVtZW50IG1lc3NhZ2Ugc2VuZGluZyBhbmQgcmVjZWl2aW5nLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vz c1BsdWdJbi5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9X S1dlYlByb2Nlc3NQbHVnSW4ubW06CisgICAgICAgICgtW1dLV2ViUHJvY2Vzc1BsdWdJbkNvbnRy b2xsZXIgX2luaXRXaXRoUHJpbmNpcGFsQ2xhc3NJbnN0YW5jZTpidW5kbGVSZWY6XSk6CisgICAg ICAgICgtW1dLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIgY29ubmVjdGlvbl0pOgorICAgICAg ICBBZGQgYSB3cmFwcGVyIGZvciB0aGUgV0tDb25uZWN0aW9uUmVmIHZlbmRlZCB2aWEgV0tCdW5k bGVHZXRBcHBsaWNhdGlvbkNvbm5lY3Rpb24oKSBhbmQgZXhwb3NlIGl0IGFzCisgICAgICAgIEFQ SSBvbiB0aGUgV0tXZWJQcm9jZXNzUGx1Z0luQ29udHJvbGxlci4KKwogMjAxMi0xMS0wNSAgS3l1 bmdUYWUgS2ltICA8a3RmLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIEZp eCBidWlsZCB3YXJuaW5nIGluIFBhZ2VDbGllbnRMZWdhY3lJbXBsLmNwcApJbmRleDogU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYkNvbm5lY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1NoYXJlZC9XZWJDb25uZWN0aW9uLmNwcAkocmV2aXNpb24gMTMzNTQxKQorKysgU291 cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvbm5lY3Rpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 MywyMyArNTMsMjEgQEAgdm9pZCBXZWJDb25uZWN0aW9uOjpwb3N0TWVzc2FnZShjb25zdCBTdAog ICAgIGlmICghbV9jb25uZWN0aW9uKQogICAgICAgICByZXR1cm47CiAKLSAgICBPd25QdHI8Q29y ZUlQQzo6QXJndW1lbnRFbmNvZGVyPiBtZXNzYWdlRGF0YSA9IENvcmVJUEM6OkFyZ3VtZW50RW5j b2Rlcjo6Y3JlYXRlKCk7Ci0gICAgbWVzc2FnZURhdGEtPmVuY29kZShtZXNzYWdlTmFtZSk7Ci0g ICAgZW5jb2RlTWVzc2FnZUJvZHkoKm1lc3NhZ2VEYXRhLCBtZXNzYWdlQm9keSk7CisgICAgT3du UHRyPENvcmVJUEM6Ok1lc3NhZ2VFbmNvZGVyPiBlbmNvZGVyID0gQ29yZUlQQzo6TWVzc2FnZUVu Y29kZXI6OmNyZWF0ZShNZXNzYWdlczo6V2ViQ29ubmVjdGlvbjo6SGFuZGxlTWVzc2FnZTo6cmVj ZWl2ZXJOYW1lKCksIE1lc3NhZ2VzOjpXZWJDb25uZWN0aW9uOjpIYW5kbGVNZXNzYWdlOjpuYW1l KCksIDApOworICAgIGVuY29kZXItPmVuY29kZShtZXNzYWdlTmFtZSk7CisgICAgZW5jb2RlTWVz c2FnZUJvZHkoKmVuY29kZXIsIG1lc3NhZ2VCb2R5KTsKIAotICAgIG1fY29ubmVjdGlvbi0+c2Vu ZChNZXNzYWdlczo6V2ViQ29ubmVjdGlvbjo6SGFuZGxlTWVzc2FnZShDb3JlSVBDOjpEYXRhUmVm ZXJlbmNlKG1lc3NhZ2VEYXRhLT5idWZmZXIoKSwgbWVzc2FnZURhdGEtPmJ1ZmZlclNpemUoKSkp LCAwKTsKKyAgICBtX2Nvbm5lY3Rpb24tPnNlbmRNZXNzYWdlKENvcmVJUEM6Ok1lc3NhZ2VJRChN ZXNzYWdlczo6V2ViQ29ubmVjdGlvbjo6SGFuZGxlTWVzc2FnZTo6bWVzc2FnZUlEKSwgZW5jb2Rl ci5yZWxlYXNlKCkpOwogfQogCi12b2lkIFdlYkNvbm5lY3Rpb246OmhhbmRsZU1lc3NhZ2UoY29u c3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYgbWVzc2FnZURhdGEpCit2b2lkIFdlYkNvbm5lY3Rp b246OmhhbmRsZU1lc3NhZ2UoQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCiB7Ci0g ICAgT3duUHRyPENvcmVJUEM6OkFyZ3VtZW50RGVjb2Rlcj4gZGVjb2RlciA9IENvcmVJUEM6OkFy Z3VtZW50RGVjb2Rlcjo6Y3JlYXRlKG1lc3NhZ2VEYXRhLmRhdGEoKSwgbWVzc2FnZURhdGEuc2l6 ZSgpKTsKLQogICAgIFN0cmluZyBtZXNzYWdlTmFtZTsKLSAgICBpZiAoIWRlY29kZXItPmRlY29k ZShtZXNzYWdlTmFtZSkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShtZXNzYWdlTmFtZSkpCiAg ICAgICAgIHJldHVybjsKIAogICAgIFJlZlB0cjxBUElPYmplY3Q+IG1lc3NhZ2VCb2R5OwotICAg IGlmICghZGVjb2RlTWVzc2FnZUJvZHkoKmRlY29kZXIsIG1lc3NhZ2VCb2R5KSkKKyAgICBpZiAo IWRlY29kZU1lc3NhZ2VCb2R5KGRlY29kZXIsIG1lc3NhZ2VCb2R5KSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgbV9jbGllbnQuZGlkUmVjZWl2ZU1lc3NhZ2UodGhpcywgbWVzc2FnZU5hbWUsIG1l c3NhZ2VCb2R5LmdldCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb25uZWN0 aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvbm5lY3Rpb24u aAkocmV2aXNpb24gMTMzNTQxKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvbm5lY3Rp b24uaAkod29ya2luZyBjb3B5KQpAQCAtNjMsNyArNjMsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICAv LyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViQ29ubmVjdGlvbk1lc3NhZ2VSZWNlaXZlci5j cHAKICAgICB2b2lkIGRpZFJlY2VpdmVXZWJDb25uZWN0aW9uTWVzc2FnZShDb3JlSVBDOjpDb25u ZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYpOwot ICAgIHZvaWQgaGFuZGxlTWVzc2FnZShjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJiBtZXNz YWdlRGF0YSk7CisgICAgdm9pZCBoYW5kbGVNZXNzYWdlKENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVy Jik7CiAKICAgICBSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4gbV9jb25uZWN0aW9uOwogICAg IFdlYkNvbm5lY3Rpb25DbGllbnQgbV9jbGllbnQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViQ29ubmVjdGlvbi5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViQ29ubmVjdGlvbi5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTMzNTQxKQorKysg U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvbm5lY3Rpb24ubWVzc2FnZXMuaW4JKHdvcmtpbmcg Y29weSkKQEAgLTIxLDUgKzIxLDUgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAogbWVzc2FnZXMgLT4gV2Vi Q29ubmVjdGlvbiB7Ci0gICAgSGFuZGxlTWVzc2FnZShDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIG1l c3NhZ2VEYXRhKQorICAgIEhhbmRsZU1lc3NhZ2UoKSBWYXJpYWRpYwogfQpJbmRleDogU291cmNl L1dlYktpdDIvU2hhcmVkL21hYy9Bcmd1bWVudENvZGVyc01hYy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQXJndW1lbnRDb2RlcnNNYWMuaAkocmV2aXNpb24gMTMz NTQxKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9Bcmd1bWVudENvZGVyc01hYy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMywxMCBAQCBuYW1lc3BhY2UgQ29yZUlQQyB7CiBjbGFz cyBBcmd1bWVudEVuY29kZXI7CiBjbGFzcyBBcmd1bWVudERlY29kZXI7CiAKKy8vIGlkCit2b2lk IGVuY29kZShBcmd1bWVudEVuY29kZXImLCBpZCk7Citib29sIGRlY29kZShBcmd1bWVudERlY29k ZXIqLCBSZXRhaW5QdHI8aWQ+Jik7CisKIC8vIE5TQXR0cmlidXRlZFN0cmluZwogdm9pZCBlbmNv ZGUoQXJndW1lbnRFbmNvZGVyJiwgTlNBdHRyaWJ1dGVkU3RyaW5nICopOwogYm9vbCBkZWNvZGUo QXJndW1lbnREZWNvZGVyKiwgUmV0YWluUHRyPE5TQXR0cmlidXRlZFN0cmluZz4mKTsKQEAgLTQ3 LDYgKzUxLDEwIEBAIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciosIFJldGFpblB0cjwKIHZv aWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIE5TRGljdGlvbmFyeSAqKTsKIGJvb2wgZGVjb2Rl KEFyZ3VtZW50RGVjb2RlciosIFJldGFpblB0cjxOU0RpY3Rpb25hcnk+Jik7CiAKKy8vIE5TQXJy YXkKK3ZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIE5TQXJyYXkgKik7Citib29sIGRlY29k ZShBcmd1bWVudERlY29kZXIqLCBSZXRhaW5QdHI8TlNBcnJheT4mKTsKKwogI2lmIFVTRShBUFBL SVQpCiAvLyBOU0ZvbnQKIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIE5TRm9udCAqKTsK QEAgLTYxLDYgKzY5LDE0IEBAIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciosIFJldGFpblB0 cjwKIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIE5TU3RyaW5nICopOwogYm9vbCBkZWNv ZGUoQXJndW1lbnREZWNvZGVyKiwgUmV0YWluUHRyPE5TU3RyaW5nPiYpOwogCisvLyBOU0RhdGUK K3ZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIE5TRGF0ZSAqKTsKK2Jvb2wgZGVjb2RlKEFy Z3VtZW50RGVjb2RlciosIFJldGFpblB0cjxOU0RhdGU+Jik7CisKKy8vIE5TRGF0YQordm9pZCBl bmNvZGUoQXJndW1lbnRFbmNvZGVyJiwgTlNEYXRhICopOworYm9vbCBkZWNvZGUoQXJndW1lbnRE ZWNvZGVyKiwgUmV0YWluUHRyPE5TRGF0YT4mKTsKKwogfSAvLyBuYW1lc3BhY2UgQ29yZUlQQwog CiAjZW5kaWYgLy8gQXJndW1lbnRDb2RlcnNNYWNfaApJbmRleDogU291cmNlL1dlYktpdDIvU2hh cmVkL21hYy9Bcmd1bWVudENvZGVyc01hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvbWFjL0FyZ3VtZW50Q29kZXJzTWFjLm1tCShyZXZpc2lvbiAxMzM1NDEpCisrKyBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0FyZ3VtZW50Q29kZXJzTWFjLm1tCSh3b3JraW5nIGNv cHkpCkBAIC00MywxMSArNDMsMTQgQEAgZW51bSBOU1R5cGUgewogICAgIE5TQ29sb3JUeXBlLAog I2VuZGlmCiAgICAgTlNEaWN0aW9uYXJ5VHlwZSwKKyAgICBOU0FycmF5VHlwZSwKICNpZiBVU0Uo QVBQS0lUKQogICAgIE5TRm9udFR5cGUsCiAjZW5kaWYKICAgICBOU051bWJlclR5cGUsCiAgICAg TlNTdHJpbmdUeXBlLAorICAgIE5TRGF0ZVR5cGUsCisgICAgTlNEYXRhVHlwZSwKICAgICBVbmtu b3duLAogfTsKIApAQCAtNzEsMTIgKzc0LDE4IEBAIHN0YXRpYyBOU1R5cGUgdHlwZUZyb21PYmpl Y3QoaWQgb2JqZWN0KQogICAgICAgICByZXR1cm4gTlNOdW1iZXJUeXBlOwogICAgIGlmIChbb2Jq ZWN0IGlzS2luZE9mQ2xhc3M6W05TU3RyaW5nIGNsYXNzXV0pCiAgICAgICAgIHJldHVybiBOU1N0 cmluZ1R5cGU7CisgICAgaWYgKFtvYmplY3QgaXNLaW5kT2ZDbGFzczpbTlNBcnJheSBjbGFzc11d KQorICAgICAgICByZXR1cm4gTlNBcnJheVR5cGU7CisgICAgaWYgKFtvYmplY3QgaXNLaW5kT2ZD bGFzczpbTlNEYXRlIGNsYXNzXV0pCisgICAgICAgIHJldHVybiBOU0RhdGVUeXBlOworICAgIGlm IChbb2JqZWN0IGlzS2luZE9mQ2xhc3M6W05TRGF0YSBjbGFzc11dKQorICAgICAgICByZXR1cm4g TlNEYXRhVHlwZTsKIAogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBVbmtu b3duOwogfQogCi1zdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBp ZCBvYmplY3QpCit2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXImIGVuY29kZXIsIGlkIG9iamVj dCkKIHsKICAgICBOU1R5cGUgdHlwZSA9IHR5cGVGcm9tT2JqZWN0KG9iamVjdCk7CiAgICAgZW5j b2Rlci5lbmNvZGVFbnVtKHR5cGUpOwpAQCAtMTA0LDYgKzExMywxNSBAQCBzdGF0aWMgdm9pZCBl bmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvCiAgICAgY2FzZSBOU1N0cmluZ1R5cGU6CiAgICAg ICAgIGVuY29kZShlbmNvZGVyLCBzdGF0aWNfY2FzdDxOU1N0cmluZyAqPihvYmplY3QpKTsKICAg ICAgICAgcmV0dXJuOworICAgIGNhc2UgTlNBcnJheVR5cGU6CisgICAgICAgIGVuY29kZShlbmNv ZGVyLCBzdGF0aWNfY2FzdDxOU0FycmF5ICo+KG9iamVjdCkpOworICAgICAgICByZXR1cm47Cisg ICAgY2FzZSBOU0RhdGVUeXBlOgorICAgICAgICBlbmNvZGUoZW5jb2Rlciwgc3RhdGljX2Nhc3Q8 TlNEYXRlICo+KG9iamVjdCkpOworICAgICAgICByZXR1cm47CisgICAgY2FzZSBOU0RhdGFUeXBl OgorICAgICAgICBlbmNvZGUoZW5jb2Rlciwgc3RhdGljX2Nhc3Q8TlNEYXRhICo+KG9iamVjdCkp OworICAgICAgICByZXR1cm47CiAgICAgY2FzZSBVbmtub3duOgogICAgICAgICBicmVhazsKICAg ICB9CkBAIC0xMTEsNyArMTI5LDcgQEAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2Rl ciYgZW5jbwogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCi1zdGF0aWMgYm9vbCBkZWNv ZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBSZXRhaW5QdHI8aWQ+JiByZXN1bHQpCitib29s IGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFJldGFpblB0cjxpZD4mIHJlc3VsdCkK IHsKICAgICBOU1R5cGUgdHlwZTsKICAgICBpZiAoIWRlY29kZXItPmRlY29kZUVudW0odHlwZSkp CkBAIC0xNjQsNiArMTgyLDI3IEBAIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIq IGRlY28KICAgICAgICAgcmVzdWx0ID0gc3RyaW5nOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9CisgICAgY2FzZSBOU0FycmF5VHlwZTogeworICAgICAgICBSZXRhaW5QdHI8TlNBcnJheT4g YXJyYXk7CisgICAgICAgIGlmICghZGVjb2RlKGRlY29kZXIsIGFycmF5KSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgcmVzdWx0ID0gYXJyYXk7CisgICAgICAgIHJldHVybiB0 cnVlOworICAgIH0KKyAgICBjYXNlIE5TRGF0ZVR5cGU6IHsKKyAgICAgICAgUmV0YWluUHRyPE5T RGF0ZT4gZGF0ZTsKKyAgICAgICAgaWYgKCFkZWNvZGUoZGVjb2RlciwgZGF0ZSkpCisgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJlc3VsdCA9IGRhdGU7CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0KKyAgICBjYXNlIE5TRGF0YVR5cGU6IHsKKyAgICAgICAgUmV0YWluUHRy PE5TRGF0YT4gZGF0YTsKKyAgICAgICAgaWYgKCFkZWNvZGUoZGVjb2RlciwgZGF0YSkpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJlc3VsdCA9IGRhdGE7CisgICAgICAgIHJl dHVybiB0cnVlOworICAgIH0KICAgICBjYXNlIFVua25vd246CiAgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0zNTksNCArMzk4LDY5IEBAIGJv b2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgUmUKICAgICByZXR1cm4gdHJ1ZTsK IH0KIAordm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBOU0FycmF5ICphcnJh eSkKK3sKKyAgICBOU1VJbnRlZ2VyIHNpemUgPSBbYXJyYXkgY291bnRdOworICAgIGVuY29kZXIg PDwgc3RhdGljX2Nhc3Q8dWludDY0X3Q+KHNpemUpOworCisgICAgZm9yIChOU1VJbnRlZ2VyIGkg PSAwOyBpIDwgc2l6ZTsgKytpKSB7CisgICAgICAgIGlkIHZhbHVlID0gW2FycmF5IG9iamVjdEF0 SW5kZXg6aV07CisKKyAgICAgICAgLy8gSWdub3JlIHZhbHVlcyB3ZSBkb24ndCByZWNvZ25pemUu CisgICAgICAgIGlmICh0eXBlRnJvbU9iamVjdCh2YWx1ZSkgPT0gVW5rbm93bikKKyAgICAgICAg ICAgIGNvbnRpbnVlOworCisgICAgICAgIGVuY29kZShlbmNvZGVyLCB2YWx1ZSk7CisgICAgfQor fQorCitib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFJldGFpblB0cjxOU0Fy cmF5PiYgcmVzdWx0KQoreworICAgIHVpbnQ2NF90IHNpemU7CisgICAgaWYgKCFkZWNvZGVyLT5k ZWNvZGVVSW50NjQoc2l6ZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFJldGFpblB0 cjxOU011dGFibGVBcnJheT4gYXJyYXkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2Nd IGluaXRXaXRoQ2FwYWNpdHk6c2l6ZV0pOworICAgIGZvciAodWludDY0X3QgaSA9IDA7IGkgPCBz aXplOyArK2kpIHsKKyAgICAgICAgUmV0YWluUHRyPGlkPiB2YWx1ZTsKKyAgICAgICAgaWYgKCFk ZWNvZGUoZGVjb2RlciwgdmFsdWUpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAg ICAgIFthcnJheS5nZXQoKSBhZGRPYmplY3Q6dmFsdWUuZ2V0KCldOworICAgIH0KKworICAgIHJl c3VsdC5hZG9wdE5TKGFycmF5LmxlYWtSZWYoKSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKK3Zv aWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgTlNEYXRlICpkYXRlKQoreworICAg IGVuY29kZShlbmNvZGVyLCAoQ0ZEYXRlUmVmKWRhdGUpOworfQorCitib29sIGRlY29kZShBcmd1 bWVudERlY29kZXIqIGRlY29kZXIsIFJldGFpblB0cjxOU0RhdGU+JiByZXN1bHQpCit7CisgICAg UmV0YWluUHRyPENGRGF0ZVJlZj4gZGF0ZTsKKyAgICBpZiAoIWRlY29kZShkZWNvZGVyLCBkYXRl KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmVzdWx0LmFkb3B0Q0YoKE5TRGF0ZSAq KWRhdGUubGVha1JlZigpKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9pZCBlbmNvZGUoQXJn dW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBOU0RhdGEgKmRhdGEpCit7CisgICAgZW5jb2RlKGVuY29k ZXIsIChDRkRhdGFSZWYpZGF0YSk7Cit9CisKK2Jvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2Rlciog ZGVjb2RlciwgUmV0YWluUHRyPE5TRGF0YT4mIHJlc3VsdCkKK3sKKyAgICBSZXRhaW5QdHI8Q0ZE YXRhUmVmPiBkYXRhOworICAgIGlmICghZGVjb2RlKGRlY29kZXIsIGRhdGEpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICByZXN1bHQuYWRvcHRDRigoTlNEYXRhICopZGF0YS5sZWFrUmVm KCkpOworICAgIHJldHVybiB0cnVlOworfQorCiB9IC8vIG5hbWVzcGFjZSBDb3JlSVBDCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS0Nvbm5lY3Rpb24uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS0Nvbm5lY3Rpb24uaAko cmV2aXNpb24gMTMzNTQxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tD b25uZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDggQEAgQGludGVyZmFjZSBX S0Nvbm5lY3Rpb24gOiBOU09iamVjdCB7CiAgICAgV0tDb25uZWN0aW9uRGF0YSAqX2RhdGE7CiB9 CiAKKy0gKHZvaWQpc2VuZE1lc3NhZ2VXaXRoTmFtZTooTlNTdHJpbmcgKiltZXNzYWdlTmFtZSBi b2R5OihpZCltZXNzYWdlQm9keTsKKwogI3ByYWdtYSBtYXJrIERlbGVnYXRlcwogCiBAcHJvcGVy dHkoYXNzaWduKSBpZDxXS0Nvbm5lY3Rpb25EZWxlZ2F0ZT4gZGVsZWdhdGU7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS0Nvbm5lY3Rpb24ubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tDb25uZWN0aW9uLm1tCShyZXZp c2lvbiAxMzM1NDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS0Nvbm5l Y3Rpb24ubW0JKHdvcmtpbmcgY29weSkKQEAgLTI3LDExICsyNywxOCBAQAogI2ltcG9ydCAiV0tD b25uZWN0aW9uLmgiCiAjaW1wb3J0ICJXS0Nvbm5lY3Rpb25JbnRlcm5hbC5oIgogCisjaW1wb3J0 ICJBcmd1bWVudENvZGVyc01hYy5oIgorI2ltcG9ydCAiQXJndW1lbnREZWNvZGVyLmgiCisjaW1w b3J0ICJBcmd1bWVudEVuY29kZXIuaCIKICNpbXBvcnQgIldLQ29ubmVjdGlvblJlZi5oIgorI2lt cG9ydCAiV0tEYXRhLmgiCiAjaW1wb3J0ICJXS1JldGFpblB0ci5oIgorI2ltcG9ydCAiV0tTdHJp bmcuaCIKICNpbXBvcnQgIldLU3RyaW5nQ0YuaCIKICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4K IAordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKwogQGludGVyZmFjZSBXS0Nvbm5lY3Rpb25EYXRh IDogTlNPYmplY3QgewogQHB1YmxpYwogICAgIC8vIFVuZGVybHlpbmcgY29ubmVjdGlvbiBvYmpl Y3QuCkBAIC01NSw2ICs2MiwxNyBAQCAtICh2b2lkKWRlYWxsb2MKICAgICBbc3VwZXIgZGVhbGxv Y107CiB9CiAKKy0gKHZvaWQpc2VuZE1lc3NhZ2VXaXRoTmFtZTooTlNTdHJpbmcgKiltZXNzYWdl TmFtZSBib2R5OihpZCltZXNzYWdlQm9keQoreworICAgIE93blB0cjxDb3JlSVBDOjpBcmd1bWVu dEVuY29kZXI+IG1lc3NhZ2VEYXRhID0gQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyOjpjcmVhdGUo KTsKKyAgICBlbmNvZGUoKm1lc3NhZ2VEYXRhLCBtZXNzYWdlQm9keSk7CisKKyAgICBXS1JldGFp blB0cjxXS1N0cmluZ1JlZj4gd2tNZXNzYWdlTmFtZSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVX aXRoQ0ZTdHJpbmcoKENGU3RyaW5nUmVmKW1lc3NhZ2VOYW1lKSk7CisgICAgV0tSZXRhaW5QdHI8 V0tEYXRhUmVmPiB3a01lc3NhZ2VCb2R5ID0gYWRvcHRXSyhXS0RhdGFDcmVhdGUobWVzc2FnZURh dGEtPmJ1ZmZlcigpLCBtZXNzYWdlRGF0YS0+YnVmZmVyU2l6ZSgpKSk7CisKKyAgICBXS0Nvbm5l Y3Rpb25Qb3N0TWVzc2FnZShfZGF0YS0+X2Nvbm5lY3Rpb25SZWYuZ2V0KCksIHdrTWVzc2FnZU5h bWUuZ2V0KCksIHdrTWVzc2FnZUJvZHkuZ2V0KCkpOworfQorCiAjcHJhZ21hIG1hcmsgRGVsZWdh dGVzCiAKIC0gKGlkPFdLQ29ubmVjdGlvbkRlbGVnYXRlPilkZWxlZ2F0ZQpAQCAtNzUsOSArOTMs MTcgQEAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoV0tDb25uZWN0aQogewogICAgIFdL Q29ubmVjdGlvbiAqY29ubmVjdGlvbiA9IChXS0Nvbm5lY3Rpb24gKiljbGllbnRJbmZvOwogICAg IGlmIChbY29ubmVjdGlvbi5kZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGNv bm5lY3Rpb246ZGlkUmVjZWl2ZU1lc3NhZ2VXaXRoTmFtZTpib2R5OildKSB7Ci0gICAgICAgIC8v IEZJWE1FOiBBZGQgbWVzc2FnZUJvZHkgY29udmVyc2lvbi4KICAgICAgICAgUmV0YWluUHRyPENG U3RyaW5nUmVmPiBjZk1lc3NhZ2VOYW1lID0gYWRvcHRDRihXS1N0cmluZ0NvcHlDRlN0cmluZyhr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBtZXNzYWdlTmFtZSkpOwotICAgICAgICBbY29ubmVjdGlvbi5k ZWxlZ2F0ZSBjb25uZWN0aW9uOmNvbm5lY3Rpb24gZGlkUmVjZWl2ZU1lc3NhZ2VXaXRoTmFtZToo TlNTdHJpbmcgKiljZk1lc3NhZ2VOYW1lLmdldCgpIGJvZHk6bmlsXTsKKworICAgICAgICBXS0Rh dGFSZWYgbWVzc2FnZURhdGEgPSAoV0tEYXRhUmVmKW1lc3NhZ2VCb2R5OworICAgICAgICBPd25Q dHI8Q29yZUlQQzo6QXJndW1lbnREZWNvZGVyPiBkZWNvZGVyID0gQ29yZUlQQzo6QXJndW1lbnRE ZWNvZGVyOjpjcmVhdGUoV0tEYXRhR2V0Qnl0ZXMobWVzc2FnZURhdGEpLCBXS0RhdGFHZXRTaXpl KG1lc3NhZ2VEYXRhKSk7CisKKyAgICAgICAgUmV0YWluUHRyPGlkPiBtZXNzYWdlRGljdGlvbmFy eTsKKyAgICAgICAgLy8gRklYTUU6IERvbid0IGp1c3Qgc2lsZW50bHkgZHJvcCBkZWNvZGluZyBm YWlsdXJlcyBvbiB0aGUgZ3JvdW5kLgorICAgICAgICBpZiAoIWRlY29kZShkZWNvZGVyLmdldCgp LCBtZXNzYWdlRGljdGlvbmFyeSkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgW2Nv bm5lY3Rpb24uZGVsZWdhdGUgY29ubmVjdGlvbjpjb25uZWN0aW9uIGRpZFJlY2VpdmVNZXNzYWdl V2l0aE5hbWU6KE5TU3RyaW5nICopY2ZNZXNzYWdlTmFtZS5nZXQoKSBib2R5Om1lc3NhZ2VEaWN0 aW9uYXJ5LmdldCgpXTsKICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW4uaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tX ZWJQcm9jZXNzUGx1Z0luLmgJKHJldmlzaW9uIDEzMzU0MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW4uaAkod29y a2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogI2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0 aW9uLmg+CiAjaW1wb3J0IDxXZWJLaXQyL1dLQmFzZS5oPgogCitAY2xhc3MgV0tDb25uZWN0aW9u OwogQGNsYXNzIFdLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXI7CiBAY2xhc3MgV0tXZWJQcm9j ZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOwogCkBAIC00MCw2ICs0MSw5IEBACiAK IFdLX0VYUE9SVAogQGludGVyZmFjZSBXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9sbGVyIDogTlNP YmplY3QKKworQHByb3BlcnR5KHJlYWRvbmx5KSBXS0Nvbm5lY3Rpb24gKmNvbm5lY3Rpb247CisK IEBlbmQKIAogI2VuZGlmIC8vIGRlZmluZWQoX19MUDY0X18pICYmIGRlZmluZWQoX19jbGFuZ19f KQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFj L1dLV2ViUHJvY2Vzc1BsdWdJbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luLm1tCShyZXZp c2lvbiAxMzM1NDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICsz MSw3IEBACiAjaW1wb3J0ICJXS1dlYlByb2Nlc3NQbHVnSW5JbnRlcm5hbC5oIgogCiAjaW1wb3J0 ICJJbmplY3RlZEJ1bmRsZS5oIgorI2ltcG9ydCAiV0tDb25uZWN0aW9uSW50ZXJuYWwuaCIKICNp bXBvcnQgIldLQnVuZGxlLmgiCiAjaW1wb3J0ICJXS0J1bmRsZUFQSUNhc3QuaCIKICNpbXBvcnQg IldLUmV0YWluUHRyLmgiCkBAIC00Myw2ICs0NCw3IEBAIEBpbnRlcmZhY2UgV0tXZWJQcm9jZXNz UGx1Z0luQ29udHJvbGxlciAKICAgICBSZXRhaW5QdHI8aWQ8V0tXZWJQcm9jZXNzUGx1Z0luPiA+ IF9wcmluY2lwYWxDbGFzc0luc3RhbmNlOwogICAgIFdLUmV0YWluUHRyPFdLQnVuZGxlUmVmPiBf YnVuZGxlUmVmOwogICAgIEJ1bmRsZVBhZ2VXcmFwcGVyQ2FjaGUgX2J1bmRsZVBhZ2VXcmFwcGVy Q2FjaGU7CisgICAgUmV0YWluUHRyPFdLQ29ubmVjdGlvbiAqPiBfY29ubmVjdGlvbldyYXBwZXI7 CiB9CiBAZW5kCiAKQEAgLTExMSw2ICsxMTMsNyBAQCAtIChpZClfaW5pdFdpdGhQcmluY2lwYWxD bGFzc0luc3RhbmNlOihpCiAKICAgICBfcHJpbmNpcGFsQ2xhc3NJbnN0YW5jZSA9IHByaW5jaXBh bENsYXNzSW5zdGFuY2U7CiAgICAgX2J1bmRsZVJlZiA9IGJ1bmRsZVJlZjsKKyAgICBfY29ubmVj dGlvbldyYXBwZXIgPSBhZG9wdE5TKFtbV0tDb25uZWN0aW9uIGFsbG9jXSBfaW5pdFdpdGhDb25u ZWN0aW9uUmVmOldLQnVuZGxlR2V0QXBwbGljYXRpb25Db25uZWN0aW9uKF9idW5kbGVSZWYuZ2V0 KCkpXSk7CiAKICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFzaGFyZWRJbnN0YW5jZSwgIldLV2Vi UHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIgaW5pdGlhbGl6ZWQgbXVsdGlwbGUgdGltZXMuIik7CiAg ICAgc2hhcmVkSW5zdGFuY2UgPSBzZWxmOwpAQCAtMTI0LDYgKzEyNywxMSBAQCAtIChpZClfaW5p dFdpdGhQcmluY2lwYWxDbGFzc0luc3RhbmNlOihpCiAKIEBpbXBsZW1lbnRhdGlvbiBXS1dlYlBy b2Nlc3NQbHVnSW5Db250cm9sbGVyCiAKKy0gKFdLQ29ubmVjdGlvbiAqKWNvbm5lY3Rpb24KK3sK KyAgICByZXR1cm4gX2Nvbm5lY3Rpb25XcmFwcGVyLmdldCgpOworfQorCiBAZW5kCiAKICNlbmRp ZiAvLyBkZWZpbmVkKF9fTFA2NF9fKSAmJiBkZWZpbmVkKF9fY2xhbmdfXykK