117150 2013-06-03 08:41:17 -0700 [GTK] Migrate WebKitCookieManager to GTask 2013-06-19 00:14:06 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 117149 1 cgarcia webkit-unassigned commit-queue danw gustavo mrobinson xan.lopez oldest_to_newest 896460 0 cgarcia 2013-06-03 08:41:17 -0700 Migrate WebKitCookieManager to GTask 896466 1 203594 cgarcia 2013-06-03 08:46:46 -0700 Created attachment 203594 Patch 896467 2 commit-queue 2013-06-03 08:48:21 -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 896528 3 203594 danw 2013-06-03 10:27:50 -0700 Comment on attachment 203594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203594&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:193 > - if (g_simple_async_result_propagate_error(simpleResult, error)) > - return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY; > + g_return_val_if_fail(g_task_is_valid(result, manager), WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY); > > - GetAcceptPolicyAsyncData* data = static_cast<GetAcceptPolicyAsyncData*>(g_simple_async_result_get_op_res_gpointer(simpleResult)); > - return static_cast<WebKitCookieAcceptPolicy>(data->policy); > + return static_cast<WebKitCookieAcceptPolicy>(g_task_propagate_int(G_TASK(result), error)); This means that on error you are now returning -1 rather than WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY. I suppose the API only worked before if the caller checked the error first anyway, so maybe this doesn't matter. You could get the old behavior back by checking g_task_had_error() explicitly. (I'd been thinking about having either g_task_propagate_enum(), or else g_task_propagate_int_with_default(), to deal with this problem...) > Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:215 > + g_task_return_pointer(task.get(), returnValue.get(), reinterpret_cast<GDestroyNotify>(g_ptr_array_unref)); Hm... returnValue is a GRefPtr, so doesn't that mean will get g_ptr_array_free()ed when this function exits? That's wrong; you need to hand over ownership of the pointer to the GTask, so that it can free it itself at the appropriate time. But you're doing that as well, so the data is going to get freed twice... It looks like the old version had a .leakRef() in _finish which you lost. It would be better to leak the ref when calling g_task_return_pointer() anyway; the caller doesn't necessarily have to call the _finish function right away, so the array needs to live as long as the task does. Well, and also, there's no particularly good reason to do the GPtrArray -> char** conversion in _finish rather than here... So I think how it should work is, here you do: g_task_return_pointer(task.get(), g_ptr_array_free(returnValue.leakRef(), FALSE), reinterpret_cast<GDestroyNotify>(g_strfreev)); and then in _finish, just do return g_task_propagate_pointer(G_TASK(result), error); 896551 4 203594 cgarcia 2013-06-03 11:16:41 -0700 Comment on attachment 203594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203594&action=review >> Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:193 >> + return static_cast<WebKitCookieAcceptPolicy>(g_task_propagate_int(G_TASK(result), error)); > > This means that on error you are now returning -1 rather than WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY. I suppose the API only worked before if the caller checked the error first anyway, so maybe this doesn't matter. You could get the old behavior back by checking g_task_had_error() explicitly. (I'd been thinking about having either g_task_propagate_enum(), or else g_task_propagate_int_with_default(), to deal with this problem...) Good catch, the user should indeed check the error, we were returning WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY before to use a valid WebKitCookieAcceptPolicy, because it's the default one. I'll update it. >> Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:215 >> + g_task_return_pointer(task.get(), returnValue.get(), reinterpret_cast<GDestroyNotify>(g_ptr_array_unref)); > > Hm... returnValue is a GRefPtr, so doesn't that mean will get g_ptr_array_free()ed when this function exits? That's wrong; you need to hand over ownership of the pointer to the GTask, so that it can free it itself at the appropriate time. But you're doing that as well, so the data is going to get freed twice... It looks like the old version had a .leakRef() in _finish which you lost. It would be better to leak the ref when calling g_task_return_pointer() anyway; the caller doesn't necessarily have to call the _finish function right away, so the array needs to live as long as the task does. > > Well, and also, there's no particularly good reason to do the GPtrArray -> char** conversion in _finish rather than here... > > So I think how it should work is, here you do: > > g_task_return_pointer(task.get(), g_ptr_array_free(returnValue.leakRef(), FALSE), reinterpret_cast<GDestroyNotify>(g_strfreev)); > > and then in _finish, just do > > return g_task_propagate_pointer(G_TASK(result), error); Not exactly, GRefPtr calls g_ptr_arry_unref not _free, but what I didn't know is that free also decreases the reference counter. Your proposal is indeed less confusing and cleaner, I'll do that, thanks! 896760 5 203660 cgarcia 2013-06-04 00:39:34 -0700 Created attachment 203660 Updated patch according to review comments 896856 6 203660 danw 2013-06-04 06:11:27 -0700 Comment on attachment 203660 Updated patch according to review comments everything looks good to me 901675 7 cgarcia 2013-06-19 00:14:06 -0700 Committed r151723: <http://trac.webkit.org/changeset/151723> 203594 2013-06-03 08:46:46 -0700 2013-06-04 00:39:34 -0700 Patch wk2-gtask-cookie-manager.diff text/plain 8914 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3YjhkZjY5Li40ZDZlNjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDYtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIE1pZ3JhdGUgV2ViS2l0Q29va2llTWFuYWdlciB0byBHVGFzawor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTUwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgdXNl IGhlbHBlciBzdHJ1Y3RzIGZvciBhc3luYyBkYXRhIHNpbmNlIHRoZSBjYW5jZWxsYWJsZSBpcwor ICAgICAgICBub3cgYWNjZXNzaWJsZSBmcm9tIHRoZSBHVGFzay4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdENvb2tpZU1hbmFnZXIuY3BwOgorICAgICAgICAod2Via2l0Q29v a2llTWFuYWdlckdldEFjY2VwdFBvbGljeUNhbGxiYWNrKToKKyAgICAgICAgKHdlYmtpdF9jb29r aWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeSk6CisgICAgICAgICh3ZWJraXRfY29va2llX21h bmFnZXJfZ2V0X2FjY2VwdF9wb2xpY3lfZmluaXNoKToKKyAgICAgICAgKHdlYmtpdENvb2tpZU1h bmFnZXJHZXREb21haW5zV2l0aENvb2tpZXNDYWxsYmFjayk6CisgICAgICAgICh3ZWJraXRfY29v a2llX21hbmFnZXJfZ2V0X2RvbWFpbnNfd2l0aF9jb29raWVzKToKKyAgICAgICAgKHdlYmtpdF9j b29raWVfbWFuYWdlcl9nZXRfZG9tYWluc193aXRoX2Nvb2tpZXNfZmluaXNoKToKKwogMjAxMy0w NS0zMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBJ dCdzIGVhc3kgdG8gaGl0IEFTU0VSVF9OT1RfUkVBQ0hFRCBpbiBXS0RPTU5vZGVDbGFzcwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29va2llTWFu YWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVN YW5hZ2VyLmNwcAppbmRleCAxZTI0ZDY3Li41NWE2ZDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcApAQCAt MTQ5LDIyICsxNDksMTAgQEAgdm9pZCB3ZWJraXRfY29va2llX21hbmFnZXJfc2V0X2FjY2VwdF9w b2xpY3koV2ViS2l0Q29va2llTWFuYWdlciogbWFuYWdlciwgV2ViS2kKICAgICBtYW5hZ2VyLT5w cml2LT53ZWJDb29raWVNYW5hZ2VyLT5zZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KHBvbGljeSk7 CiB9CiAKLXN0cnVjdCBHZXRBY2NlcHRQb2xpY3lBc3luY0RhdGEgewotICAgIFdLSFRUUENvb2tp ZUFjY2VwdFBvbGljeSBwb2xpY3k7Ci0gICAgR1JlZlB0cjxHQ2FuY2VsbGFibGU+IGNhbmNlbGxh YmxlOwotfTsKLVdFQktJVF9ERUZJTkVfQVNZTkNfREFUQV9TVFJVQ1QoR2V0QWNjZXB0UG9saWN5 QXN5bmNEYXRhKQotCiBzdGF0aWMgdm9pZCB3ZWJraXRDb29raWVNYW5hZ2VyR2V0QWNjZXB0UG9s aWN5Q2FsbGJhY2soV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSwgV0tFcnJvclJlZiwg dm9pZCogY29udGV4dCkKIHsKLSAgICBHUmVmUHRyPEdTaW1wbGVBc3luY1Jlc3VsdD4gcmVzdWx0 ID0gYWRvcHRHUmVmKEdfU0lNUExFX0FTWU5DX1JFU1VMVChjb250ZXh0KSk7Ci0gICAgR2V0QWNj ZXB0UG9saWN5QXN5bmNEYXRhKiBkYXRhID0gc3RhdGljX2Nhc3Q8R2V0QWNjZXB0UG9saWN5QXN5 bmNEYXRhKj4oZ19zaW1wbGVfYXN5bmNfcmVzdWx0X2dldF9vcF9yZXNfZ3BvaW50ZXIocmVzdWx0 LmdldCgpKSk7Ci0gICAgR0Vycm9yKiBlcnJvciA9IDA7Ci0gICAgaWYgKGdfY2FuY2VsbGFibGVf c2V0X2Vycm9yX2lmX2NhbmNlbGxlZChkYXRhLT5jYW5jZWxsYWJsZS5nZXQoKSwgJmVycm9yKSkK LSAgICAgICAgZ19zaW1wbGVfYXN5bmNfcmVzdWx0X3Rha2VfZXJyb3IocmVzdWx0LmdldCgpLCBl cnJvcik7Ci0gICAgZWxzZQotICAgICAgICBkYXRhLT5wb2xpY3kgPSBwb2xpY3k7Ci0gICAgZ19z aW1wbGVfYXN5bmNfcmVzdWx0X2NvbXBsZXRlKHJlc3VsdC5nZXQoKSk7CisgICAgR1JlZlB0cjxH VGFzaz4gdGFzayA9IGFkb3B0R1JlZihHX1RBU0soY29udGV4dCkpOworICAgIGdfdGFza19yZXR1 cm5faW50KHRhc2suZ2V0KCksIHBvbGljeSk7CiB9CiAKIC8qKgpAQCAtMTgzLDEzICsxNzEsOCBA QCB2b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeShXZWJLaXRDb29r aWVNYW5hZ2VyKiBtYW5hZ2VyLCBHQ2FuYwogewogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lU X0lTX0NPT0tJRV9NQU5BR0VSKG1hbmFnZXIpKTsKIAotICAgIEdTaW1wbGVBc3luY1Jlc3VsdCog cmVzdWx0ID0gZ19zaW1wbGVfYXN5bmNfcmVzdWx0X25ldyhHX09CSkVDVChtYW5hZ2VyKSwgY2Fs bGJhY2ssIHVzZXJEYXRhLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZWludGVycHJldF9jYXN0PGdwb2ludGVyPih3ZWJraXRfY29v a2llX21hbmFnZXJfZ2V0X2FjY2VwdF9wb2xpY3kpKTsKLSAgICBHZXRBY2NlcHRQb2xpY3lBc3lu Y0RhdGEqIGRhdGEgPSBjcmVhdGVHZXRBY2NlcHRQb2xpY3lBc3luY0RhdGEoKTsKLSAgICBkYXRh LT5jYW5jZWxsYWJsZSA9IGNhbmNlbGxhYmxlOwotICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9z ZXRfb3BfcmVzX2dwb2ludGVyKHJlc3VsdCwgZGF0YSwgcmVpbnRlcnByZXRfY2FzdDxHRGVzdHJv eU5vdGlmeT4oZGVzdHJveUdldEFjY2VwdFBvbGljeUFzeW5jRGF0YSkpOwotCi0gICAgbWFuYWdl ci0+cHJpdi0+d2ViQ29va2llTWFuYWdlci0+Z2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShIVFRQ Q29va2llQWNjZXB0UG9saWN5Q2FsbGJhY2s6OmNyZWF0ZShyZXN1bHQsIHdlYmtpdENvb2tpZU1h bmFnZXJHZXRBY2NlcHRQb2xpY3lDYWxsYmFjaykpOworICAgIEdUYXNrKiB0YXNrID0gZ190YXNr X25ldyhtYW5hZ2VyLCBjYW5jZWxsYWJsZSwgY2FsbGJhY2ssIHVzZXJEYXRhKTsKKyAgICBtYW5h Z2VyLT5wcml2LT53ZWJDb29raWVNYW5hZ2VyLT5nZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KEhU VFBDb29raWVBY2NlcHRQb2xpY3lDYWxsYmFjazo6Y3JlYXRlKHRhc2ssIHdlYmtpdENvb2tpZU1h bmFnZXJHZXRBY2NlcHRQb2xpY3lDYWxsYmFjaykpOwogfQogCiAvKioKQEAgLTIwNSw0NCArMTg4 LDMxIEBAIHZvaWQgd2Via2l0X2Nvb2tpZV9tYW5hZ2VyX2dldF9hY2NlcHRfcG9saWN5KFdlYktp dENvb2tpZU1hbmFnZXIqIG1hbmFnZXIsIEdDYW5jCiBXZWJLaXRDb29raWVBY2NlcHRQb2xpY3kg d2Via2l0X2Nvb2tpZV9tYW5hZ2VyX2dldF9hY2NlcHRfcG9saWN5X2ZpbmlzaChXZWJLaXRDb29r aWVNYW5hZ2VyKiBtYW5hZ2VyLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgR0Vycm9yKiogZXJyb3Ip CiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX0NPT0tJRV9NQU5BR0VSKG1h bmFnZXIpLCBXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfTk9fVEhJUkRfUEFSVFkpOwotICAg IGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEdfSVNfQVNZTkNfUkVTVUxUKHJlc3VsdCksIFdFQktJVF9D T09LSUVfUE9MSUNZX0FDQ0VQVF9OT19USElSRF9QQVJUWSk7Ci0KLSAgICBHU2ltcGxlQXN5bmNS ZXN1bHQqIHNpbXBsZVJlc3VsdCA9IEdfU0lNUExFX0FTWU5DX1JFU1VMVChyZXN1bHQpOwotICAg IGdfd2Fybl9pZl9mYWlsKGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9nZXRfc291cmNlX3RhZyhzaW1w bGVSZXN1bHQpID09IHdlYmtpdF9jb29raWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeSk7Ci0K LSAgICBpZiAoZ19zaW1wbGVfYXN5bmNfcmVzdWx0X3Byb3BhZ2F0ZV9lcnJvcihzaW1wbGVSZXN1 bHQsIGVycm9yKSkKLSAgICAgICAgcmV0dXJuIFdFQktJVF9DT09LSUVfUE9MSUNZX0FDQ0VQVF9O T19USElSRF9QQVJUWTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChnX3Rhc2tfaXNfdmFsaWQo cmVzdWx0LCBtYW5hZ2VyKSwgV0VCS0lUX0NPT0tJRV9QT0xJQ1lfQUNDRVBUX05PX1RISVJEX1BB UlRZKTsKIAotICAgIEdldEFjY2VwdFBvbGljeUFzeW5jRGF0YSogZGF0YSA9IHN0YXRpY19jYXN0 PEdldEFjY2VwdFBvbGljeUFzeW5jRGF0YSo+KGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9nZXRfb3Bf cmVzX2dwb2ludGVyKHNpbXBsZVJlc3VsdCkpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJL aXRDb29raWVBY2NlcHRQb2xpY3k+KGRhdGEtPnBvbGljeSk7CisgICAgcmV0dXJuIHN0YXRpY19j YXN0PFdlYktpdENvb2tpZUFjY2VwdFBvbGljeT4oZ190YXNrX3Byb3BhZ2F0ZV9pbnQoR19UQVNL KHJlc3VsdCksIGVycm9yKSk7CiB9CiAKLXN0cnVjdCBHZXREb21haW5zV2l0aENvb2tpZXNBc3lu Y0RhdGEgewotICAgIEdSZWZQdHI8R1B0ckFycmF5PiBkb21haW5zOwotICAgIEdSZWZQdHI8R0Nh bmNlbGxhYmxlPiBjYW5jZWxsYWJsZTsKLX07Ci1XRUJLSVRfREVGSU5FX0FTWU5DX0RBVEFfU1RS VUNUKEdldERvbWFpbnNXaXRoQ29va2llc0FzeW5jRGF0YSkKLQogc3RhdGljIHZvaWQgd2Via2l0 Q29va2llTWFuYWdlckdldERvbWFpbnNXaXRoQ29va2llc0NhbGxiYWNrKFdLQXJyYXlSZWYgd2tE b21haW5zLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewotICAgIEdSZWZQdHI8R1NpbXBs ZUFzeW5jUmVzdWx0PiByZXN1bHQgPSBhZG9wdEdSZWYoR19TSU1QTEVfQVNZTkNfUkVTVUxUKGNv bnRleHQpKTsKLSAgICBHZXREb21haW5zV2l0aENvb2tpZXNBc3luY0RhdGEqIGRhdGEgPSBzdGF0 aWNfY2FzdDxHZXREb21haW5zV2l0aENvb2tpZXNBc3luY0RhdGEqPihnX3NpbXBsZV9hc3luY19y ZXN1bHRfZ2V0X29wX3Jlc19ncG9pbnRlcihyZXN1bHQuZ2V0KCkpKTsKKyAgICBHUmVmUHRyPEdU YXNrPiB0YXNrID0gYWRvcHRHUmVmKEdfVEFTSyhjb250ZXh0KSk7CiAgICAgR0Vycm9yKiBlcnJv ciA9IDA7Ci0gICAgaWYgKGdfY2FuY2VsbGFibGVfc2V0X2Vycm9yX2lmX2NhbmNlbGxlZChkYXRh LT5jYW5jZWxsYWJsZS5nZXQoKSwgJmVycm9yKSkKLSAgICAgICAgZ19zaW1wbGVfYXN5bmNfcmVz dWx0X3Rha2VfZXJyb3IocmVzdWx0LmdldCgpLCBlcnJvcik7Ci0gICAgZWxzZSB7Ci0gICAgICAg IEltbXV0YWJsZUFycmF5KiBkb21haW5zID0gdG9JbXBsKHdrRG9tYWlucyk7Ci0gICAgICAgIGRh dGEtPmRvbWFpbnMgPSBhZG9wdEdSZWYoZ19wdHJfYXJyYXlfbmV3X3dpdGhfZnJlZV9mdW5jKGdf ZnJlZSkpOwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGRvbWFpbnMtPnNpemUoKTsg KytpKSB7Ci0gICAgICAgICAgICBXZWJTdHJpbmcqIGRvbWFpblN0cmluZyA9IHN0YXRpY19jYXN0 PFdlYlN0cmluZyo+KGRvbWFpbnMtPmF0KGkpKTsKLSAgICAgICAgICAgIFN0cmluZyBkb21haW4g PSBkb21haW5TdHJpbmctPnN0cmluZygpOwotICAgICAgICAgICAgaWYgKGRvbWFpbi5pc0VtcHR5 KCkpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBnX3B0cl9hcnJheV9h ZGQoZGF0YS0+ZG9tYWlucy5nZXQoKSwgZ19zdHJkdXAoZG9tYWluLnV0ZjgoKS5kYXRhKCkpKTsK LSAgICAgICAgfQotICAgICAgICBnX3B0cl9hcnJheV9hZGQoZGF0YS0+ZG9tYWlucy5nZXQoKSwg MCk7CisgICAgaWYgKGdfY2FuY2VsbGFibGVfc2V0X2Vycm9yX2lmX2NhbmNlbGxlZChnX3Rhc2tf Z2V0X2NhbmNlbGxhYmxlKHRhc2suZ2V0KCkpLCAmZXJyb3IpKSB7CisgICAgICAgIGdfdGFza19y ZXR1cm5fZXJyb3IodGFzay5nZXQoKSwgZXJyb3IpOworICAgICAgICByZXR1cm47CisgICAgfQor CisgICAgSW1tdXRhYmxlQXJyYXkqIGRvbWFpbnMgPSB0b0ltcGwod2tEb21haW5zKTsKKyAgICBH UmVmUHRyPEdQdHJBcnJheT4gcmV0dXJuVmFsdWUgPSBhZG9wdEdSZWYoZ19wdHJfYXJyYXlfbmV3 X3dpdGhfZnJlZV9mdW5jKGdfZnJlZSkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZG9t YWlucy0+c2l6ZSgpOyArK2kpIHsKKyAgICAgICAgV2ViU3RyaW5nKiBkb21haW5TdHJpbmcgPSBz dGF0aWNfY2FzdDxXZWJTdHJpbmcqPihkb21haW5zLT5hdChpKSk7CisgICAgICAgIFN0cmluZyBk b21haW4gPSBkb21haW5TdHJpbmctPnN0cmluZygpOworICAgICAgICBpZiAoZG9tYWluLmlzRW1w dHkoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBnX3B0cl9hcnJheV9hZGQocmV0 dXJuVmFsdWUuZ2V0KCksIGdfc3RyZHVwKGRvbWFpbi51dGY4KCkuZGF0YSgpKSk7CiAgICAgfQot ICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9jb21wbGV0ZShyZXN1bHQuZ2V0KCkpOworICAgIGdf cHRyX2FycmF5X2FkZChyZXR1cm5WYWx1ZS5nZXQoKSwgMCk7CisgICAgZ190YXNrX3JldHVybl9w b2ludGVyKHRhc2suZ2V0KCksIHJldHVyblZhbHVlLmdldCgpLCByZWludGVycHJldF9jYXN0PEdE ZXN0cm95Tm90aWZ5PihnX3B0cl9hcnJheV91bnJlZikpOwogfQogCiAvKioKQEAgLTI2MSwxMiAr MjMxLDggQEAgdm9pZCB3ZWJraXRfY29va2llX21hbmFnZXJfZ2V0X2RvbWFpbnNfd2l0aF9jb29r aWVzKFdlYktpdENvb2tpZU1hbmFnZXIqIG1hbmFnZXIKIHsKICAgICBnX3JldHVybl9pZl9mYWls KFdFQktJVF9JU19DT09LSUVfTUFOQUdFUihtYW5hZ2VyKSk7CiAKLSAgICBHU2ltcGxlQXN5bmNS ZXN1bHQqIHJlc3VsdCA9IGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9uZXcoR19PQkpFQ1QobWFuYWdl ciksIGNhbGxiYWNrLCB1c2VyRGF0YSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxncG9pbnRlcj4od2Vi a2l0X2Nvb2tpZV9tYW5hZ2VyX2dldF9kb21haW5zX3dpdGhfY29va2llcykpOwotICAgIEdldERv bWFpbnNXaXRoQ29va2llc0FzeW5jRGF0YSogZGF0YSA9IGNyZWF0ZUdldERvbWFpbnNXaXRoQ29v a2llc0FzeW5jRGF0YSgpOwotICAgIGRhdGEtPmNhbmNlbGxhYmxlID0gY2FuY2VsbGFibGU7Ci0g ICAgZ19zaW1wbGVfYXN5bmNfcmVzdWx0X3NldF9vcF9yZXNfZ3BvaW50ZXIocmVzdWx0LCBkYXRh LCByZWludGVycHJldF9jYXN0PEdEZXN0cm95Tm90aWZ5PihkZXN0cm95R2V0RG9tYWluc1dpdGhD b29raWVzQXN5bmNEYXRhKSk7Ci0gICAgbWFuYWdlci0+cHJpdi0+d2ViQ29va2llTWFuYWdlci0+ Z2V0SG9zdG5hbWVzV2l0aENvb2tpZXMoQXJyYXlDYWxsYmFjazo6Y3JlYXRlKHJlc3VsdCwgd2Vi a2l0Q29va2llTWFuYWdlckdldERvbWFpbnNXaXRoQ29va2llc0NhbGxiYWNrKSk7CisgICAgR1Rh c2sqIHRhc2sgPSBnX3Rhc2tfbmV3KG1hbmFnZXIsIGNhbmNlbGxhYmxlLCBjYWxsYmFjaywgdXNl ckRhdGEpOworICAgIG1hbmFnZXItPnByaXYtPndlYkNvb2tpZU1hbmFnZXItPmdldEhvc3RuYW1l c1dpdGhDb29raWVzKEFycmF5Q2FsbGJhY2s6OmNyZWF0ZSh0YXNrLCB3ZWJraXRDb29raWVNYW5h Z2VyR2V0RG9tYWluc1dpdGhDb29raWVzQ2FsbGJhY2spKTsKIH0KIAogLyoqCkBAIC0yODUsMTYg KzI1MSwxMCBAQCB2b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9nZXRfZG9tYWluc193aXRoX2Nv b2tpZXMoV2ViS2l0Q29va2llTWFuYWdlciogbWFuYWdlcgogZ2NoYXIqKiB3ZWJraXRfY29va2ll X21hbmFnZXJfZ2V0X2RvbWFpbnNfd2l0aF9jb29raWVzX2ZpbmlzaChXZWJLaXRDb29raWVNYW5h Z2VyKiBtYW5hZ2VyLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgR0Vycm9yKiogZXJyb3IpCiB7CiAg ICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX0NPT0tJRV9NQU5BR0VSKG1hbmFnZXIp LCAwKTsKLSAgICBnX3JldHVybl92YWxfaWZfZmFpbChHX0lTX0FTWU5DX1JFU1VMVChyZXN1bHQp LCAwKTsKLQotICAgIEdTaW1wbGVBc3luY1Jlc3VsdCogc2ltcGxlUmVzdWx0ID0gR19TSU1QTEVf QVNZTkNfUkVTVUxUKHJlc3VsdCk7Ci0gICAgZ193YXJuX2lmX2ZhaWwoZ19zaW1wbGVfYXN5bmNf cmVzdWx0X2dldF9zb3VyY2VfdGFnKHNpbXBsZVJlc3VsdCkgPT0gd2Via2l0X2Nvb2tpZV9tYW5h Z2VyX2dldF9kb21haW5zX3dpdGhfY29va2llcyk7Ci0KLSAgICBpZiAoZ19zaW1wbGVfYXN5bmNf cmVzdWx0X3Byb3BhZ2F0ZV9lcnJvcihzaW1wbGVSZXN1bHQsIGVycm9yKSkKLSAgICAgICAgcmV0 dXJuIDA7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoZ190YXNrX2lzX3ZhbGlkKHJlc3VsdCwg bWFuYWdlciksIDApOwogCi0gICAgR2V0RG9tYWluc1dpdGhDb29raWVzQXN5bmNEYXRhKiBkYXRh ID0gc3RhdGljX2Nhc3Q8R2V0RG9tYWluc1dpdGhDb29raWVzQXN5bmNEYXRhKj4oZ19zaW1wbGVf YXN5bmNfcmVzdWx0X2dldF9vcF9yZXNfZ3BvaW50ZXIoc2ltcGxlUmVzdWx0KSk7Ci0gICAgcmV0 dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcioqPihnX3B0cl9hcnJheV9mcmVlKGRhdGEtPmRvbWFp bnMubGVha1JlZigpLCBGQUxTRSkpOworICAgIEdSZWZQdHI8R1B0ckFycmF5PiBkb21haW5zID0g YWRvcHRHUmVmKHN0YXRpY19jYXN0PEdQdHJBcnJheSo+KGdfdGFza19wcm9wYWdhdGVfcG9pbnRl cihHX1RBU0socmVzdWx0KSwgZXJyb3IpKSk7CisgICAgcmV0dXJuIGRvbWFpbnMuZ2V0KCkgPyBy ZWludGVycHJldF9jYXN0PGNoYXIqKj4oZ19wdHJfYXJyYXlfZnJlZShkb21haW5zLmdldCgpLCBG QUxTRSkpIDogMDsKIH0KIAogLyoqCg== 203660 2013-06-04 00:39:34 -0700 2013-06-17 06:38:00 -0700 Updated patch according to review comments wk2-gtask-cookies2.diff text/plain 8774 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3YjhkZjY5Li40ZDZlNjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDYtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIE1pZ3JhdGUgV2ViS2l0Q29va2llTWFuYWdlciB0byBHVGFzawor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTUwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgdXNl IGhlbHBlciBzdHJ1Y3RzIGZvciBhc3luYyBkYXRhIHNpbmNlIHRoZSBjYW5jZWxsYWJsZSBpcwor ICAgICAgICBub3cgYWNjZXNzaWJsZSBmcm9tIHRoZSBHVGFzay4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdENvb2tpZU1hbmFnZXIuY3BwOgorICAgICAgICAod2Via2l0Q29v a2llTWFuYWdlckdldEFjY2VwdFBvbGljeUNhbGxiYWNrKToKKyAgICAgICAgKHdlYmtpdF9jb29r aWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeSk6CisgICAgICAgICh3ZWJraXRfY29va2llX21h bmFnZXJfZ2V0X2FjY2VwdF9wb2xpY3lfZmluaXNoKToKKyAgICAgICAgKHdlYmtpdENvb2tpZU1h bmFnZXJHZXREb21haW5zV2l0aENvb2tpZXNDYWxsYmFjayk6CisgICAgICAgICh3ZWJraXRfY29v a2llX21hbmFnZXJfZ2V0X2RvbWFpbnNfd2l0aF9jb29raWVzKToKKyAgICAgICAgKHdlYmtpdF9j b29raWVfbWFuYWdlcl9nZXRfZG9tYWluc193aXRoX2Nvb2tpZXNfZmluaXNoKToKKwogMjAxMy0w NS0zMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBJ dCdzIGVhc3kgdG8gaGl0IEFTU0VSVF9OT1RfUkVBQ0hFRCBpbiBXS0RPTU5vZGVDbGFzcwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29va2llTWFu YWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVN YW5hZ2VyLmNwcAppbmRleCAxZTI0ZDY3Li5kYWY3OWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcApAQCAt MTQ5LDIyICsxNDksMTAgQEAgdm9pZCB3ZWJraXRfY29va2llX21hbmFnZXJfc2V0X2FjY2VwdF9w b2xpY3koV2ViS2l0Q29va2llTWFuYWdlciogbWFuYWdlciwgV2ViS2kKICAgICBtYW5hZ2VyLT5w cml2LT53ZWJDb29raWVNYW5hZ2VyLT5zZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KHBvbGljeSk7 CiB9CiAKLXN0cnVjdCBHZXRBY2NlcHRQb2xpY3lBc3luY0RhdGEgewotICAgIFdLSFRUUENvb2tp ZUFjY2VwdFBvbGljeSBwb2xpY3k7Ci0gICAgR1JlZlB0cjxHQ2FuY2VsbGFibGU+IGNhbmNlbGxh YmxlOwotfTsKLVdFQktJVF9ERUZJTkVfQVNZTkNfREFUQV9TVFJVQ1QoR2V0QWNjZXB0UG9saWN5 QXN5bmNEYXRhKQotCiBzdGF0aWMgdm9pZCB3ZWJraXRDb29raWVNYW5hZ2VyR2V0QWNjZXB0UG9s aWN5Q2FsbGJhY2soV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSwgV0tFcnJvclJlZiwg dm9pZCogY29udGV4dCkKIHsKLSAgICBHUmVmUHRyPEdTaW1wbGVBc3luY1Jlc3VsdD4gcmVzdWx0 ID0gYWRvcHRHUmVmKEdfU0lNUExFX0FTWU5DX1JFU1VMVChjb250ZXh0KSk7Ci0gICAgR2V0QWNj ZXB0UG9saWN5QXN5bmNEYXRhKiBkYXRhID0gc3RhdGljX2Nhc3Q8R2V0QWNjZXB0UG9saWN5QXN5 bmNEYXRhKj4oZ19zaW1wbGVfYXN5bmNfcmVzdWx0X2dldF9vcF9yZXNfZ3BvaW50ZXIocmVzdWx0 LmdldCgpKSk7Ci0gICAgR0Vycm9yKiBlcnJvciA9IDA7Ci0gICAgaWYgKGdfY2FuY2VsbGFibGVf c2V0X2Vycm9yX2lmX2NhbmNlbGxlZChkYXRhLT5jYW5jZWxsYWJsZS5nZXQoKSwgJmVycm9yKSkK LSAgICAgICAgZ19zaW1wbGVfYXN5bmNfcmVzdWx0X3Rha2VfZXJyb3IocmVzdWx0LmdldCgpLCBl cnJvcik7Ci0gICAgZWxzZQotICAgICAgICBkYXRhLT5wb2xpY3kgPSBwb2xpY3k7Ci0gICAgZ19z aW1wbGVfYXN5bmNfcmVzdWx0X2NvbXBsZXRlKHJlc3VsdC5nZXQoKSk7CisgICAgR1JlZlB0cjxH VGFzaz4gdGFzayA9IGFkb3B0R1JlZihHX1RBU0soY29udGV4dCkpOworICAgIGdfdGFza19yZXR1 cm5faW50KHRhc2suZ2V0KCksIHBvbGljeSk7CiB9CiAKIC8qKgpAQCAtMTgzLDEzICsxNzEsOCBA QCB2b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeShXZWJLaXRDb29r aWVNYW5hZ2VyKiBtYW5hZ2VyLCBHQ2FuYwogewogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lU X0lTX0NPT0tJRV9NQU5BR0VSKG1hbmFnZXIpKTsKIAotICAgIEdTaW1wbGVBc3luY1Jlc3VsdCog cmVzdWx0ID0gZ19zaW1wbGVfYXN5bmNfcmVzdWx0X25ldyhHX09CSkVDVChtYW5hZ2VyKSwgY2Fs bGJhY2ssIHVzZXJEYXRhLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZWludGVycHJldF9jYXN0PGdwb2ludGVyPih3ZWJraXRfY29v a2llX21hbmFnZXJfZ2V0X2FjY2VwdF9wb2xpY3kpKTsKLSAgICBHZXRBY2NlcHRQb2xpY3lBc3lu Y0RhdGEqIGRhdGEgPSBjcmVhdGVHZXRBY2NlcHRQb2xpY3lBc3luY0RhdGEoKTsKLSAgICBkYXRh LT5jYW5jZWxsYWJsZSA9IGNhbmNlbGxhYmxlOwotICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9z ZXRfb3BfcmVzX2dwb2ludGVyKHJlc3VsdCwgZGF0YSwgcmVpbnRlcnByZXRfY2FzdDxHRGVzdHJv eU5vdGlmeT4oZGVzdHJveUdldEFjY2VwdFBvbGljeUFzeW5jRGF0YSkpOwotCi0gICAgbWFuYWdl ci0+cHJpdi0+d2ViQ29va2llTWFuYWdlci0+Z2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShIVFRQ Q29va2llQWNjZXB0UG9saWN5Q2FsbGJhY2s6OmNyZWF0ZShyZXN1bHQsIHdlYmtpdENvb2tpZU1h bmFnZXJHZXRBY2NlcHRQb2xpY3lDYWxsYmFjaykpOworICAgIEdUYXNrKiB0YXNrID0gZ190YXNr X25ldyhtYW5hZ2VyLCBjYW5jZWxsYWJsZSwgY2FsbGJhY2ssIHVzZXJEYXRhKTsKKyAgICBtYW5h Z2VyLT5wcml2LT53ZWJDb29raWVNYW5hZ2VyLT5nZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KEhU VFBDb29raWVBY2NlcHRQb2xpY3lDYWxsYmFjazo6Y3JlYXRlKHRhc2ssIHdlYmtpdENvb2tpZU1h bmFnZXJHZXRBY2NlcHRQb2xpY3lDYWxsYmFjaykpOwogfQogCiAvKioKQEAgLTIwNSw0NCArMTg4 LDI5IEBAIHZvaWQgd2Via2l0X2Nvb2tpZV9tYW5hZ2VyX2dldF9hY2NlcHRfcG9saWN5KFdlYktp dENvb2tpZU1hbmFnZXIqIG1hbmFnZXIsIEdDYW5jCiBXZWJLaXRDb29raWVBY2NlcHRQb2xpY3kg d2Via2l0X2Nvb2tpZV9tYW5hZ2VyX2dldF9hY2NlcHRfcG9saWN5X2ZpbmlzaChXZWJLaXRDb29r aWVNYW5hZ2VyKiBtYW5hZ2VyLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgR0Vycm9yKiogZXJyb3Ip CiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX0NPT0tJRV9NQU5BR0VSKG1h bmFnZXIpLCBXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfTk9fVEhJUkRfUEFSVFkpOwotICAg IGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEdfSVNfQVNZTkNfUkVTVUxUKHJlc3VsdCksIFdFQktJVF9D T09LSUVfUE9MSUNZX0FDQ0VQVF9OT19USElSRF9QQVJUWSk7Ci0KLSAgICBHU2ltcGxlQXN5bmNS ZXN1bHQqIHNpbXBsZVJlc3VsdCA9IEdfU0lNUExFX0FTWU5DX1JFU1VMVChyZXN1bHQpOwotICAg IGdfd2Fybl9pZl9mYWlsKGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9nZXRfc291cmNlX3RhZyhzaW1w bGVSZXN1bHQpID09IHdlYmtpdF9jb29raWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeSk7Ci0K LSAgICBpZiAoZ19zaW1wbGVfYXN5bmNfcmVzdWx0X3Byb3BhZ2F0ZV9lcnJvcihzaW1wbGVSZXN1 bHQsIGVycm9yKSkKLSAgICAgICAgcmV0dXJuIFdFQktJVF9DT09LSUVfUE9MSUNZX0FDQ0VQVF9O T19USElSRF9QQVJUWTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChnX3Rhc2tfaXNfdmFsaWQo cmVzdWx0LCBtYW5hZ2VyKSwgV0VCS0lUX0NPT0tJRV9QT0xJQ1lfQUNDRVBUX05PX1RISVJEX1BB UlRZKTsKIAotICAgIEdldEFjY2VwdFBvbGljeUFzeW5jRGF0YSogZGF0YSA9IHN0YXRpY19jYXN0 PEdldEFjY2VwdFBvbGljeUFzeW5jRGF0YSo+KGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9nZXRfb3Bf cmVzX2dwb2ludGVyKHNpbXBsZVJlc3VsdCkpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJL aXRDb29raWVBY2NlcHRQb2xpY3k+KGRhdGEtPnBvbGljeSk7CisgICAgZ3NzaXplIHJldHVyblZh bHVlID0gZ190YXNrX3Byb3BhZ2F0ZV9pbnQoR19UQVNLKHJlc3VsdCksIGVycm9yKTsKKyAgICBy ZXR1cm4gcmV0dXJuVmFsdWUgPT0gLTEgPyBXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfTk9f VEhJUkRfUEFSVFkgOiBzdGF0aWNfY2FzdDxXZWJLaXRDb29raWVBY2NlcHRQb2xpY3k+KHJldHVy blZhbHVlKTsKIH0KIAotc3RydWN0IEdldERvbWFpbnNXaXRoQ29va2llc0FzeW5jRGF0YSB7Ci0g ICAgR1JlZlB0cjxHUHRyQXJyYXk+IGRvbWFpbnM7Ci0gICAgR1JlZlB0cjxHQ2FuY2VsbGFibGU+ IGNhbmNlbGxhYmxlOwotfTsKLVdFQktJVF9ERUZJTkVfQVNZTkNfREFUQV9TVFJVQ1QoR2V0RG9t YWluc1dpdGhDb29raWVzQXN5bmNEYXRhKQotCiBzdGF0aWMgdm9pZCB3ZWJraXRDb29raWVNYW5h Z2VyR2V0RG9tYWluc1dpdGhDb29raWVzQ2FsbGJhY2soV0tBcnJheVJlZiB3a0RvbWFpbnMsIFdL RXJyb3JSZWYsIHZvaWQqIGNvbnRleHQpCiB7Ci0gICAgR1JlZlB0cjxHU2ltcGxlQXN5bmNSZXN1 bHQ+IHJlc3VsdCA9IGFkb3B0R1JlZihHX1NJTVBMRV9BU1lOQ19SRVNVTFQoY29udGV4dCkpOwot ICAgIEdldERvbWFpbnNXaXRoQ29va2llc0FzeW5jRGF0YSogZGF0YSA9IHN0YXRpY19jYXN0PEdl dERvbWFpbnNXaXRoQ29va2llc0FzeW5jRGF0YSo+KGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9nZXRf b3BfcmVzX2dwb2ludGVyKHJlc3VsdC5nZXQoKSkpOwotICAgIEdFcnJvciogZXJyb3IgPSAwOwot ICAgIGlmIChnX2NhbmNlbGxhYmxlX3NldF9lcnJvcl9pZl9jYW5jZWxsZWQoZGF0YS0+Y2FuY2Vs bGFibGUuZ2V0KCksICZlcnJvcikpCi0gICAgICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF90YWtl X2Vycm9yKHJlc3VsdC5nZXQoKSwgZXJyb3IpOwotICAgIGVsc2UgewotICAgICAgICBJbW11dGFi bGVBcnJheSogZG9tYWlucyA9IHRvSW1wbCh3a0RvbWFpbnMpOwotICAgICAgICBkYXRhLT5kb21h aW5zID0gYWRvcHRHUmVmKGdfcHRyX2FycmF5X25ld193aXRoX2ZyZWVfZnVuYyhnX2ZyZWUpKTsK LSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBkb21haW5zLT5zaXplKCk7ICsraSkgewot ICAgICAgICAgICAgV2ViU3RyaW5nKiBkb21haW5TdHJpbmcgPSBzdGF0aWNfY2FzdDxXZWJTdHJp bmcqPihkb21haW5zLT5hdChpKSk7Ci0gICAgICAgICAgICBTdHJpbmcgZG9tYWluID0gZG9tYWlu U3RyaW5nLT5zdHJpbmcoKTsKLSAgICAgICAgICAgIGlmIChkb21haW4uaXNFbXB0eSgpKQotICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgZ19wdHJfYXJyYXlfYWRkKGRhdGEt PmRvbWFpbnMuZ2V0KCksIGdfc3RyZHVwKGRvbWFpbi51dGY4KCkuZGF0YSgpKSk7Ci0gICAgICAg IH0KLSAgICAgICAgZ19wdHJfYXJyYXlfYWRkKGRhdGEtPmRvbWFpbnMuZ2V0KCksIDApOworICAg IEdSZWZQdHI8R1Rhc2s+IHRhc2sgPSBhZG9wdEdSZWYoR19UQVNLKGNvbnRleHQpKTsKKyAgICBp ZiAoZ190YXNrX3JldHVybl9lcnJvcl9pZl9jYW5jZWxsZWQodGFzay5nZXQoKSkpCisgICAgICAg IHJldHVybjsKKworICAgIEltbXV0YWJsZUFycmF5KiBkb21haW5zID0gdG9JbXBsKHdrRG9tYWlu cyk7CisgICAgR1B0ckFycmF5KiByZXR1cm5WYWx1ZSA9IGdfcHRyX2FycmF5X3NpemVkX25ldyhk b21haW5zLT5zaXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZG9tYWlucy0+c2l6 ZSgpOyArK2kpIHsKKyAgICAgICAgV2ViU3RyaW5nKiBkb21haW5TdHJpbmcgPSBzdGF0aWNfY2Fz dDxXZWJTdHJpbmcqPihkb21haW5zLT5hdChpKSk7CisgICAgICAgIFN0cmluZyBkb21haW4gPSBk b21haW5TdHJpbmctPnN0cmluZygpOworICAgICAgICBpZiAoZG9tYWluLmlzRW1wdHkoKSkKKyAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBnX3B0cl9hcnJheV9hZGQocmV0dXJuVmFsdWUs IGdfc3RyZHVwKGRvbWFpbi51dGY4KCkuZGF0YSgpKSk7CiAgICAgfQotICAgIGdfc2ltcGxlX2Fz eW5jX3Jlc3VsdF9jb21wbGV0ZShyZXN1bHQuZ2V0KCkpOworICAgIGdfcHRyX2FycmF5X2FkZChy ZXR1cm5WYWx1ZSwgMCk7CisgICAgZ190YXNrX3JldHVybl9wb2ludGVyKHRhc2suZ2V0KCksIGdf cHRyX2FycmF5X2ZyZWUocmV0dXJuVmFsdWUsIEZBTFNFKSwgcmVpbnRlcnByZXRfY2FzdDxHRGVz dHJveU5vdGlmeT4oZ19zdHJmcmVldikpOwogfQogCiAvKioKQEAgLTI2MSwxMiArMjI5LDggQEAg dm9pZCB3ZWJraXRfY29va2llX21hbmFnZXJfZ2V0X2RvbWFpbnNfd2l0aF9jb29raWVzKFdlYktp dENvb2tpZU1hbmFnZXIqIG1hbmFnZXIKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9J U19DT09LSUVfTUFOQUdFUihtYW5hZ2VyKSk7CiAKLSAgICBHU2ltcGxlQXN5bmNSZXN1bHQqIHJl c3VsdCA9IGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9uZXcoR19PQkpFQ1QobWFuYWdlciksIGNhbGxi YWNrLCB1c2VyRGF0YSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxncG9pbnRlcj4od2Via2l0X2Nvb2tp ZV9tYW5hZ2VyX2dldF9kb21haW5zX3dpdGhfY29va2llcykpOwotICAgIEdldERvbWFpbnNXaXRo Q29va2llc0FzeW5jRGF0YSogZGF0YSA9IGNyZWF0ZUdldERvbWFpbnNXaXRoQ29va2llc0FzeW5j RGF0YSgpOwotICAgIGRhdGEtPmNhbmNlbGxhYmxlID0gY2FuY2VsbGFibGU7Ci0gICAgZ19zaW1w bGVfYXN5bmNfcmVzdWx0X3NldF9vcF9yZXNfZ3BvaW50ZXIocmVzdWx0LCBkYXRhLCByZWludGVy cHJldF9jYXN0PEdEZXN0cm95Tm90aWZ5PihkZXN0cm95R2V0RG9tYWluc1dpdGhDb29raWVzQXN5 bmNEYXRhKSk7Ci0gICAgbWFuYWdlci0+cHJpdi0+d2ViQ29va2llTWFuYWdlci0+Z2V0SG9zdG5h bWVzV2l0aENvb2tpZXMoQXJyYXlDYWxsYmFjazo6Y3JlYXRlKHJlc3VsdCwgd2Via2l0Q29va2ll TWFuYWdlckdldERvbWFpbnNXaXRoQ29va2llc0NhbGxiYWNrKSk7CisgICAgR1Rhc2sqIHRhc2sg PSBnX3Rhc2tfbmV3KG1hbmFnZXIsIGNhbmNlbGxhYmxlLCBjYWxsYmFjaywgdXNlckRhdGEpOwor ICAgIG1hbmFnZXItPnByaXYtPndlYkNvb2tpZU1hbmFnZXItPmdldEhvc3RuYW1lc1dpdGhDb29r aWVzKEFycmF5Q2FsbGJhY2s6OmNyZWF0ZSh0YXNrLCB3ZWJraXRDb29raWVNYW5hZ2VyR2V0RG9t YWluc1dpdGhDb29raWVzQ2FsbGJhY2spKTsKIH0KIAogLyoqCkBAIC0yODUsMTYgKzI0OSw5IEBA IHZvaWQgd2Via2l0X2Nvb2tpZV9tYW5hZ2VyX2dldF9kb21haW5zX3dpdGhfY29va2llcyhXZWJL aXRDb29raWVNYW5hZ2VyKiBtYW5hZ2VyCiBnY2hhcioqIHdlYmtpdF9jb29raWVfbWFuYWdlcl9n ZXRfZG9tYWluc193aXRoX2Nvb2tpZXNfZmluaXNoKFdlYktpdENvb2tpZU1hbmFnZXIqIG1hbmFn ZXIsIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBHRXJyb3IqKiBlcnJvcikKIHsKICAgICBnX3JldHVy bl92YWxfaWZfZmFpbChXRUJLSVRfSVNfQ09PS0lFX01BTkFHRVIobWFuYWdlciksIDApOwotICAg IGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEdfSVNfQVNZTkNfUkVTVUxUKHJlc3VsdCksIDApOwotCi0g ICAgR1NpbXBsZUFzeW5jUmVzdWx0KiBzaW1wbGVSZXN1bHQgPSBHX1NJTVBMRV9BU1lOQ19SRVNV TFQocmVzdWx0KTsKLSAgICBnX3dhcm5faWZfZmFpbChnX3NpbXBsZV9hc3luY19yZXN1bHRfZ2V0 X3NvdXJjZV90YWcoc2ltcGxlUmVzdWx0KSA9PSB3ZWJraXRfY29va2llX21hbmFnZXJfZ2V0X2Rv bWFpbnNfd2l0aF9jb29raWVzKTsKLQotICAgIGlmIChnX3NpbXBsZV9hc3luY19yZXN1bHRfcHJv cGFnYXRlX2Vycm9yKHNpbXBsZVJlc3VsdCwgZXJyb3IpKQotICAgICAgICByZXR1cm4gMDsKKyAg ICBnX3JldHVybl92YWxfaWZfZmFpbChnX3Rhc2tfaXNfdmFsaWQocmVzdWx0LCBtYW5hZ2VyKSwg MCk7CiAKLSAgICBHZXREb21haW5zV2l0aENvb2tpZXNBc3luY0RhdGEqIGRhdGEgPSBzdGF0aWNf Y2FzdDxHZXREb21haW5zV2l0aENvb2tpZXNBc3luY0RhdGEqPihnX3NpbXBsZV9hc3luY19yZXN1 bHRfZ2V0X29wX3Jlc19ncG9pbnRlcihzaW1wbGVSZXN1bHQpKTsKLSAgICByZXR1cm4gcmVpbnRl cnByZXRfY2FzdDxjaGFyKio+KGdfcHRyX2FycmF5X2ZyZWUoZGF0YS0+ZG9tYWlucy5sZWFrUmVm KCksIEZBTFNFKSk7CisgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcioqPihnX3Rhc2tf cHJvcGFnYXRlX3BvaW50ZXIoR19UQVNLKHJlc3VsdCksIGVycm9yKSk7CiB9CiAKIC8qKgo=