97966 2012-09-29 08:28:10 -0700 [WK2][GTK] Fix issues with WebKitFaviconDatabase in debug builds 2012-09-30 07:55:57 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 mario webkit-unassigned cgarcia gustavo mrobinson webkit.review.bot oldest_to_newest 731209 0 mario 2012-09-29 08:28:10 -0700 After landing the patch for bug 96476 a couple of issues were spotted in debug builds: The first one is that the ASSERT(!pageURL.isNull()) statement in webkitFaviconDatabaseGetFavicon() is wrong and should be replaced by an early return, since it won't be true whenever we ask a webview for its favicon before actually loading anything into it. The second issue is that we must find a way to delete the temporary directory used to store the database in the unit tests *after* the IconDatabase from WebCore is closed (now it's closed when the WebKitFaviconDatabase is finalized), otherwise we will keep spotting the following disk I/O error in debug build when running TestWebKitFaviconDatabase in debug build: TEST: ./Tools/gtk/../Scripts/../../WebKitBuild/Debug/Programs/WebKit2APITests/TestWebKitFaviconDatabase... (pid=27818) /webkit2/WebKitFaviconDatabase/set-directory: OK /webkit2/WebKitFaviconDatabase/get-favicon: OK /webkit2/WebKitFaviconDatabase/get-favicon-uri: OK /webkit2/WebKitFaviconDatabase/clear-database: OK ERROR: Could not create PageURL table in database (1802) - disk I/O error ../../Source/WebCore/loader/icon/IconDatabase.cpp(1133) : void WebCore::createDatabaseTables(WebCore::SQLiteDatabase&) Since those are related issues that must be fixed asap, I'm filing this bug now to keep track of them and propose (hopefully in 1-2 days from now) a fix for both of them 731286 1 cgarcia 2012-09-30 00:56:18 -0700 (In reply to comment #0) > After landing the patch for bug 96476 a couple of issues were spotted in debug builds: > > The first one is that the ASSERT(!pageURL.isNull()) statement in webkitFaviconDatabaseGetFavicon() is wrong and should be replaced by an early return, since it won't be true whenever we ask a webview for its favicon before actually loading anything into it. I don't think the assert is necessarily wrong, you should check in webkit_web_view_get_favicon() that the active URI is not NULL before calling webkitFaviconDatabaseGetFavicon(). so I think the early return should be in webkit_web_view_get_favicon(). > The second issue is that we must find a way to delete the temporary directory used to store the database in the unit tests *after* the IconDatabase from WebCore is closed (now it's closed when the WebKitFaviconDatabase is finalized), otherwise we will keep spotting the following disk I/O error in debug build when running TestWebKitFaviconDatabase in debug build: > > TEST: ./Tools/gtk/../Scripts/../../WebKitBuild/Debug/Programs/WebKit2APITests/TestWebKitFaviconDatabase... (pid=27818) > /webkit2/WebKitFaviconDatabase/set-directory: OK > /webkit2/WebKitFaviconDatabase/get-favicon: OK > /webkit2/WebKitFaviconDatabase/get-favicon-uri: OK > /webkit2/WebKitFaviconDatabase/clear-database: OK > ERROR: Could not create PageURL table in database (1802) - disk I/O error > ../../Source/WebCore/loader/icon/IconDatabase.cpp(1133) : void WebCore::createDatabaseTables(WebCore::SQLiteDatabase&) > > Since those are related issues that must be fixed asap, I'm filing this bug now to keep track of them and propose (hopefully in 1-2 days from now) a fix for both of them First issue can be fixed while landing patch for bug #96477 731291 2 166382 mario 2012-09-30 06:15:30 -0700 Created attachment 166382 Patch proposal This patch seems to fix these issues once and for all. I've tested it both in Release and Debug build and couldn't spot those issues anymore. 731292 3 166383 mario 2012-09-30 06:27:42 -0700 Created attachment 166383 Patch proposal (without the early return) (In reply to comment #1) > I don't think the assert is necessarily wrong, you should check in > webkit_web_view_get_favicon() that the active URI is not NULL before calling > webkitFaviconDatabaseGetFavicon(). so I think the early return should be in > webkit_web_view_get_favicon(). Hrm... I haven't seen this comment before uploading the patch, but you are probably right about it. > > The second issue is that we must find a way to delete the temporary directory used to store the database in the unit tests *after* the IconDatabase from WebCore is closed (now it's closed when the WebKitFaviconDatabase is finalized), otherwise we will keep spotting the following disk I/O error in debug build when running TestWebKitFaviconDatabase in debug build: > > > > TEST: ./Tools/gtk/../Scripts/../../WebKitBuild/Debug/Programs/WebKit2APITests/TestWebKitFaviconDatabase... (pid=27818) > > /webkit2/WebKitFaviconDatabase/set-directory: OK > > /webkit2/WebKitFaviconDatabase/get-favicon: OK > > /webkit2/WebKitFaviconDatabase/get-favicon-uri: OK > > /webkit2/WebKitFaviconDatabase/clear-database: OK > > ERROR: Could not create PageURL table in database (1802) - disk I/O error > > ../../Source/WebCore/loader/icon/IconDatabase.cpp(1133) : void WebCore::createDatabaseTables(WebCore::SQLiteDatabase&) > > > > Since those are related issues that must be fixed asap, I'm filing this bug now to keep track of them and propose (hopefully in 1-2 days from now) a fix for both of them > > First issue can be fixed while landing patch for bug #96477 Yes. I'm attaching a new patch now without the ASSERT, and will add the early return in patch for 96477, as you suggested. Feel free to r- any of the two patches then (and hopefully r+ the other!) 731293 4 webkit.review.bot 2012-09-30 06:29:53 -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 731297 5 mario 2012-09-30 07:55:57 -0700 Committed r129992: <http://trac.webkit.org/changeset/129992> 166382 2012-09-30 06:15:30 -0700 2012-09-30 07:09:31 -0700 Patch proposal 0001-2012-09-30-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 7704 mario RnJvbSBhY2I2MDNiMGVkMTJiYmY3NDlmMjA5NDU5MmM2MDg5MDkzNjdmN2VlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBTdW4sIDMwIFNlcCAyMDEyIDE1OjEyOjU1ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMi0wOS0zMCAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFtXSzJdW0dUS10gRml4IGlzc3VlcyB3aXRoIFdlYktpdEZhdmljb25EYXRhYmFz ZSBpbiBkZWJ1ZyBidWlsZHMKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTc5NjYKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIEZpeCBmYWlsaW5nIEFTU0VSVHMgZGV0ZWN0ZWQgd2hlbiBydW5uaW5nIHRoZSB1bml0IHRl c3RzIGZyb20KICAgICAgICBUZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlIGluIGRlYnVnIGJ1aWxk cy4KCiAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3Bw OgogICAgICAgICh3ZWJraXRGYXZpY29uRGF0YWJhc2VEaXNwb3NlKTogQ2xvc2UgSWNvbkRhdGFi YXNlIGhlcmUsIHdoaWNoIGlzCiAgICAgICAgdGhlIHJpZ2h0IHBsYWNlIHRvIGRvIGl0IGFjY29y ZGluZyB0byBHT2JqZWN0IGRvY3VtZW50YXRpb24uCiAgICAgICAgKHdlYmtpdEZhdmljb25EYXRh YmFzZUZpbmFsaXplKTogSnVzdCBkZXN0cm95IHRoZSBwcml2YXRlIGRhdGEKICAgICAgICBzdHJ1 Y3R1cmUgYW5kIGNoYWluIHVwIHRvIHBhcmVudCBjbGFzcydzIGZpbmFsaXplIG1ldGhvZC4KICAg ICAgICAod2Via2l0X2Zhdmljb25fZGF0YWJhc2VfY2xhc3NfaW5pdCk6IE92ZXJyaWRlIGRpc3Bv c2UgbWV0aG9kLgogICAgICAgICh3ZWJraXRGYXZpY29uRGF0YWJhc2VHZXRGYXZpY29uKTogRWFy bHkgcmV0dXJuIGlmIHBhZ2VVUkwuaXNOdWxsKCksCiAgICAgICAgaW5zdGVhZCBvZiBBU1NFUlQg b24gaXQuCiAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNv bkRhdGFiYXNlLmNwcDoKICAgICAgICAod2Via2l0RmF2aWNvbkRhdGFiYXNlRmluYWxpemVkQ2Fs bGJhY2spOiBEZWxldGUgZmlsZXMgd2hlbiB0aGUKICAgICAgICBXZWJLaXRGYXZpY29uRGF0YWJh c2UgaXMgYmVpbmcgZmluYWxpemVkLCBzaW5jZSBieSB0aGF0IHRpbWUgdGhlCiAgICAgICAgSWNv bkRhdGFiYXNlIGZyb20gV2ViQ29yZSB3aWxsIGJlIGFscmVhZHkgY2xvc2VkLgogICAgICAgIChh ZnRlckFsbCk6IEFkZCBhIHdlYWsgcmVmZXJlbmNlIHRvIFdlYktpdEZhdmljb25EYXRhYmFzZSBh bmQKICAgICAgICBwcm92aWRlIGEgR1dlYWtOb3RpZnkgY2FsbGJhY2sgKHdlYmtpdEZhdmljb25E YXRhYmFzZUZpbmFsaXplZENhbGxiYWNrKS4KLS0tCiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICB8IDI1ICsrKysrKysrKysrKysrKysrCiAuLi4vVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcCAgICB8IDI2ICsrKysrKysr KystLS0tLS0tLQogLi4uL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25EYXRhYmFzZS5j cHAgICAgfCAzMSArKysrKysrKysrKy0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDU2IGlu c2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwZjNjOTczLi44MWFj M2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMDktMzAgIE1hcmlvIFNhbmNo ZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtXSzJdW0dUS10gRml4 IGlzc3VlcyB3aXRoIFdlYktpdEZhdmljb25EYXRhYmFzZSBpbiBkZWJ1ZyBidWlsZHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3OTY2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZhaWxpbmcgQVNT RVJUcyBkZXRlY3RlZCB3aGVuIHJ1bm5pbmcgdGhlIHVuaXQgdGVzdHMgZnJvbQorICAgICAgICBU ZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlIGluIGRlYnVnIGJ1aWxkcy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZhdmljb25EYXRhYmFzZS5jcHA6CisgICAgICAgICh3ZWJr aXRGYXZpY29uRGF0YWJhc2VEaXNwb3NlKTogQ2xvc2UgSWNvbkRhdGFiYXNlIGhlcmUsIHdoaWNo IGlzCisgICAgICAgIHRoZSByaWdodCBwbGFjZSB0byBkbyBpdCBhY2NvcmRpbmcgdG8gR09iamVj dCBkb2N1bWVudGF0aW9uLgorICAgICAgICAod2Via2l0RmF2aWNvbkRhdGFiYXNlRmluYWxpemUp OiBKdXN0IGRlc3Ryb3kgdGhlIHByaXZhdGUgZGF0YQorICAgICAgICBzdHJ1Y3R1cmUgYW5kIGNo YWluIHVwIHRvIHBhcmVudCBjbGFzcydzIGZpbmFsaXplIG1ldGhvZC4KKyAgICAgICAgKHdlYmtp dF9mYXZpY29uX2RhdGFiYXNlX2NsYXNzX2luaXQpOiBPdmVycmlkZSBkaXNwb3NlIG1ldGhvZC4K KyAgICAgICAgKHdlYmtpdEZhdmljb25EYXRhYmFzZUdldEZhdmljb24pOiBFYXJseSByZXR1cm4g aWYgcGFnZVVSTC5pc051bGwoKSwKKyAgICAgICAgaW5zdGVhZCBvZiBBU1NFUlQgb24gaXQuCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25EYXRhYmFz ZS5jcHA6CisgICAgICAgICh3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5hbGl6ZWRDYWxsYmFjayk6 IERlbGV0ZSBmaWxlcyB3aGVuIHRoZQorICAgICAgICBXZWJLaXRGYXZpY29uRGF0YWJhc2UgaXMg YmVpbmcgZmluYWxpemVkLCBzaW5jZSBieSB0aGF0IHRpbWUgdGhlCisgICAgICAgIEljb25EYXRh YmFzZSBmcm9tIFdlYkNvcmUgd2lsbCBiZSBhbHJlYWR5IGNsb3NlZC4KKyAgICAgICAgKGFmdGVy QWxsKTogQWRkIGEgd2VhayByZWZlcmVuY2UgdG8gV2ViS2l0RmF2aWNvbkRhdGFiYXNlIGFuZAor ICAgICAgICBwcm92aWRlIGEgR1dlYWtOb3RpZnkgY2FsbGJhY2sgKHdlYmtpdEZhdmljb25EYXRh YmFzZUZpbmFsaXplZENhbGxiYWNrKS4KKwogMjAxMi0wOS0yOCAgTWFyaW8gU2FuY2hleiBQcmFk YSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dLMl1bR1RLXSBBZGQgQVBJIHRv IGdldCB0aGUgZmF2aWNvbiBmb3IgYSBXZWJLaXRXZWJWaWV3CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcApp bmRleCA0NjQzMGMyLi44N2Y2NDAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZhdmljb25EYXRhYmFzZS5jcHAKQEAgLTUxLDEzICs1 MSw2IEBAIHN0cnVjdCBfV2ViS2l0RmF2aWNvbkRhdGFiYXNlUHJpdmF0ZSB7CiAKIEdfREVGSU5F X1RZUEUoV2ViS2l0RmF2aWNvbkRhdGFiYXNlLCB3ZWJraXRfZmF2aWNvbl9kYXRhYmFzZSwgR19U WVBFX09CSkVDVCkKIAotc3RhdGljIHZvaWQgY2xvc2VJY29uRGF0YWJhc2VJZk5lZWRlZChXZWJL aXRGYXZpY29uRGF0YWJhc2UqIGRhdGFiYXNlKQotewotICAgIFdlYktpdEZhdmljb25EYXRhYmFz ZVByaXZhdGUqIHByaXYgPSBkYXRhYmFzZS0+cHJpdjsKLSAgICBpZiAocHJpdi0+aWNvbkRhdGFi YXNlLT5pc09wZW4oKSkKLSAgICAgICAgcHJpdi0+aWNvbkRhdGFiYXNlLT5jbG9zZSgpOwotfQot CiBzdGF0aWMgdm9pZCB3ZWJraXRfZmF2aWNvbl9kYXRhYmFzZV9pbml0KFdlYktpdEZhdmljb25E YXRhYmFzZSogbWFuYWdlcikKIHsKICAgICBXZWJLaXRGYXZpY29uRGF0YWJhc2VQcml2YXRlKiBw cml2ID0gR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKG1hbmFnZXIsIFdFQktJVF9UWVBFX0ZB VklDT05fREFUQUJBU0UsIFdlYktpdEZhdmljb25EYXRhYmFzZVByaXZhdGUpOwpAQCAtNjUsMTkg KzU4LDI4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9mYXZpY29uX2RhdGFiYXNlX2luaXQoV2ViS2l0 RmF2aWNvbkRhdGFiYXNlKiBtYW5hZ2VyKQogICAgIG5ldyAocHJpdikgV2ViS2l0RmF2aWNvbkRh dGFiYXNlUHJpdmF0ZSgpOwogfQogCi1zdGF0aWMgdm9pZCB3ZWJraXRGYXZpY29uRGF0YWJhc2VG aW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCitzdGF0aWMgdm9pZCB3ZWJraXRGYXZpY29uRGF0YWJh c2VEaXNwb3NlKEdPYmplY3QqIG9iamVjdCkKIHsKICAgICBXZWJLaXRGYXZpY29uRGF0YWJhc2Uq IGRhdGFiYXNlID0gV0VCS0lUX0ZBVklDT05fREFUQUJBU0Uob2JqZWN0KTsKIAotICAgIGNsb3Nl SWNvbkRhdGFiYXNlSWZOZWVkZWQoZGF0YWJhc2UpOwotICAgIGRhdGFiYXNlLT5wcml2LT5+V2Vi S2l0RmF2aWNvbkRhdGFiYXNlUHJpdmF0ZSgpOworICAgIFdlYktpdEZhdmljb25EYXRhYmFzZVBy aXZhdGUqIHByaXYgPSBkYXRhYmFzZS0+cHJpdjsKKyAgICBpZiAocHJpdi0+aWNvbkRhdGFiYXNl LT5pc09wZW4oKSkKKyAgICAgICAgcHJpdi0+aWNvbkRhdGFiYXNlLT5jbG9zZSgpOworCisgICAg R19PQkpFQ1RfQ0xBU1Mod2Via2l0X2Zhdmljb25fZGF0YWJhc2VfcGFyZW50X2NsYXNzKS0+ZGlz cG9zZShvYmplY3QpOworfQogCitzdGF0aWMgdm9pZCB3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5h bGl6ZShHT2JqZWN0KiBvYmplY3QpCit7CisgICAgV2ViS2l0RmF2aWNvbkRhdGFiYXNlKiBkYXRh YmFzZSA9IFdFQktJVF9GQVZJQ09OX0RBVEFCQVNFKG9iamVjdCk7CisgICAgZGF0YWJhc2UtPnBy aXYtPn5XZWJLaXRGYXZpY29uRGF0YWJhc2VQcml2YXRlKCk7CiAgICAgR19PQkpFQ1RfQ0xBU1Mo d2Via2l0X2Zhdmljb25fZGF0YWJhc2VfcGFyZW50X2NsYXNzKS0+ZmluYWxpemUob2JqZWN0KTsK IH0KIAogc3RhdGljIHZvaWQgd2Via2l0X2Zhdmljb25fZGF0YWJhc2VfY2xhc3NfaW5pdChXZWJL aXRGYXZpY29uRGF0YWJhc2VDbGFzcyogZmF2aWNvbkRhdGFiYXNlQ2xhc3MpCiB7CiAgICAgR09i amVjdENsYXNzKiBnT2JqZWN0Q2xhc3MgPSBHX09CSkVDVF9DTEFTUyhmYXZpY29uRGF0YWJhc2VD bGFzcyk7CisgICAgZ09iamVjdENsYXNzLT5kaXNwb3NlID0gd2Via2l0RmF2aWNvbkRhdGFiYXNl RGlzcG9zZTsKICAgICBnT2JqZWN0Q2xhc3MtPmZpbmFsaXplID0gd2Via2l0RmF2aWNvbkRhdGFi YXNlRmluYWxpemU7CiAKICAgICAvKioKQEAgLTE4NCw3ICsxODYsOSBAQCBXZWJLaXRGYXZpY29u RGF0YWJhc2UqIHdlYmtpdEZhdmljb25EYXRhYmFzZUNyZWF0ZShXZWJJY29uRGF0YWJhc2UqIGlj b25EYXRhYmFzZQogY2Fpcm9fc3VyZmFjZV90KiB3ZWJraXRGYXZpY29uRGF0YWJhc2VHZXRGYXZp Y29uKFdlYktpdEZhdmljb25EYXRhYmFzZSogZGF0YWJhc2UsIGNvbnN0IENTdHJpbmcmIHBhZ2VV UkwpCiB7CiAgICAgQVNTRVJUKFdFQktJVF9JU19GQVZJQ09OX0RBVEFCQVNFKGRhdGFiYXNlKSk7 Ci0gICAgQVNTRVJUKCFwYWdlVVJMLmlzTnVsbCgpKTsKKworICAgIGlmIChwYWdlVVJMLmlzTnVs bCgpKQorICAgICAgICByZXR1cm4gMDsKIAogICAgIGNhaXJvX3N1cmZhY2VfdCogaWNvblN1cmZh Y2UgPSBnZXRJY29uU3VyZmFjZVN5bmNocm9ub3VzbHkoZGF0YWJhc2UsIFN0cmluZzo6ZnJvbVVU RjgocGFnZVVSTC5kYXRhKCkpKTsKICAgICBpZiAoIWljb25TdXJmYWNlKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25E YXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0 V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcAppbmRleCBjZWVlYjllLi42MjEwNmNiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2 aWNvbkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90 ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcApAQCAtMTk2LDIwICsxOTYsNiBAQCBz dGF0aWMgdm9pZCB0ZXN0V2ViVmlld0Zhdmljb24oRmF2aWNvbkRhdGFiYXNlVGVzdCogdGVzdCwg Z2NvbnN0cG9pbnRlcikKICAgICBjYWlyb19zdXJmYWNlX2Rlc3Ryb3koaWNvbkZyb21XZWJWaWV3 KTsKIH0KIAotc3RhdGljIHZvaWQgZGVsZXRlRGF0YWJhc2VGaWxlcygpCi17Ci0gICAgaWYgKCFn X2ZpbGVfdGVzdChrVGVtcERpcmVjdG9yeSwgR19GSUxFX1RFU1RfSVNfRElSKSkKLSAgICAgICAg cmV0dXJuOwotCi0gICAgR093blB0cjxjaGFyPiBmaWxlbmFtZShnX2J1aWxkX2ZpbGVuYW1lKGtU ZW1wRGlyZWN0b3J5LCAiV2VicGFnZUljb25zLmRiIiwgTlVMTCkpOwotICAgIGdfdW5saW5rKGZp bGVuYW1lLmdldCgpKTsKLQotICAgIGZpbGVuYW1lLnNldChnX2J1aWxkX2ZpbGVuYW1lKGtUZW1w RGlyZWN0b3J5LCAiV2VicGFnZUljb25zLmRiLWpvdXJuYWwiLCBOVUxMKSk7Ci0gICAgZ191bmxp bmsoZmlsZW5hbWUuZ2V0KCkpOwotCi0gICAgZ19ybWRpcihrVGVtcERpcmVjdG9yeSk7Ci19Ci0K IHZvaWQgYmVmb3JlQWxsKCkKIHsKICAgICAvLyBTdGFydCBhIHNvdXAgc2VydmVyIGZvciB0ZXN0 aW5nLgpAQCAtMjI3LDggKzIxMywyMyBAQCB2b2lkIGJlZm9yZUFsbCgpCiAgICAgRmF2aWNvbkRh dGFiYXNlVGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgImZhdmljb24iLCB0ZXN0V2ViVmlld0Zh dmljb24pOwogfQogCitzdGF0aWMgdm9pZCB3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5hbGl6ZWRD YWxsYmFjayhncG9pbnRlciwgR09iamVjdCopCit7CisgICAgaWYgKCFnX2ZpbGVfdGVzdChrVGVt cERpcmVjdG9yeSwgR19GSUxFX1RFU1RfSVNfRElSKSkKKyAgICAgICAgcmV0dXJuOworCisgICAg R093blB0cjxjaGFyPiBmaWxlbmFtZShnX2J1aWxkX2ZpbGVuYW1lKGtUZW1wRGlyZWN0b3J5LCAi V2VicGFnZUljb25zLmRiIiwgTlVMTCkpOworICAgIGdfdW5saW5rKGZpbGVuYW1lLmdldCgpKTsK KworICAgIGdfcm1kaXIoa1RlbXBEaXJlY3RvcnkpOworfQorCiB2b2lkIGFmdGVyQWxsKCkKIHsK ICAgICBkZWxldGUga1NlcnZlcjsKLSAgICBkZWxldGVEYXRhYmFzZUZpbGVzKCk7CisKKyAgICAv LyBEZWxldGUgdGhlIHRlbXBvcmFyeSBmaWxlcyBhZnRlciB0aGUgSWNvbkRhdGFiYXNlIGhhcyBi ZWVuCisgICAgLy8gY2xvc2VkLCB0aGF0IGlzLCBvbmNlIFdlYktpdEZhdmljb25EYXRhYmFzZSBp cyBiZWluZyBkZXN0cm95ZWQuCisgICAgV2ViS2l0RmF2aWNvbkRhdGFiYXNlKiBkYXRhYmFzZSA9 IHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZmF2aWNvbl9kYXRhYmFzZSh3ZWJraXRfd2ViX2NvbnRl eHRfZ2V0X2RlZmF1bHQoKSk7CisgICAgZ19vYmplY3Rfd2Vha19yZWYoR19PQkpFQ1QoZGF0YWJh c2UpLCB3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5hbGl6ZWRDYWxsYmFjaywgMCk7CiB9Ci0tIAox LjcuMTEuNAoK 166383 2012-09-30 06:27:42 -0700 2012-09-30 07:08:48 -0700 Patch proposal (without the early return) 0001-2012-09-30-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 7006 mario RnJvbSBjMjZmZDllMGEwOWM0MTM3NTMwMTVhNGMzNjIzYzI4MzVhMjllMDA1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBTdW4sIDMwIFNlcCAyMDEyIDE1OjEyOjU1ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMi0wOS0zMCAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFtXSzJdW0dUS10gRml4IGlzc3VlcyB3aXRoIFdlYktpdEZhdmljb25EYXRhYmFz ZSBpbiBkZWJ1ZyBidWlsZHMKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTc5NjYKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAg ICAgIEZpeCBmYWlsaW5nIEFTU0VSVHMgZGV0ZWN0ZWQgd2hlbiBydW5uaW5nIHRoZSB1bml0IHRl c3RzIGZyb20KICAgICAgICBUZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlIGluIGRlYnVnIGJ1aWxk cy4KCiAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3Bw OgogICAgICAgICh3ZWJraXRGYXZpY29uRGF0YWJhc2VEaXNwb3NlKTogQ2xvc2UgSWNvbkRhdGFi YXNlIGhlcmUsIHdoaWNoIGlzCiAgICAgICAgdGhlIHJpZ2h0IHBsYWNlIHRvIGRvIGl0IGFjY29y ZGluZyB0byBHT2JqZWN0IGRvY3VtZW50YXRpb24uCiAgICAgICAgKHdlYmtpdEZhdmljb25EYXRh YmFzZUZpbmFsaXplKTogSnVzdCBkZXN0cm95IHRoZSBwcml2YXRlIGRhdGEKICAgICAgICBzdHJ1 Y3R1cmUgYW5kIGNoYWluIHVwIHRvIHBhcmVudCBjbGFzcydzIGZpbmFsaXplIG1ldGhvZC4KICAg ICAgICAod2Via2l0X2Zhdmljb25fZGF0YWJhc2VfY2xhc3NfaW5pdCk6IE92ZXJyaWRlIGRpc3Bv c2UgbWV0aG9kLgoKICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRG YXZpY29uRGF0YWJhc2UuY3BwOgogICAgICAgICh3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5hbGl6 ZWRDYWxsYmFjayk6IERlbGV0ZSBmaWxlcyB3aGVuIHRoZQogICAgICAgIFdlYktpdEZhdmljb25E YXRhYmFzZSBpcyBiZWluZyBmaW5hbGl6ZWQsIHNpbmNlIGJ5IHRoYXQgdGltZSB0aGUKICAgICAg ICBJY29uRGF0YWJhc2UgZnJvbSBXZWJDb3JlIHdpbGwgYmUgYWxyZWFkeSBjbG9zZWQuCiAgICAg ICAgKGFmdGVyQWxsKTogQWRkIGEgd2VhayByZWZlcmVuY2UgdG8gV2ViS2l0RmF2aWNvbkRhdGFi YXNlIGFuZAogICAgICAgIHByb3ZpZGUgYSBHV2Vha05vdGlmeSBjYWxsYmFjayAod2Via2l0RmF2 aWNvbkRhdGFiYXNlRmluYWxpemVkQ2FsbGJhY2spLgotLS0KIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMjQgKysrKysrKysrKysrKysrKysKIC4u Li9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwICAgIHwgMjIgKysr KysrKystLS0tLS0tCiAuLi4vQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNl LmNwcCAgICB8IDMxICsrKysrKysrKysrLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNTIg aW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDBmM2M5NzMuLjVj NDg5YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0wOS0zMCAgTWFyaW8gU2Fu Y2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW1dLMl1bR1RLXSBG aXggaXNzdWVzIHdpdGggV2ViS2l0RmF2aWNvbkRhdGFiYXNlIGluIGRlYnVnIGJ1aWxkcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc5NjYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZmFpbGluZyBB U1NFUlRzIGRldGVjdGVkIHdoZW4gcnVubmluZyB0aGUgdW5pdCB0ZXN0cyBmcm9tCisgICAgICAg IFRlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2UgaW4gZGVidWcgYnVpbGRzLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKHdl YmtpdEZhdmljb25EYXRhYmFzZURpc3Bvc2UpOiBDbG9zZSBJY29uRGF0YWJhc2UgaGVyZSwgd2hp Y2ggaXMKKyAgICAgICAgdGhlIHJpZ2h0IHBsYWNlIHRvIGRvIGl0IGFjY29yZGluZyB0byBHT2Jq ZWN0IGRvY3VtZW50YXRpb24uCisgICAgICAgICh3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5hbGl6 ZSk6IEp1c3QgZGVzdHJveSB0aGUgcHJpdmF0ZSBkYXRhCisgICAgICAgIHN0cnVjdHVyZSBhbmQg Y2hhaW4gdXAgdG8gcGFyZW50IGNsYXNzJ3MgZmluYWxpemUgbWV0aG9kLgorICAgICAgICAod2Vi a2l0X2Zhdmljb25fZGF0YWJhc2VfY2xhc3NfaW5pdCk6IE92ZXJyaWRlIGRpc3Bvc2UgbWV0aG9k LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25E YXRhYmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRGYXZpY29uRGF0YWJhc2VGaW5hbGl6ZWRDYWxs YmFjayk6IERlbGV0ZSBmaWxlcyB3aGVuIHRoZQorICAgICAgICBXZWJLaXRGYXZpY29uRGF0YWJh c2UgaXMgYmVpbmcgZmluYWxpemVkLCBzaW5jZSBieSB0aGF0IHRpbWUgdGhlCisgICAgICAgIElj b25EYXRhYmFzZSBmcm9tIFdlYkNvcmUgd2lsbCBiZSBhbHJlYWR5IGNsb3NlZC4KKyAgICAgICAg KGFmdGVyQWxsKTogQWRkIGEgd2VhayByZWZlcmVuY2UgdG8gV2ViS2l0RmF2aWNvbkRhdGFiYXNl IGFuZAorICAgICAgICBwcm92aWRlIGEgR1dlYWtOb3RpZnkgY2FsbGJhY2sgKHdlYmtpdEZhdmlj b25EYXRhYmFzZUZpbmFsaXplZENhbGxiYWNrKS4KKwogMjAxMi0wOS0yOCAgTWFyaW8gU2FuY2hl eiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dLMl1bR1RLXSBBZGQg QVBJIHRvIGdldCB0aGUgZmF2aWNvbiBmb3IgYSBXZWJLaXRXZWJWaWV3CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRhdGFiYXNl LmNwcAppbmRleCA0NjQzMGMyLi45MGNjOTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZhdmljb25EYXRhYmFzZS5jcHAKQEAgLTUx LDEzICs1MSw2IEBAIHN0cnVjdCBfV2ViS2l0RmF2aWNvbkRhdGFiYXNlUHJpdmF0ZSB7CiAKIEdf REVGSU5FX1RZUEUoV2ViS2l0RmF2aWNvbkRhdGFiYXNlLCB3ZWJraXRfZmF2aWNvbl9kYXRhYmFz ZSwgR19UWVBFX09CSkVDVCkKIAotc3RhdGljIHZvaWQgY2xvc2VJY29uRGF0YWJhc2VJZk5lZWRl ZChXZWJLaXRGYXZpY29uRGF0YWJhc2UqIGRhdGFiYXNlKQotewotICAgIFdlYktpdEZhdmljb25E YXRhYmFzZVByaXZhdGUqIHByaXYgPSBkYXRhYmFzZS0+cHJpdjsKLSAgICBpZiAocHJpdi0+aWNv bkRhdGFiYXNlLT5pc09wZW4oKSkKLSAgICAgICAgcHJpdi0+aWNvbkRhdGFiYXNlLT5jbG9zZSgp OwotfQotCiBzdGF0aWMgdm9pZCB3ZWJraXRfZmF2aWNvbl9kYXRhYmFzZV9pbml0KFdlYktpdEZh dmljb25EYXRhYmFzZSogbWFuYWdlcikKIHsKICAgICBXZWJLaXRGYXZpY29uRGF0YWJhc2VQcml2 YXRlKiBwcml2ID0gR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKG1hbmFnZXIsIFdFQktJVF9U WVBFX0ZBVklDT05fREFUQUJBU0UsIFdlYktpdEZhdmljb25EYXRhYmFzZVByaXZhdGUpOwpAQCAt NjUsMTkgKzU4LDI4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9mYXZpY29uX2RhdGFiYXNlX2luaXQo V2ViS2l0RmF2aWNvbkRhdGFiYXNlKiBtYW5hZ2VyKQogICAgIG5ldyAocHJpdikgV2ViS2l0RmF2 aWNvbkRhdGFiYXNlUHJpdmF0ZSgpOwogfQogCi1zdGF0aWMgdm9pZCB3ZWJraXRGYXZpY29uRGF0 YWJhc2VGaW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCitzdGF0aWMgdm9pZCB3ZWJraXRGYXZpY29u RGF0YWJhc2VEaXNwb3NlKEdPYmplY3QqIG9iamVjdCkKIHsKICAgICBXZWJLaXRGYXZpY29uRGF0 YWJhc2UqIGRhdGFiYXNlID0gV0VCS0lUX0ZBVklDT05fREFUQUJBU0Uob2JqZWN0KTsKIAotICAg IGNsb3NlSWNvbkRhdGFiYXNlSWZOZWVkZWQoZGF0YWJhc2UpOwotICAgIGRhdGFiYXNlLT5wcml2 LT5+V2ViS2l0RmF2aWNvbkRhdGFiYXNlUHJpdmF0ZSgpOworICAgIFdlYktpdEZhdmljb25EYXRh YmFzZVByaXZhdGUqIHByaXYgPSBkYXRhYmFzZS0+cHJpdjsKKyAgICBpZiAocHJpdi0+aWNvbkRh dGFiYXNlLT5pc09wZW4oKSkKKyAgICAgICAgcHJpdi0+aWNvbkRhdGFiYXNlLT5jbG9zZSgpOwor CisgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X2Zhdmljb25fZGF0YWJhc2VfcGFyZW50X2NsYXNz KS0+ZGlzcG9zZShvYmplY3QpOworfQogCitzdGF0aWMgdm9pZCB3ZWJraXRGYXZpY29uRGF0YWJh c2VGaW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCit7CisgICAgV2ViS2l0RmF2aWNvbkRhdGFiYXNl KiBkYXRhYmFzZSA9IFdFQktJVF9GQVZJQ09OX0RBVEFCQVNFKG9iamVjdCk7CisgICAgZGF0YWJh c2UtPnByaXYtPn5XZWJLaXRGYXZpY29uRGF0YWJhc2VQcml2YXRlKCk7CiAgICAgR19PQkpFQ1Rf Q0xBU1Mod2Via2l0X2Zhdmljb25fZGF0YWJhc2VfcGFyZW50X2NsYXNzKS0+ZmluYWxpemUob2Jq ZWN0KTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0X2Zhdmljb25fZGF0YWJhc2VfY2xhc3NfaW5p dChXZWJLaXRGYXZpY29uRGF0YWJhc2VDbGFzcyogZmF2aWNvbkRhdGFiYXNlQ2xhc3MpCiB7CiAg ICAgR09iamVjdENsYXNzKiBnT2JqZWN0Q2xhc3MgPSBHX09CSkVDVF9DTEFTUyhmYXZpY29uRGF0 YWJhc2VDbGFzcyk7CisgICAgZ09iamVjdENsYXNzLT5kaXNwb3NlID0gd2Via2l0RmF2aWNvbkRh dGFiYXNlRGlzcG9zZTsKICAgICBnT2JqZWN0Q2xhc3MtPmZpbmFsaXplID0gd2Via2l0RmF2aWNv bkRhdGFiYXNlRmluYWxpemU7CiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25E YXRhYmFzZS5jcHAKaW5kZXggY2VlZWI5ZS4uNjIxMDZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25EYXRhYmFzZS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktp dEZhdmljb25EYXRhYmFzZS5jcHAKQEAgLTE5NiwyMCArMTk2LDYgQEAgc3RhdGljIHZvaWQgdGVz dFdlYlZpZXdGYXZpY29uKEZhdmljb25EYXRhYmFzZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIp CiAgICAgY2Fpcm9fc3VyZmFjZV9kZXN0cm95KGljb25Gcm9tV2ViVmlldyk7CiB9CiAKLXN0YXRp YyB2b2lkIGRlbGV0ZURhdGFiYXNlRmlsZXMoKQotewotICAgIGlmICghZ19maWxlX3Rlc3Qoa1Rl bXBEaXJlY3RvcnksIEdfRklMRV9URVNUX0lTX0RJUikpCi0gICAgICAgIHJldHVybjsKLQotICAg IEdPd25QdHI8Y2hhcj4gZmlsZW5hbWUoZ19idWlsZF9maWxlbmFtZShrVGVtcERpcmVjdG9yeSwg IldlYnBhZ2VJY29ucy5kYiIsIE5VTEwpKTsKLSAgICBnX3VubGluayhmaWxlbmFtZS5nZXQoKSk7 Ci0KLSAgICBmaWxlbmFtZS5zZXQoZ19idWlsZF9maWxlbmFtZShrVGVtcERpcmVjdG9yeSwgIldl YnBhZ2VJY29ucy5kYi1qb3VybmFsIiwgTlVMTCkpOwotICAgIGdfdW5saW5rKGZpbGVuYW1lLmdl dCgpKTsKLQotICAgIGdfcm1kaXIoa1RlbXBEaXJlY3RvcnkpOwotfQotCiB2b2lkIGJlZm9yZUFs bCgpCiB7CiAgICAgLy8gU3RhcnQgYSBzb3VwIHNlcnZlciBmb3IgdGVzdGluZy4KQEAgLTIyNyw4 ICsyMTMsMjMgQEAgdm9pZCBiZWZvcmVBbGwoKQogICAgIEZhdmljb25EYXRhYmFzZVRlc3Q6OmFk ZCgiV2ViS2l0V2ViVmlldyIsICJmYXZpY29uIiwgdGVzdFdlYlZpZXdGYXZpY29uKTsKIH0KIAor c3RhdGljIHZvaWQgd2Via2l0RmF2aWNvbkRhdGFiYXNlRmluYWxpemVkQ2FsbGJhY2soZ3BvaW50 ZXIsIEdPYmplY3QqKQoreworICAgIGlmICghZ19maWxlX3Rlc3Qoa1RlbXBEaXJlY3RvcnksIEdf RklMRV9URVNUX0lTX0RJUikpCisgICAgICAgIHJldHVybjsKKworICAgIEdPd25QdHI8Y2hhcj4g ZmlsZW5hbWUoZ19idWlsZF9maWxlbmFtZShrVGVtcERpcmVjdG9yeSwgIldlYnBhZ2VJY29ucy5k YiIsIE5VTEwpKTsKKyAgICBnX3VubGluayhmaWxlbmFtZS5nZXQoKSk7CisKKyAgICBnX3JtZGly KGtUZW1wRGlyZWN0b3J5KTsKK30KKwogdm9pZCBhZnRlckFsbCgpCiB7CiAgICAgZGVsZXRlIGtT ZXJ2ZXI7Ci0gICAgZGVsZXRlRGF0YWJhc2VGaWxlcygpOworCisgICAgLy8gRGVsZXRlIHRoZSB0 ZW1wb3JhcnkgZmlsZXMgYWZ0ZXIgdGhlIEljb25EYXRhYmFzZSBoYXMgYmVlbgorICAgIC8vIGNs b3NlZCwgdGhhdCBpcywgb25jZSBXZWJLaXRGYXZpY29uRGF0YWJhc2UgaXMgYmVpbmcgZGVzdHJv eWVkLgorICAgIFdlYktpdEZhdmljb25EYXRhYmFzZSogZGF0YWJhc2UgPSB3ZWJraXRfd2ViX2Nv bnRleHRfZ2V0X2Zhdmljb25fZGF0YWJhc2Uod2Via2l0X3dlYl9jb250ZXh0X2dldF9kZWZhdWx0 KCkpOworICAgIGdfb2JqZWN0X3dlYWtfcmVmKEdfT0JKRUNUKGRhdGFiYXNlKSwgd2Via2l0RmF2 aWNvbkRhdGFiYXNlRmluYWxpemVkQ2FsbGJhY2ssIDApOwogfQotLSAKMS43LjExLjQKCg==