114347 2013-04-10 03:49:53 -0700 [GTK] Notify WebProcess in WebKitURISchemeRequest when we fail to read the user InputStream 2013-05-27 06:31:54 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 94316 0 rego webkit-unassigned andersca benjamin cgarcia commit-queue gustavo mrobinson oldest_to_newest 872697 0 rego 2013-04-10 03:49:53 -0700 Until now we were finishing the request without notifying the WebProcess when we fail to read the user InputStream while managing a WebKitURISchemeRequest. In WebKitURISchemeRequest::webkitURISchemeRequestReadCallback() it's marked as FIXME: static void webkitURISchemeRequestReadCallback(GInputStream* inputStream, GAsyncResult* result, WebKitURISchemeRequest* schemeRequest) { GRefPtr<WebKitURISchemeRequest> request = adoptGRef(schemeRequest); gssize bytesRead = g_input_stream_read_finish(inputStream, result, 0); // FIXME: notify the WebProcess that we failed to read from the user stream. if (bytesRead == -1) { webkitWebContextDidFinishURIRequest(request->priv->webContext, request->priv->requestID); return; } [...] } 872707 1 197242 rego 2013-04-10 04:03:14 -0700 Created attachment 197242 Patch 872902 2 197242 mrobinson 2013-04-10 09:34:44 -0700 Comment on attachment 197242 Patch You might add a few words about what kind of situation motivates this change. 872932 3 197242 cgarcia 2013-04-10 10:30:49 -0700 Comment on attachment 197242 Patch We also need unit tests. 872967 4 commit-queue 2013-04-10 11:08:35 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 874370 5 197719 rego 2013-04-11 23:08:06 -0700 Created attachment 197719 Patch 874374 6 197719 cgarcia 2013-04-11 23:20:06 -0700 Comment on attachment 197719 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197719&action=review > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp:235 > + g_assert_cmpstr(test->m_error->message, ==, "Stream is already closed"); Don't check the message in this case, this error comes from glib and the message might change making this test fail. Checking the domain and error code is enough. 874375 7 197720 rego 2013-04-11 23:31:39 -0700 Created attachment 197720 Patch 885651 8 rego 2013-05-07 02:23:36 -0700 This is ready for owner review as bug #94316 has already landed. 893980 9 202972 rego 2013-05-27 05:11:37 -0700 Created attachment 202972 Patch Patch still applies and works in trunk. Re-uploading it to check EWSs. 894006 10 202972 cgarcia 2013-05-27 06:10:18 -0700 Comment on attachment 202972 Patch Thanks! 894011 11 202972 commit-queue 2013-05-27 06:31:51 -0700 Comment on attachment 202972 Patch Clearing flags on attachment: 202972 Committed r150753: <http://trac.webkit.org/changeset/150753> 894012 12 commit-queue 2013-05-27 06:31:54 -0700 All reviewed patches have been landed. Closing bug. 197242 2013-04-10 04:03:14 -0700 2013-04-11 23:07:58 -0700 Patch bug-114347-20130410130254.patch text/plain 2184 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3OTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjNlOTYxZmJlOTNmYzQ3 MWU3NDhkOTNiNzhlNmMxMTgwNDdkNjI4MS4uODE1YmMwNDRkOGE1NTBmYzI1YWQ2YTA4NmUxYTEx MDIxNTAzY2VkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDEzLTA0LTEwICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIE5v dGlmeSBXZWJQcm9jZXNzIGluIFdlYktpdFVSSVNjaGVtZVJlcXVlc3Qgd2hlbiB3ZSBmYWlsIHRv IHJlYWQgdGhlIHVzZXIgSW5wdXRTdHJlYW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDM0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1lUmVx dWVzdC5jcHA6CisgICAgICAgICh3ZWJraXRVUklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNrKTog R2V0IHRoZSBlcnJvciBmcm9tCisgICAgICAgIGdfaW5wdXRfc3RyZWFtX3JlYWRfZmluaXNoKCkg YW5kIHVzZSBpdCB0byBjYWxsCisgICAgICAgIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZmlu aXNoX2Vycm9yKCkgaW4gb3JkZXIgdG8gZmluaXNoIHRoZSBmYWlsaW5nCisgICAgICAgIFdlYktp dFVSSVNjaGVtZVJlcXVlc3QgcHJvcGVybHkuCisKKzIwMTMtMDQtMTAgIE1hbnVlbCBSZWdvIENh c2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gQWRkIHdlYmtpdF91 cmlfc2NoZW1lX3JlcXVlc3RfZmluaXNoX2Vycm9yCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDMxNgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklTY2hlbWVSZXF1ZXN0LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNjaGVtZVJlcXVlc3QuY3BwCmluZGV4 IGY0ZTViODBhZDM1ZTE4MTM4NGYyM2MwNzAxNGZlNDkxOGI2ZmU0ZjAuLjBlNTIxODEyOWI0ZDdm N2I1MzIxOWM3YTg2NDBlNzA2NzdiZjQ4NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNjaGVtZVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNjaGVtZVJlcXVlc3QuY3BwCkBAIC0x NjMsMTAgKzE2MywxMCBAQCBXZWJLaXRXZWJWaWV3KiB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1ZXN0 X2dldF93ZWJfdmlldyhXZWJLaXRVUklTY2hlbWVSZXF1ZXN0KiByZQogc3RhdGljIHZvaWQgd2Vi a2l0VVJJU2NoZW1lUmVxdWVzdFJlYWRDYWxsYmFjayhHSW5wdXRTdHJlYW0qIGlucHV0U3RyZWFt LCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCogc2NoZW1lUmVx dWVzdCkKIHsKICAgICBHUmVmUHRyPFdlYktpdFVSSVNjaGVtZVJlcXVlc3Q+IHJlcXVlc3QgPSBh ZG9wdEdSZWYoc2NoZW1lUmVxdWVzdCk7Ci0gICAgZ3NzaXplIGJ5dGVzUmVhZCA9IGdfaW5wdXRf c3RyZWFtX3JlYWRfZmluaXNoKGlucHV0U3RyZWFtLCByZXN1bHQsIDApOwotICAgIC8vIEZJWE1F OiBub3RpZnkgdGhlIFdlYlByb2Nlc3MgdGhhdCB3ZSBmYWlsZWQgdG8gcmVhZCBmcm9tIHRoZSB1 c2VyIHN0cmVhbS4KKyAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CisgICAgZ3NzaXplIGJ5dGVz UmVhZCA9IGdfaW5wdXRfc3RyZWFtX3JlYWRfZmluaXNoKGlucHV0U3RyZWFtLCByZXN1bHQsICZl cnJvci5vdXRQdHIoKSk7CiAgICAgaWYgKGJ5dGVzUmVhZCA9PSAtMSkgewotICAgICAgICB3ZWJr aXRXZWJDb250ZXh0RGlkRmluaXNoVVJJUmVxdWVzdChyZXF1ZXN0LT5wcml2LT53ZWJDb250ZXh0 LCByZXF1ZXN0LT5wcml2LT5yZXF1ZXN0SUQpOworICAgICAgICB3ZWJraXRfdXJpX3NjaGVtZV9y ZXF1ZXN0X2ZpbmlzaF9lcnJvcihyZXF1ZXN0LmdldCgpLCBlcnJvci5nZXQoKSk7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAK 197719 2013-04-11 23:08:06 -0700 2013-04-11 23:31:33 -0700 Patch bug-114347-20130412080744.patch text/plain 4487 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWJmZGNmY2FkZjNmZDRh NjJiZjFiNTQwOGU0MDRlNjRjZGNiNWY0My4uOWQ1ZDljNzRhMzUzZTM3OWEzZTljZTEzNTA1ZmRi ZTUwZTAwODgxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA0LTExICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIE5v dGlmeSBXZWJQcm9jZXNzIGluIFdlYktpdFVSSVNjaGVtZVJlcXVlc3Qgd2hlbiB3ZSBmYWlsIHRv IHJlYWQgdGhlIHVzZXIgSW5wdXRTdHJlYW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDM0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdoaWxlIHByb2Nlc3NpbmcgYSBXZWJLaXRVUklTY2hlbWVSZXF1 ZXN0IGlmIHRoZXJlIGlzIGFueSBlcnJvciByZWFkaW5nCisgICAgICAgIHRoZSBJbnB1dFN0cmVh bSBwcm92aWRlZCBieSB0aGUgdXNlciAoZm9yIGV4YW1wbGUgdGhlIHN0cmVhbSBpcyBhbHJlYWR5 CisgICAgICAgIGNsb3NlZCkgd2UgaGF2ZSB0byBub3RpZnkgdGhlIFdlYlByb2Nlc3MgdGhhdCB0 aGUgcmVxdWVzdCBoYXMgZmFpbGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdC5jcHA6CisgICAgICAgICh3ZWJraXRVUklTY2hlbWVSZXF1ZXN0 UmVhZENhbGxiYWNrKTogR2V0IHRoZSBlcnJvciBmcm9tCisgICAgICAgIGdfaW5wdXRfc3RyZWFt X3JlYWRfZmluaXNoKCkgYW5kIHVzZSBpdCB0byBjYWxsCisgICAgICAgIHdlYmtpdF91cmlfc2No ZW1lX3JlcXVlc3RfZmluaXNoX2Vycm9yKCkgaW4gb3JkZXIgdG8gZmluaXNoIHRoZSBmYWlsaW5n CisgICAgICAgIFdlYktpdFVSSVNjaGVtZVJlcXVlc3QgcHJvcGVybHkuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAo dGVzdFdlYkNvbnRleHRVUklTY2hlbWUpOiBNb2RpZnkgdGVzdCB0byBjaGVjayB0aGUgbmV3IHNp dHVhdGlvbiB1c2luZworICAgICAgICBhbiBhbHJlYWR5IGNsb3NlZCBJbnB1dFN0cmVhbS4KKwog MjAxMy0wNC0xMCAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXSBBZGQgd2Via2l0X3VyaV9zY2hlbWVfcmVxdWVzdF9maW5pc2hfZXJyb3IK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNj aGVtZVJlcXVlc3QuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 VVJJU2NoZW1lUmVxdWVzdC5jcHAKaW5kZXggZjRlNWI4MGFkMzVlMTgxMzg0ZjIzYzA3MDE0ZmU0 OTE4YjZmZTRmMC4uMGU1MjE4MTI5YjRkN2Y3YjUzMjE5YzdhODY0MGU3MDY3N2JmNDg0NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1l UmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 VVJJU2NoZW1lUmVxdWVzdC5jcHAKQEAgLTE2MywxMCArMTYzLDEwIEBAIFdlYktpdFdlYlZpZXcq IHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZ2V0X3dlYl92aWV3KFdlYktpdFVSSVNjaGVtZVJl cXVlc3QqIHJlCiBzdGF0aWMgdm9pZCB3ZWJraXRVUklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNr KEdJbnB1dFN0cmVhbSogaW5wdXRTdHJlYW0sIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBXZWJLaXRV UklTY2hlbWVSZXF1ZXN0KiBzY2hlbWVSZXF1ZXN0KQogewogICAgIEdSZWZQdHI8V2ViS2l0VVJJ U2NoZW1lUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0R1JlZihzY2hlbWVSZXF1ZXN0KTsKLSAgICBn c3NpemUgYnl0ZXNSZWFkID0gZ19pbnB1dF9zdHJlYW1fcmVhZF9maW5pc2goaW5wdXRTdHJlYW0s IHJlc3VsdCwgMCk7Ci0gICAgLy8gRklYTUU6IG5vdGlmeSB0aGUgV2ViUHJvY2VzcyB0aGF0IHdl IGZhaWxlZCB0byByZWFkIGZyb20gdGhlIHVzZXIgc3RyZWFtLgorICAgIEdPd25QdHI8R0Vycm9y PiBlcnJvcjsKKyAgICBnc3NpemUgYnl0ZXNSZWFkID0gZ19pbnB1dF9zdHJlYW1fcmVhZF9maW5p c2goaW5wdXRTdHJlYW0sIHJlc3VsdCwgJmVycm9yLm91dFB0cigpKTsKICAgICBpZiAoYnl0ZXNS ZWFkID09IC0xKSB7Ci0gICAgICAgIHdlYmtpdFdlYkNvbnRleHREaWRGaW5pc2hVUklSZXF1ZXN0 KHJlcXVlc3QtPnByaXYtPndlYkNvbnRleHQsIHJlcXVlc3QtPnByaXYtPnJlcXVlc3RJRCk7Cisg ICAgICAgIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZmluaXNoX2Vycm9yKHJlcXVlc3QuZ2V0 KCksIGVycm9yLmdldCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkNvbnRl eHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktp dFdlYkNvbnRleHQuY3BwCmluZGV4IDc4YTdlNmUyZjRiYzhmMDQ4NzcxNDIwYThlNjYyMjJhMTZh MTk0M2QuLjEzMWU3N2Q5ZjU3MjFlZjQ5NzNkNWY4MDU1ZGMzZDU2NDFhM2Q2MzQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJD b250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9U ZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTE2Niw3ICsxNjYsOSBAQCBwdWJsaWM6CiAgICAg ICAgIGlmICghZ19zdHJjbXAwKHNjaGVtZSwgImVjaG8iKSkgewogICAgICAgICAgICAgY2hhciog cmVwbHlIVE1MID0gZ19zdHJkdXBfcHJpbnRmKGhhbmRsZXIucmVwbHkuZGF0YSgpLCB3ZWJraXRf dXJpX3NjaGVtZV9yZXF1ZXN0X2dldF9wYXRoKHJlcXVlc3QpKTsKICAgICAgICAgICAgIGdfbWVt b3J5X2lucHV0X3N0cmVhbV9hZGRfZGF0YShHX01FTU9SWV9JTlBVVF9TVFJFQU0oaW5wdXRTdHJl YW0uZ2V0KCkpLCByZXBseUhUTUwsIHN0cmxlbihyZXBseUhUTUwpLCBnX2ZyZWUpOwotICAgICAg ICB9IGVsc2UgaWYgKCFoYW5kbGVyLnJlcGx5LmlzTnVsbCgpKQorICAgICAgICB9IGVsc2UgaWYg KCFnX3N0cmNtcDAoc2NoZW1lLCAiY2xvc2VkIikpCisgICAgICAgICAgICBnX2lucHV0X3N0cmVh bV9jbG9zZShpbnB1dFN0cmVhbS5nZXQoKSwgMCwgMCk7CisgICAgICAgIGVsc2UgaWYgKCFoYW5k bGVyLnJlcGx5LmlzTnVsbCgpKQogICAgICAgICAgICAgZ19tZW1vcnlfaW5wdXRfc3RyZWFtX2Fk ZF9kYXRhKEdfTUVNT1JZX0lOUFVUX1NUUkVBTShpbnB1dFN0cmVhbS5nZXQoKSksIGhhbmRsZXIu cmVwbHkuZGF0YSgpLCBoYW5kbGVyLnJlcGx5Lmxlbmd0aCgpLCAwKTsKIAogICAgICAgICB3ZWJr aXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2ZpbmlzaChyZXF1ZXN0LCBpbnB1dFN0cmVhbS5nZXQoKSwg aGFuZGxlci5yZXBseUxlbmd0aCwgaGFuZGxlci5taW1lVHlwZS5kYXRhKCkpOwpAQCAtMjIyLDYg KzIyNCwxNSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViQ29udGV4dFVSSVNjaGVtZShVUklTY2hlbWVU ZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIGdfYXNzZXJ0KHRlc3QtPm1fbG9hZEZhaWxl ZCk7CiAgICAgZ19hc3NlcnRfZXJyb3IodGVzdC0+bV9lcnJvci5nZXQoKSwgZ19xdWFya19mcm9t X3N0cmluZyhlcnJvckRvbWFpbiksIGVycm9yQ29kZSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKHRl c3QtPm1fZXJyb3ItPm1lc3NhZ2UsID09LCBlcnJvck1lc3NhZ2UpOworCisgICAgdGVzdC0+cmVn aXN0ZXJVUklTY2hlbWVIYW5kbGVyKCJjbG9zZWQiLCAwLCAwLCAwKTsKKyAgICB0ZXN0LT5tX2xv YWRFdmVudHMuY2xlYXIoKTsKKyAgICB0ZXN0LT5sb2FkVVJJKCJjbG9zZWQ6aW5wdXQtc3RyZWFt Iik7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAgZ19hc3NlcnQodGVz dC0+bV9sb2FkRXZlbnRzLmNvbnRhaW5zKExvYWRUcmFja2luZ1Rlc3Q6OlByb3Zpc2lvbmFsTG9h ZEZhaWxlZCkpOworICAgIGdfYXNzZXJ0KHRlc3QtPm1fbG9hZEZhaWxlZCk7CisgICAgZ19hc3Nl cnRfZXJyb3IodGVzdC0+bV9lcnJvci5nZXQoKSwgR19JT19FUlJPUiwgR19JT19FUlJPUl9DTE9T RUQpOworICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXN0LT5tX2Vycm9yLT5tZXNzYWdlLCA9PSwgIlN0 cmVhbSBpcyBhbHJlYWR5IGNsb3NlZCIpOwogfQogCiBzdGF0aWMgdm9pZCB0ZXN0V2ViQ29udGV4 dFNwZWxsQ2hlY2tlcihUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQo= 197720 2013-04-11 23:31:39 -0700 2013-05-27 05:11:30 -0700 Patch bug-114347-20130412083117.patch text/plain 4409 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWJmZGNmY2FkZjNmZDRh NjJiZjFiNTQwOGU0MDRlNjRjZGNiNWY0My4uOWQ1ZDljNzRhMzUzZTM3OWEzZTljZTEzNTA1ZmRi ZTUwZTAwODgxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA0LTExICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIE5v dGlmeSBXZWJQcm9jZXNzIGluIFdlYktpdFVSSVNjaGVtZVJlcXVlc3Qgd2hlbiB3ZSBmYWlsIHRv IHJlYWQgdGhlIHVzZXIgSW5wdXRTdHJlYW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDM0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdoaWxlIHByb2Nlc3NpbmcgYSBXZWJLaXRVUklTY2hlbWVSZXF1 ZXN0IGlmIHRoZXJlIGlzIGFueSBlcnJvciByZWFkaW5nCisgICAgICAgIHRoZSBJbnB1dFN0cmVh bSBwcm92aWRlZCBieSB0aGUgdXNlciAoZm9yIGV4YW1wbGUgdGhlIHN0cmVhbSBpcyBhbHJlYWR5 CisgICAgICAgIGNsb3NlZCkgd2UgaGF2ZSB0byBub3RpZnkgdGhlIFdlYlByb2Nlc3MgdGhhdCB0 aGUgcmVxdWVzdCBoYXMgZmFpbGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdC5jcHA6CisgICAgICAgICh3ZWJraXRVUklTY2hlbWVSZXF1ZXN0 UmVhZENhbGxiYWNrKTogR2V0IHRoZSBlcnJvciBmcm9tCisgICAgICAgIGdfaW5wdXRfc3RyZWFt X3JlYWRfZmluaXNoKCkgYW5kIHVzZSBpdCB0byBjYWxsCisgICAgICAgIHdlYmtpdF91cmlfc2No ZW1lX3JlcXVlc3RfZmluaXNoX2Vycm9yKCkgaW4gb3JkZXIgdG8gZmluaXNoIHRoZSBmYWlsaW5n CisgICAgICAgIFdlYktpdFVSSVNjaGVtZVJlcXVlc3QgcHJvcGVybHkuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAo dGVzdFdlYkNvbnRleHRVUklTY2hlbWUpOiBNb2RpZnkgdGVzdCB0byBjaGVjayB0aGUgbmV3IHNp dHVhdGlvbiB1c2luZworICAgICAgICBhbiBhbHJlYWR5IGNsb3NlZCBJbnB1dFN0cmVhbS4KKwog MjAxMy0wNC0xMCAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXSBBZGQgd2Via2l0X3VyaV9zY2hlbWVfcmVxdWVzdF9maW5pc2hfZXJyb3IK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNj aGVtZVJlcXVlc3QuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 VVJJU2NoZW1lUmVxdWVzdC5jcHAKaW5kZXggZjRlNWI4MGFkMzVlMTgxMzg0ZjIzYzA3MDE0ZmU0 OTE4YjZmZTRmMC4uMGU1MjE4MTI5YjRkN2Y3YjUzMjE5YzdhODY0MGU3MDY3N2JmNDg0NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1l UmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 VVJJU2NoZW1lUmVxdWVzdC5jcHAKQEAgLTE2MywxMCArMTYzLDEwIEBAIFdlYktpdFdlYlZpZXcq IHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZ2V0X3dlYl92aWV3KFdlYktpdFVSSVNjaGVtZVJl cXVlc3QqIHJlCiBzdGF0aWMgdm9pZCB3ZWJraXRVUklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNr KEdJbnB1dFN0cmVhbSogaW5wdXRTdHJlYW0sIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBXZWJLaXRV UklTY2hlbWVSZXF1ZXN0KiBzY2hlbWVSZXF1ZXN0KQogewogICAgIEdSZWZQdHI8V2ViS2l0VVJJ U2NoZW1lUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0R1JlZihzY2hlbWVSZXF1ZXN0KTsKLSAgICBn c3NpemUgYnl0ZXNSZWFkID0gZ19pbnB1dF9zdHJlYW1fcmVhZF9maW5pc2goaW5wdXRTdHJlYW0s IHJlc3VsdCwgMCk7Ci0gICAgLy8gRklYTUU6IG5vdGlmeSB0aGUgV2ViUHJvY2VzcyB0aGF0IHdl IGZhaWxlZCB0byByZWFkIGZyb20gdGhlIHVzZXIgc3RyZWFtLgorICAgIEdPd25QdHI8R0Vycm9y PiBlcnJvcjsKKyAgICBnc3NpemUgYnl0ZXNSZWFkID0gZ19pbnB1dF9zdHJlYW1fcmVhZF9maW5p c2goaW5wdXRTdHJlYW0sIHJlc3VsdCwgJmVycm9yLm91dFB0cigpKTsKICAgICBpZiAoYnl0ZXNS ZWFkID09IC0xKSB7Ci0gICAgICAgIHdlYmtpdFdlYkNvbnRleHREaWRGaW5pc2hVUklSZXF1ZXN0 KHJlcXVlc3QtPnByaXYtPndlYkNvbnRleHQsIHJlcXVlc3QtPnByaXYtPnJlcXVlc3RJRCk7Cisg ICAgICAgIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZmluaXNoX2Vycm9yKHJlcXVlc3QuZ2V0 KCksIGVycm9yLmdldCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkNvbnRl eHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktp dFdlYkNvbnRleHQuY3BwCmluZGV4IDc4YTdlNmUyZjRiYzhmMDQ4NzcxNDIwYThlNjYyMjJhMTZh MTk0M2QuLjU0ZTQ0ZDY4MmRkYmRhMmExMzZmYjEyYjcxNGFlYmY3ZTYyYzFiZTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJD b250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9U ZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTE2Niw3ICsxNjYsOSBAQCBwdWJsaWM6CiAgICAg ICAgIGlmICghZ19zdHJjbXAwKHNjaGVtZSwgImVjaG8iKSkgewogICAgICAgICAgICAgY2hhciog cmVwbHlIVE1MID0gZ19zdHJkdXBfcHJpbnRmKGhhbmRsZXIucmVwbHkuZGF0YSgpLCB3ZWJraXRf dXJpX3NjaGVtZV9yZXF1ZXN0X2dldF9wYXRoKHJlcXVlc3QpKTsKICAgICAgICAgICAgIGdfbWVt b3J5X2lucHV0X3N0cmVhbV9hZGRfZGF0YShHX01FTU9SWV9JTlBVVF9TVFJFQU0oaW5wdXRTdHJl YW0uZ2V0KCkpLCByZXBseUhUTUwsIHN0cmxlbihyZXBseUhUTUwpLCBnX2ZyZWUpOwotICAgICAg ICB9IGVsc2UgaWYgKCFoYW5kbGVyLnJlcGx5LmlzTnVsbCgpKQorICAgICAgICB9IGVsc2UgaWYg KCFnX3N0cmNtcDAoc2NoZW1lLCAiY2xvc2VkIikpCisgICAgICAgICAgICBnX2lucHV0X3N0cmVh bV9jbG9zZShpbnB1dFN0cmVhbS5nZXQoKSwgMCwgMCk7CisgICAgICAgIGVsc2UgaWYgKCFoYW5k bGVyLnJlcGx5LmlzTnVsbCgpKQogICAgICAgICAgICAgZ19tZW1vcnlfaW5wdXRfc3RyZWFtX2Fk ZF9kYXRhKEdfTUVNT1JZX0lOUFVUX1NUUkVBTShpbnB1dFN0cmVhbS5nZXQoKSksIGhhbmRsZXIu cmVwbHkuZGF0YSgpLCBoYW5kbGVyLnJlcGx5Lmxlbmd0aCgpLCAwKTsKIAogICAgICAgICB3ZWJr aXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2ZpbmlzaChyZXF1ZXN0LCBpbnB1dFN0cmVhbS5nZXQoKSwg aGFuZGxlci5yZXBseUxlbmd0aCwgaGFuZGxlci5taW1lVHlwZS5kYXRhKCkpOwpAQCAtMjIyLDYg KzIyNCwxNCBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViQ29udGV4dFVSSVNjaGVtZShVUklTY2hlbWVU ZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIGdfYXNzZXJ0KHRlc3QtPm1fbG9hZEZhaWxl ZCk7CiAgICAgZ19hc3NlcnRfZXJyb3IodGVzdC0+bV9lcnJvci5nZXQoKSwgZ19xdWFya19mcm9t X3N0cmluZyhlcnJvckRvbWFpbiksIGVycm9yQ29kZSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKHRl c3QtPm1fZXJyb3ItPm1lc3NhZ2UsID09LCBlcnJvck1lc3NhZ2UpOworCisgICAgdGVzdC0+cmVn aXN0ZXJVUklTY2hlbWVIYW5kbGVyKCJjbG9zZWQiLCAwLCAwLCAwKTsKKyAgICB0ZXN0LT5tX2xv YWRFdmVudHMuY2xlYXIoKTsKKyAgICB0ZXN0LT5sb2FkVVJJKCJjbG9zZWQ6aW5wdXQtc3RyZWFt Iik7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAgZ19hc3NlcnQodGVz dC0+bV9sb2FkRXZlbnRzLmNvbnRhaW5zKExvYWRUcmFja2luZ1Rlc3Q6OlByb3Zpc2lvbmFsTG9h ZEZhaWxlZCkpOworICAgIGdfYXNzZXJ0KHRlc3QtPm1fbG9hZEZhaWxlZCk7CisgICAgZ19hc3Nl cnRfZXJyb3IodGVzdC0+bV9lcnJvci5nZXQoKSwgR19JT19FUlJPUiwgR19JT19FUlJPUl9DTE9T RUQpOwogfQogCiBzdGF0aWMgdm9pZCB0ZXN0V2ViQ29udGV4dFNwZWxsQ2hlY2tlcihUZXN0KiB0 ZXN0LCBnY29uc3Rwb2ludGVyKQo= 202972 2013-05-27 05:11:37 -0700 2013-05-27 06:31:51 -0700 Patch bug-114347-20130527141036.patch text/plain 4417 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzZlNTIzMDFjNzJmNzcy ZTNkYjRjZjFlMzEwOTk0MDY4MWNmZGU2Yi4uOWQ0ZWI4NmZiZDU1Y2I4NjJiNDczZjRmMjc3Y2Vi OGRkYzczNGRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA1LTI3ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIE5v dGlmeSBXZWJQcm9jZXNzIGluIFdlYktpdFVSSVNjaGVtZVJlcXVlc3Qgd2hlbiB3ZSBmYWlsIHRv IHJlYWQgdGhlIHVzZXIgSW5wdXRTdHJlYW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDM0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdoaWxlIHByb2Nlc3NpbmcgYSBXZWJLaXRVUklTY2hlbWVSZXF1 ZXN0IGlmIHRoZXJlIGlzIGFueSBlcnJvciByZWFkaW5nCisgICAgICAgIHRoZSBJbnB1dFN0cmVh bSBwcm92aWRlZCBieSB0aGUgdXNlciAoZm9yIGV4YW1wbGUgdGhlIHN0cmVhbSBpcyBhbHJlYWR5 CisgICAgICAgIGNsb3NlZCkgd2UgaGF2ZSB0byBub3RpZnkgdGhlIFdlYlByb2Nlc3MgdGhhdCB0 aGUgcmVxdWVzdCBoYXMgZmFpbGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdC5jcHA6CisgICAgICAgICh3ZWJraXRVUklTY2hlbWVSZXF1ZXN0 UmVhZENhbGxiYWNrKTogR2V0IHRoZSBlcnJvciBmcm9tCisgICAgICAgIGdfaW5wdXRfc3RyZWFt X3JlYWRfZmluaXNoKCkgYW5kIHVzZSBpdCB0byBjYWxsCisgICAgICAgIHdlYmtpdF91cmlfc2No ZW1lX3JlcXVlc3RfZmluaXNoX2Vycm9yKCkgaW4gb3JkZXIgdG8gZmluaXNoIHRoZSBmYWlsaW5n CisgICAgICAgIFdlYktpdFVSSVNjaGVtZVJlcXVlc3QgcHJvcGVybHkuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAo dGVzdFdlYkNvbnRleHRVUklTY2hlbWUpOiBNb2RpZnkgdGVzdCB0byBjaGVjayB0aGUgbmV3IHNp dHVhdGlvbiB1c2luZworICAgICAgICBhbiBhbHJlYWR5IGNsb3NlZCBJbnB1dFN0cmVhbS4KKwog MjAxMy0wNS0yNiAgQ2hhbmdodW4gS2FuZyAgPHRlbW9vY2hpbkBjb21wYW55MTAwLm5ldD4KIAog ICAgICAgICBUaGUgcHVibGljIFdLIGhlYWRlciBmaWxlIHNob3VsZCBub3QgaW5jbHVkZSBXS0FQ SUNhc3QuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRVUklTY2hlbWVSZXF1ZXN0LmNwcAppbmRleCBmNGU1YjgwYWQzNWUxODEzODRmMjNj MDcwMTRmZTQ5MThiNmZlNGYwLi4wZTUyMTgxMjliNGQ3ZjdiNTMyMTljN2E4NjQwZTcwNjc3YmY0 ODQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRV UklTY2hlbWVSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRVUklTY2hlbWVSZXF1ZXN0LmNwcApAQCAtMTYzLDEwICsxNjMsMTAgQEAgV2ViS2l0 V2ViVmlldyogd2Via2l0X3VyaV9zY2hlbWVfcmVxdWVzdF9nZXRfd2ViX3ZpZXcoV2ViS2l0VVJJ U2NoZW1lUmVxdWVzdCogcmUKIHN0YXRpYyB2b2lkIHdlYmtpdFVSSVNjaGVtZVJlcXVlc3RSZWFk Q2FsbGJhY2soR0lucHV0U3RyZWFtKiBpbnB1dFN0cmVhbSwgR0FzeW5jUmVzdWx0KiByZXN1bHQs IFdlYktpdFVSSVNjaGVtZVJlcXVlc3QqIHNjaGVtZVJlcXVlc3QpCiB7CiAgICAgR1JlZlB0cjxX ZWJLaXRVUklTY2hlbWVSZXF1ZXN0PiByZXF1ZXN0ID0gYWRvcHRHUmVmKHNjaGVtZVJlcXVlc3Qp OwotICAgIGdzc2l6ZSBieXRlc1JlYWQgPSBnX2lucHV0X3N0cmVhbV9yZWFkX2ZpbmlzaChpbnB1 dFN0cmVhbSwgcmVzdWx0LCAwKTsKLSAgICAvLyBGSVhNRTogbm90aWZ5IHRoZSBXZWJQcm9jZXNz IHRoYXQgd2UgZmFpbGVkIHRvIHJlYWQgZnJvbSB0aGUgdXNlciBzdHJlYW0uCisgICAgR093blB0 cjxHRXJyb3I+IGVycm9yOworICAgIGdzc2l6ZSBieXRlc1JlYWQgPSBnX2lucHV0X3N0cmVhbV9y ZWFkX2ZpbmlzaChpbnB1dFN0cmVhbSwgcmVzdWx0LCAmZXJyb3Iub3V0UHRyKCkpOwogICAgIGlm IChieXRlc1JlYWQgPT0gLTEpIHsKLSAgICAgICAgd2Via2l0V2ViQ29udGV4dERpZEZpbmlzaFVS SVJlcXVlc3QocmVxdWVzdC0+cHJpdi0+d2ViQ29udGV4dCwgcmVxdWVzdC0+cHJpdi0+cmVxdWVz dElEKTsKKyAgICAgICAgd2Via2l0X3VyaV9zY2hlbWVfcmVxdWVzdF9maW5pc2hfZXJyb3IocmVx dWVzdC5nZXQoKSwgZXJyb3IuZ2V0KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0 V2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9U ZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKaW5kZXggNzhhN2U2ZTJmNGJjOGYwNDg3NzE0MjBhOGU2 NjIyMmExNmExOTQzZC4uNTRlNDRkNjgyZGRiZGEyYTEzNmZiMTJiNzE0YWViZjdlNjJjMWJlNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdl YktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L3Rlc3RzL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMTY2LDcgKzE2Niw5IEBAIHB1Ymxp YzoKICAgICAgICAgaWYgKCFnX3N0cmNtcDAoc2NoZW1lLCAiZWNobyIpKSB7CiAgICAgICAgICAg ICBjaGFyKiByZXBseUhUTUwgPSBnX3N0cmR1cF9wcmludGYoaGFuZGxlci5yZXBseS5kYXRhKCks IHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZ2V0X3BhdGgocmVxdWVzdCkpOwogICAgICAgICAg ICAgZ19tZW1vcnlfaW5wdXRfc3RyZWFtX2FkZF9kYXRhKEdfTUVNT1JZX0lOUFVUX1NUUkVBTShp bnB1dFN0cmVhbS5nZXQoKSksIHJlcGx5SFRNTCwgc3RybGVuKHJlcGx5SFRNTCksIGdfZnJlZSk7 Ci0gICAgICAgIH0gZWxzZSBpZiAoIWhhbmRsZXIucmVwbHkuaXNOdWxsKCkpCisgICAgICAgIH0g ZWxzZSBpZiAoIWdfc3RyY21wMChzY2hlbWUsICJjbG9zZWQiKSkKKyAgICAgICAgICAgIGdfaW5w dXRfc3RyZWFtX2Nsb3NlKGlucHV0U3RyZWFtLmdldCgpLCAwLCAwKTsKKyAgICAgICAgZWxzZSBp ZiAoIWhhbmRsZXIucmVwbHkuaXNOdWxsKCkpCiAgICAgICAgICAgICBnX21lbW9yeV9pbnB1dF9z dHJlYW1fYWRkX2RhdGEoR19NRU1PUllfSU5QVVRfU1RSRUFNKGlucHV0U3RyZWFtLmdldCgpKSwg aGFuZGxlci5yZXBseS5kYXRhKCksIGhhbmRsZXIucmVwbHkubGVuZ3RoKCksIDApOwogCiAgICAg ICAgIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZmluaXNoKHJlcXVlc3QsIGlucHV0U3RyZWFt LmdldCgpLCBoYW5kbGVyLnJlcGx5TGVuZ3RoLCBoYW5kbGVyLm1pbWVUeXBlLmRhdGEoKSk7CkBA IC0yMjIsNiArMjI0LDE0IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJDb250ZXh0VVJJU2NoZW1lKFVS SVNjaGVtZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnQodGVzdC0+bV9s b2FkRmFpbGVkKTsKICAgICBnX2Fzc2VydF9lcnJvcih0ZXN0LT5tX2Vycm9yLmdldCgpLCBnX3F1 YXJrX2Zyb21fc3RyaW5nKGVycm9yRG9tYWluKSwgZXJyb3JDb2RlKTsKICAgICBnX2Fzc2VydF9j bXBzdHIodGVzdC0+bV9lcnJvci0+bWVzc2FnZSwgPT0sIGVycm9yTWVzc2FnZSk7CisKKyAgICB0 ZXN0LT5yZWdpc3RlclVSSVNjaGVtZUhhbmRsZXIoImNsb3NlZCIsIDAsIDAsIDApOworICAgIHRl c3QtPm1fbG9hZEV2ZW50cy5jbGVhcigpOworICAgIHRlc3QtPmxvYWRVUkkoImNsb3NlZDppbnB1 dC1zdHJlYW0iKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBnX2Fz c2VydCh0ZXN0LT5tX2xvYWRFdmVudHMuY29udGFpbnMoTG9hZFRyYWNraW5nVGVzdDo6UHJvdmlz aW9uYWxMb2FkRmFpbGVkKSk7CisgICAgZ19hc3NlcnQodGVzdC0+bV9sb2FkRmFpbGVkKTsKKyAg ICBnX2Fzc2VydF9lcnJvcih0ZXN0LT5tX2Vycm9yLmdldCgpLCBHX0lPX0VSUk9SLCBHX0lPX0VS Uk9SX0NMT1NFRCk7CiB9CiAKIHN0YXRpYyB2b2lkIHRlc3RXZWJDb250ZXh0U3BlbGxDaGVja2Vy KFRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCg==