23761 2009-02-05 08:50:44 -0800 Use two-arg KURL constructor 2009-02-06 01:22:19 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned oldest_to_newest 108446 0 xan.lopez 2009-02-05 08:50:44 -0800 We use the one arg KURL constructor all over WebKit/GTK, but: - It does not pretend to deal with encodings, so it would fail if we pass anything different than ASCII I think (oops?) - The single-argument KURL ctors expect their input to already be the output of a previous KURL::parse call, so for the general case (ie, random user input) we need to use the two-arg ctor anyway. 108447 1 27351 xan.lopez 2009-02-05 08:54:30 -0800 Created attachment 27351 Uso two-arg KURL ctor 108500 2 27351 ap 2009-02-05 13:52:59 -0800 Comment on attachment 27351 Uso two-arg KURL ctor r=me > - SubstituteData substituteData(sharedBuffer.release(), contentMimeType ? String(contentMimeType) : "text/html", contentEncoding ? String(contentEncoding) : "UTF-8", KURL("about:blank"), url); > + SubstituteData substituteData(sharedBuffer.release(), contentMimeType ? String(contentMimeType) : "text/html", contentEncoding ? String(contentEncoding) : "UTF-8", KURL(KURL(), "about:blank"), url); I think that about:blank can be left as is - KURL parsing clearly won't affect it. Not that it matters much. 108503 3 darin 2009-02-05 13:59:42 -0800 (In reply to comment #2) > > - SubstituteData substituteData(sharedBuffer.release(), contentMimeType ? String(contentMimeType) : "text/html", contentEncoding ? String(contentEncoding) : "UTF-8", KURL("about:blank"), url); > > + SubstituteData substituteData(sharedBuffer.release(), contentMimeType ? String(contentMimeType) : "text/html", contentEncoding ? String(contentEncoding) : "UTF-8", KURL(KURL(), "about:blank"), url); > > I think that about:blank can be left as is - KURL parsing clearly won't affect > it. Not that it matters much. Or this could use the blankURL() function from KURL.h. 108514 4 27364 xan.lopez 2009-02-05 14:30:35 -0800 Created attachment 27364 kurl.patch Use blankURL() for 'about:blank'. Great suggestion, thanks! 108606 5 ap 2009-02-06 01:22:19 -0800 Committed revision 40715. 27351 2009-02-05 08:54:30 -0800 2009-02-05 14:30:35 -0800 Uso two-arg KURL ctor 0001-2009-02-05-Xan-Lopez-xan-gnome.org.patch text/plain 5185 xan.lopez RnJvbSBlZTZhZjliZDM0MzE1ZjA0OTI3MGIyMjZjYmFiN2E0Y2IzNTgyYzA5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhhbkBnbm9tZS5vcmc+CkRhdGU6IFRodSwg NSBGZWIgMjAwOSAxODo1MzozNyArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMDktMDItMDUgIFhh biBMb3BleiAgPHhhbkBnbm9tZS5vcmc+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3 NjEKCiAgICAgICAgVXNlIHR3by1hcmcgS1VSTCBjdG9yLgoKICAgICAgICBXZSBhcmUgdXNpbmcg dGhlIG9uZS1hcmcgY3RvciBjdXJyZW50bHksIGJ1dDoKCiAgICAgICAgLSBJdCBhc3N1bWVzIHRo ZSBzdHJpbmdzIGFyZSBhbHJlYWR5IGVuY29kZWQsIHdoaWNoIGlzIG5vdAogICAgICAgIG5lY2Vz YXJpbHkgdGhlIGNhc2UgZm9yIHVzLgoKICAgICAgICAtIFRoZSBzaW5nbGUtYXJndW1lbnQgS1VS TCBjdG9ycyBleHBlY3QgdGhlaXIgaW5wdXQgdG8gYWxyZWFkeSBiZQogICAgICAgIHRoZSBvdXRw dXQgb2YgYSBwcmV2aW91cyBLVVJMOjpwYXJzZSBjYWxsLCBzbyBmb3IgdGhlIGdlbmVyYWwKICAg ICAgICBjYXNlIChpZSwgcmFuZG9tIHVzZXIgaW5wdXQpIHdlIG5lZWQgdG8gdXNlIHRoZSB0d28t YXJnIGN0b3IKICAgICAgICBhbnl3YXkuCgogICAgICAgICogd2Via2l0L3dlYmtpdHdlYmZyYW1l LmNwcDoKICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKLS0tCiBXZWJLaXQvZ3Rr L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDIxICsrKysrKysrKysrKysrKysrKysrKwog V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIHwgICAgMiArLQogV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgIHwgICAxMCArKysrKy0tLS0tCiAzIGZpbGVzIGNo YW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA0M2VkODM1Li5l ODQwMzc1IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDA5LTAyLTA1ICBYYW4gTG9wZXogIDx4YW5A Z25vbWUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc2MQorCisgICAg ICAgIFVzZSB0d28tYXJnIEtVUkwgY3Rvci4KKworICAgICAgICBXZSBhcmUgdXNpbmcgdGhlIG9u ZS1hcmcgY3RvciBjdXJyZW50bHksIGJ1dDoKKworICAgICAgICAtIEl0IGFzc3VtZXMgdGhlIHN0 cmluZ3MgYXJlIGFscmVhZHkgZW5jb2RlZCwgd2hpY2ggaXMgbm90CisgICAgICAgIG5lY2VzYXJp bHkgdGhlIGNhc2UgZm9yIHVzLgorCisgICAgICAgIC0gVGhlIHNpbmdsZS1hcmd1bWVudCBLVVJM IGN0b3JzIGV4cGVjdCB0aGVpciBpbnB1dCB0byBhbHJlYWR5IGJlCisgICAgICAgIHRoZSBvdXRw dXQgb2YgYSBwcmV2aW91cyBLVVJMOjpwYXJzZSBjYWxsLCBzbyBmb3IgdGhlIGdlbmVyYWwKKyAg ICAgICAgY2FzZSAoaWUsIHJhbmRvbSB1c2VyIGlucHV0KSB3ZSBuZWVkIHRvIHVzZSB0aGUgdHdv LWFyZyBjdG9yCisgICAgICAgIGFueXdheS4KKworICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJm cmFtZS5jcHA6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorCiAyMDA5LTAy LTAzICBIaXJveXVraSBJa2V6b2UgIDxwb2luY2FyZUBpa2V6b2UubmV0PgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEhvbGdlciBGcmV5dGhlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYmZyYW1lLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNw cAppbmRleCAyN2I4YWI4Li45Yjk5NTdhIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXR3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUu Y3BwCkBAIC0zOTQsNyArMzk0LDcgQEAgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX2xvYWRfcmVxdWVz dChXZWJLaXRXZWJGcmFtZSogZnJhbWUsIFdlYktpdE5ldHdvcmtSZXF1ZXN0KgogCiAgICAgLy8g VE9ETzogVXNlIHRoZSBSZXNvdXJjZVJlcXVlc3QgY2FycmllZCBieSBXZWJLaXROZXR3b3JrUmVx dWVzdCB3aGVuIGl0IGlzIGltcGxlbWVudGVkLgogICAgIFN0cmluZyBzdHJpbmcgPSBTdHJpbmc6 OmZyb21VVEY4KHdlYmtpdF9uZXR3b3JrX3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KSk7Ci0gICAg Y29yZUZyYW1lLT5sb2FkZXIoKS0+bG9hZChSZXNvdXJjZVJlcXVlc3QoS1VSTChzdHJpbmcpKSwg ZmFsc2UpOworICAgIGNvcmVGcmFtZS0+bG9hZGVyKCktPmxvYWQoUmVzb3VyY2VSZXF1ZXN0KEtV UkwoS1VSTCgpLCBzdHJpbmcpKSwgZmFsc2UpOwogfQogCiAvKioKZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vidmlldy5jcHAKaW5kZXggMDdkNjQwYS4uMTk4NDliMCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vidmlldy5jcHAKQEAgLTE2NTgsNyArMTY1OCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJf dmlld191cGRhdGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBzZXR0aW5n cy0+c2V0SmF2YVNjcmlwdEVuYWJsZWQoZW5hYmxlU2NyaXB0cyk7CiAgICAgc2V0dGluZ3MtPnNl dFBsdWdpbnNFbmFibGVkKGVuYWJsZVBsdWdpbnMpOwogICAgIHNldHRpbmdzLT5zZXRUZXh0QXJl YXNBcmVSZXNpemFibGUocmVzaXphYmxlVGV4dEFyZWFzKTsKLSAgICBzZXR0aW5ncy0+c2V0VXNl clN0eWxlU2hlZXRMb2NhdGlvbihLVVJMKHVzZXJTdHlsZXNoZWV0VXJpKSk7CisgICAgc2V0dGlu Z3MtPnNldFVzZXJTdHlsZVNoZWV0TG9jYXRpb24oS1VSTChLVVJMKCksIHVzZXJTdHlsZXNoZWV0 VXJpKSk7CiAgICAgc2V0dGluZ3MtPnNldERldmVsb3BlckV4dHJhc0VuYWJsZWQoZW5hYmxlRGV2 ZWxvcGVyRXh0cmFzKTsKIAogICAgIGdfZnJlZShkZWZhdWx0RW5jb2RpbmcpOwpAQCAtMTcyNSw3 ICsxNzI1LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldHRpbmdzX25vdGlmeShX ZWJLaXRXZWJTZXR0aW5ncyogd2ViU2V0dGluZ3MsIEdQYXIKICAgICBlbHNlIGlmIChuYW1lID09 IGdfaW50ZXJuX3N0cmluZygicmVzaXphYmxlLXRleHQtYXJlYXMiKSkKICAgICAgICAgc2V0dGlu Z3MtPnNldFRleHRBcmVhc0FyZVJlc2l6YWJsZShnX3ZhbHVlX2dldF9ib29sZWFuKCZ2YWx1ZSkp OwogICAgIGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRlcm5fc3RyaW5nKCJ1c2VyLXN0eWxlc2hlZXQt dXJpIikpCi0gICAgICAgIHNldHRpbmdzLT5zZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKEtVUkwo Z192YWx1ZV9nZXRfc3RyaW5nKCZ2YWx1ZSkpKTsKKyAgICAgICAgc2V0dGluZ3MtPnNldFVzZXJT dHlsZVNoZWV0TG9jYXRpb24oS1VSTChLVVJMKCksIGdfdmFsdWVfZ2V0X3N0cmluZygmdmFsdWUp KSk7CiAgICAgZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9zdHJpbmcoImVuYWJsZS1kZXZlbG9w ZXItZXh0cmFzIikpCiAgICAgICAgIHNldHRpbmdzLT5zZXREZXZlbG9wZXJFeHRyYXNFbmFibGVk KGdfdmFsdWVfZ2V0X2Jvb2xlYW4oJnZhbHVlKSk7CiAgICAgZWxzZSBpZiAoIWdfb2JqZWN0X2Ns YXNzX2ZpbmRfcHJvcGVydHkoR19PQkpFQ1RfR0VUX0NMQVNTKHdlYlNldHRpbmdzKSwgbmFtZSkp CkBAIC0yMDU0LDcgKzIwNTQsNyBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19vcGVuKFdlYktpdFdl YlZpZXcqIHdlYlZpZXcsIGNvbnN0IGdjaGFyKiB1cmkpCiAgICAgZ19yZXR1cm5faWZfZmFpbCh1 cmkpOwogCiAgICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+bWFpbkZyYW1lKCk7Ci0g ICAgZnJhbWUtPmxvYWRlcigpLT5sb2FkKFJlc291cmNlUmVxdWVzdChLVVJMKFN0cmluZzo6ZnJv bVVURjgodXJpKSkpLCBmYWxzZSk7CisgICAgZnJhbWUtPmxvYWRlcigpLT5sb2FkKFJlc291cmNl UmVxdWVzdChLVVJMKEtVUkwoKSwgU3RyaW5nOjpmcm9tVVRGOCh1cmkpKSksIGZhbHNlKTsKIH0K IAogdm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVsb2FkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCkBA IC0yMDg2LDkgKzIwODYsOSBAQCB2b2lkIHdlYmtpdF93ZWJfdmlld19sb2FkX3N0cmluZyhXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogY29udGVudCwgYwogCiAgICAgRnJhbWUq IGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+bWFpbkZyYW1lKCk7CiAKLSAgICBLVVJMIHVybChiYXNl VXJpID8gU3RyaW5nOjpmcm9tVVRGOChiYXNlVXJpKSA6ICIiKTsKKyAgICBLVVJMIHVybChLVVJM KCksIGJhc2VVcmkgPyBTdHJpbmc6OmZyb21VVEY4KGJhc2VVcmkpIDogIiIpOwogICAgIFJlZlB0 cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGNvbnRl bnQsIHN0cmxlbihjb250ZW50KSk7Ci0gICAgU3Vic3RpdHV0ZURhdGEgc3Vic3RpdHV0ZURhdGEo c2hhcmVkQnVmZmVyLnJlbGVhc2UoKSwgY29udGVudE1pbWVUeXBlID8gU3RyaW5nKGNvbnRlbnRN aW1lVHlwZSkgOiAidGV4dC9odG1sIiwgY29udGVudEVuY29kaW5nID8gU3RyaW5nKGNvbnRlbnRF bmNvZGluZykgOiAiVVRGLTgiLCBLVVJMKCJhYm91dDpibGFuayIpLCB1cmwpOworICAgIFN1YnN0 aXR1dGVEYXRhIHN1YnN0aXR1dGVEYXRhKHNoYXJlZEJ1ZmZlci5yZWxlYXNlKCksIGNvbnRlbnRN aW1lVHlwZSA/IFN0cmluZyhjb250ZW50TWltZVR5cGUpIDogInRleHQvaHRtbCIsIGNvbnRlbnRF bmNvZGluZyA/IFN0cmluZyhjb250ZW50RW5jb2RpbmcpIDogIlVURi04IiwgS1VSTChLVVJMKCks ICJhYm91dDpibGFuayIpLCB1cmwpOwogCiAgICAgZnJhbWUtPmxvYWRlcigpLT5sb2FkKFJlc291 cmNlUmVxdWVzdCh1cmwpLCBzdWJzdGl0dXRlRGF0YSwgZmFsc2UpOwogfQotLSAKMS42LjEKCg== 27364 2009-02-05 14:30:35 -0800 2009-02-06 01:19:58 -0800 kurl.patch kurl.patch text/plain 5172 xan.lopez RnJvbSA4MDBiODQxOGNkYTdkOWU3NzNmZWYzZDE4OWUyOTcwYjJhMzY0Y2U2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhhbkBnbm9tZS5vcmc+CkRhdGU6IFRodSwg NSBGZWIgMjAwOSAxODo1MzozNyArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMS8yXSAyMDA5LTAyLTA1 ICBYYW4gTG9wZXogIDx4YW5AZ25vbWUub3JnPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNzYxCgogICAgICAgIFVzZSB0d28tYXJnIEtVUkwgY3Rvci4KCiAgICAgICAgV2UgYXJlIHVz aW5nIHRoZSBvbmUtYXJnIGN0b3IgY3VycmVudGx5LCBidXQ6CgogICAgICAgIC0gSXQgYXNzdW1l cyB0aGUgc3RyaW5ncyBhcmUgYWxyZWFkeSBlbmNvZGVkLCB3aGljaCBpcyBub3QKICAgICAgICBu ZWNlc2FyaWx5IHRoZSBjYXNlIGZvciB1cy4KCiAgICAgICAgLSBUaGUgc2luZ2xlLWFyZ3VtZW50 IEtVUkwgY3RvcnMgZXhwZWN0IHRoZWlyIGlucHV0IHRvIGFscmVhZHkgYmUKICAgICAgICB0aGUg b3V0cHV0IG9mIGEgcHJldmlvdXMgS1VSTDo6cGFyc2UgY2FsbCwgc28gZm9yIHRoZSBnZW5lcmFs CiAgICAgICAgY2FzZSAoaWUsIHJhbmRvbSB1c2VyIGlucHV0KSB3ZSBuZWVkIHRvIHVzZSB0aGUg dHdvLWFyZyBjdG9yCiAgICAgICAgYW55d2F5LgoKICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJm cmFtZS5jcHA6CiAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6Ci0tLQogV2ViS2l0 L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgIHwgICAyMSArKysrKysrKysrKysrKysrKysr KysKIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcCB8ICAgIDIgKy0KIFdlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwICB8ICAgMTAgKysrKystLS0tLQogMyBmaWxl cyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNDNlZDgz NS4uZTg0MDM3NSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAwOS0wMi0wNSAgWGFuIExvcGV6ICA8 eGFuQGdub21lLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjEKKwor ICAgICAgICBVc2UgdHdvLWFyZyBLVVJMIGN0b3IuCisKKyAgICAgICAgV2UgYXJlIHVzaW5nIHRo ZSBvbmUtYXJnIGN0b3IgY3VycmVudGx5LCBidXQ6CisKKyAgICAgICAgLSBJdCBhc3N1bWVzIHRo ZSBzdHJpbmdzIGFyZSBhbHJlYWR5IGVuY29kZWQsIHdoaWNoIGlzIG5vdAorICAgICAgICBuZWNl c2FyaWx5IHRoZSBjYXNlIGZvciB1cy4KKworICAgICAgICAtIFRoZSBzaW5nbGUtYXJndW1lbnQg S1VSTCBjdG9ycyBleHBlY3QgdGhlaXIgaW5wdXQgdG8gYWxyZWFkeSBiZQorICAgICAgICB0aGUg b3V0cHV0IG9mIGEgcHJldmlvdXMgS1VSTDo6cGFyc2UgY2FsbCwgc28gZm9yIHRoZSBnZW5lcmFs CisgICAgICAgIGNhc2UgKGllLCByYW5kb20gdXNlciBpbnB1dCkgd2UgbmVlZCB0byB1c2UgdGhl IHR3by1hcmcgY3RvcgorICAgICAgICBhbnl3YXkuCisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0 d2ViZnJhbWUuY3BwOgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKwogMjAw OS0wMi0wMyAgSGlyb3l1a2kgSWtlem9lICA8cG9pbmNhcmVAaWtlem9lLm5ldD4KIAogICAgICAg ICBSZXZpZXdlZCBieSBIb2xnZXIgRnJleXRoZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFt ZS5jcHAKaW5kZXggMjdiOGFiOC4uOWI5OTU3YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2ViZnJhbWUuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZy YW1lLmNwcApAQCAtMzk0LDcgKzM5NCw3IEBAIHZvaWQgd2Via2l0X3dlYl9mcmFtZV9sb2FkX3Jl cXVlc3QoV2ViS2l0V2ViRnJhbWUqIGZyYW1lLCBXZWJLaXROZXR3b3JrUmVxdWVzdCoKIAogICAg IC8vIFRPRE86IFVzZSB0aGUgUmVzb3VyY2VSZXF1ZXN0IGNhcnJpZWQgYnkgV2ViS2l0TmV0d29y a1JlcXVlc3Qgd2hlbiBpdCBpcyBpbXBsZW1lbnRlZC4KICAgICBTdHJpbmcgc3RyaW5nID0gU3Ry aW5nOjpmcm9tVVRGOCh3ZWJraXRfbmV0d29ya19yZXF1ZXN0X2dldF91cmkocmVxdWVzdCkpOwot ICAgIGNvcmVGcmFtZS0+bG9hZGVyKCktPmxvYWQoUmVzb3VyY2VSZXF1ZXN0KEtVUkwoc3RyaW5n KSksIGZhbHNlKTsKKyAgICBjb3JlRnJhbWUtPmxvYWRlcigpLT5sb2FkKFJlc291cmNlUmVxdWVz dChLVVJMKEtVUkwoKSwgc3RyaW5nKSksIGZhbHNlKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnZpZXcuY3BwCmluZGV4IDA3ZDY0MGEuLjlkMjk5NzcgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnZpZXcuY3BwCkBAIC0xNjU4LDcgKzE2NTgsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfdXBkYXRlX3NldHRpbmdzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgc2V0 dGluZ3MtPnNldEphdmFTY3JpcHRFbmFibGVkKGVuYWJsZVNjcmlwdHMpOwogICAgIHNldHRpbmdz LT5zZXRQbHVnaW5zRW5hYmxlZChlbmFibGVQbHVnaW5zKTsKICAgICBzZXR0aW5ncy0+c2V0VGV4 dEFyZWFzQXJlUmVzaXphYmxlKHJlc2l6YWJsZVRleHRBcmVhcyk7Ci0gICAgc2V0dGluZ3MtPnNl dFVzZXJTdHlsZVNoZWV0TG9jYXRpb24oS1VSTCh1c2VyU3R5bGVzaGVldFVyaSkpOworICAgIHNl dHRpbmdzLT5zZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKEtVUkwoS1VSTCgpLCB1c2VyU3R5bGVz aGVldFVyaSkpOwogICAgIHNldHRpbmdzLT5zZXREZXZlbG9wZXJFeHRyYXNFbmFibGVkKGVuYWJs ZURldmVsb3BlckV4dHJhcyk7CiAKICAgICBnX2ZyZWUoZGVmYXVsdEVuY29kaW5nKTsKQEAgLTE3 MjUsNyArMTcyNSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXR0aW5nc19ub3Rp ZnkoV2ViS2l0V2ViU2V0dGluZ3MqIHdlYlNldHRpbmdzLCBHUGFyCiAgICAgZWxzZSBpZiAobmFt ZSA9PSBnX2ludGVybl9zdHJpbmcoInJlc2l6YWJsZS10ZXh0LWFyZWFzIikpCiAgICAgICAgIHNl dHRpbmdzLT5zZXRUZXh0QXJlYXNBcmVSZXNpemFibGUoZ192YWx1ZV9nZXRfYm9vbGVhbigmdmFs dWUpKTsKICAgICBlbHNlIGlmIChuYW1lID09IGdfaW50ZXJuX3N0cmluZygidXNlci1zdHlsZXNo ZWV0LXVyaSIpKQotICAgICAgICBzZXR0aW5ncy0+c2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbihL VVJMKGdfdmFsdWVfZ2V0X3N0cmluZygmdmFsdWUpKSk7CisgICAgICAgIHNldHRpbmdzLT5zZXRV c2VyU3R5bGVTaGVldExvY2F0aW9uKEtVUkwoS1VSTCgpLCBnX3ZhbHVlX2dldF9zdHJpbmcoJnZh bHVlKSkpOwogICAgIGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRlcm5fc3RyaW5nKCJlbmFibGUtZGV2 ZWxvcGVyLWV4dHJhcyIpKQogICAgICAgICBzZXR0aW5ncy0+c2V0RGV2ZWxvcGVyRXh0cmFzRW5h YmxlZChnX3ZhbHVlX2dldF9ib29sZWFuKCZ2YWx1ZSkpOwogICAgIGVsc2UgaWYgKCFnX29iamVj dF9jbGFzc19maW5kX3Byb3BlcnR5KEdfT0JKRUNUX0dFVF9DTEFTUyh3ZWJTZXR0aW5ncyksIG5h bWUpKQpAQCAtMjA1NCw3ICsyMDU0LDcgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfb3BlbihXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogdXJpKQogICAgIGdfcmV0dXJuX2lmX2Zh aWwodXJpKTsKIAogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUod2ViVmlldyktPm1haW5GcmFtZSgp OwotICAgIGZyYW1lLT5sb2FkZXIoKS0+bG9hZChSZXNvdXJjZVJlcXVlc3QoS1VSTChTdHJpbmc6 OmZyb21VVEY4KHVyaSkpKSwgZmFsc2UpOworICAgIGZyYW1lLT5sb2FkZXIoKS0+bG9hZChSZXNv dXJjZVJlcXVlc3QoS1VSTChLVVJMKCksIFN0cmluZzo6ZnJvbVVURjgodXJpKSkpLCBmYWxzZSk7 CiB9CiAKIHZvaWQgd2Via2l0X3dlYl92aWV3X3JlbG9hZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQpAQCAtMjA4Niw5ICsyMDg2LDkgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9zdHJpbmco V2ViS2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgZ2NoYXIqIGNvbnRlbnQsIGMKIAogICAgIEZy YW1lKiBmcmFtZSA9IGNvcmUod2ViVmlldyktPm1haW5GcmFtZSgpOwogCi0gICAgS1VSTCB1cmwo YmFzZVVyaSA/IFN0cmluZzo6ZnJvbVVURjgoYmFzZVVyaSkgOiAiIik7CisgICAgS1VSTCB1cmwo S1VSTCgpLCBiYXNlVXJpID8gU3RyaW5nOjpmcm9tVVRGOChiYXNlVXJpKSA6ICIiKTsKICAgICBS ZWZQdHI8U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShj b250ZW50LCBzdHJsZW4oY29udGVudCkpOwotICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVE YXRhKHNoYXJlZEJ1ZmZlci5yZWxlYXNlKCksIGNvbnRlbnRNaW1lVHlwZSA/IFN0cmluZyhjb250 ZW50TWltZVR5cGUpIDogInRleHQvaHRtbCIsIGNvbnRlbnRFbmNvZGluZyA/IFN0cmluZyhjb250 ZW50RW5jb2RpbmcpIDogIlVURi04IiwgS1VSTCgiYWJvdXQ6YmxhbmsiKSwgdXJsKTsKKyAgICBT dWJzdGl0dXRlRGF0YSBzdWJzdGl0dXRlRGF0YShzaGFyZWRCdWZmZXIucmVsZWFzZSgpLCBjb250 ZW50TWltZVR5cGUgPyBTdHJpbmcoY29udGVudE1pbWVUeXBlKSA6ICJ0ZXh0L2h0bWwiLCBjb250 ZW50RW5jb2RpbmcgPyBTdHJpbmcoY29udGVudEVuY29kaW5nKSA6ICJVVEYtOCIsIGJsYW5rVVJM KCksIHVybCk7CiAKICAgICBmcmFtZS0+bG9hZGVyKCktPmxvYWQoUmVzb3VyY2VSZXF1ZXN0KHVy bCksIHN1YnN0aXR1dGVEYXRhLCBmYWxzZSk7CiB9Ci0tIAoxLjYuMQoK