72353 2011-11-14 22:32:46 -0800 [SOUP][WK2] Implement the functions to manager cookies in CookieJar for WebKit2 2011-11-30 03:08:10 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 js45.yang webkit-unassigned gyuyoung.kim mrobinson ryuan.choi webkit.review.bot oldest_to_newest 502644 0 js45.yang 2011-11-14 22:32:46 -0800 r79722 inserted the functions to manange cookies from web process.(getHostnamesWithCookies,deleteCookiesForHostname,deleteAllCookies) The functions in CookieJarSoup.cpp are not implemented. 502646 1 115099 js45.yang 2011-11-14 22:36:32 -0800 Created attachment 115099 patch 508138 2 115099 mrobinson 2011-11-23 07:47:28 -0800 Comment on attachment 115099 patch View in context: https://bugs.webkit.org/attachment.cgi?id=115099&action=review Looks fine to me, but I have some style nits. > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:131 > + GSList* cookies; > + GSList* item; > + SoupCookie* soupCookie; > + char* domain; > + In WebKit we typically declare variables when they are first used and in the scope they are used. > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:150 > + GSList* cookies; > + GSList* item; > + SoupCookie* soupCookie; > + char* domain; Ditto. > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:168 > + GSList* cookies; > + GSList* item; Ditto. 508140 3 115099 mrobinson 2011-11-23 07:49:33 -0800 Comment on attachment 115099 patch View in context: https://bugs.webkit.org/attachment.cgi?id=115099&action=review > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:158 > + if (domain && domain == hostname) Here you should first convert the hostname to a UTF-8 CString and compare the utf8Hostname.data() with g_str_equal. This is an error because it's comparing a system locale string with a UTF-8 string. 510473 4 116885 js45.yang 2011-11-28 21:45:00 -0800 Created attachment 116885 Patch 510518 5 gyuyoung.kim 2011-11-28 22:54:51 -0800 CC'ing Martin. 510676 6 116885 mrobinson 2011-11-29 04:10:43 -0800 Comment on attachment 116885 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116885&action=review > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:132 > + char* domain = const_cast<char*>(soup_cookie_get_domain(soupCookie)); > + if (domain) You can just do: if (char* domain = const_cast<char*>(soup_cookie_get_domain(soupCookie))) > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:133 > + hostnames.add(domain); Whoops. Seems I missed this in my first review. This you are implicitly converting from from a UTF-8 c string to a String here, which uses the system locale. For ths kind of thing you need to use String::fromUTF8. > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:148 > + if (domain && g_str_equal(domain, hostNameString.data())) I think this can be simplified to be if (domain == hostNameString) or !g_strcmp0(domain, hostNameString.data()). 510724 7 116957 js45.yang 2011-11-29 06:12:56 -0800 Created attachment 116957 Patch 511250 8 116957 gyuyoung.kim 2011-11-29 17:33:30 -0800 Comment on attachment 116957 Patch LGTM. 511588 9 116957 webkit.review.bot 2011-11-30 03:08:05 -0800 Comment on attachment 116957 Patch Clearing flags on attachment: 116957 Committed r101474: <http://trac.webkit.org/changeset/101474> 511589 10 webkit.review.bot 2011-11-30 03:08:10 -0800 All reviewed patches have been landed. Closing bug. 115099 2011-11-14 22:36:32 -0800 2011-11-28 21:44:52 -0800 patch patch.patch text/plain 2884 js45.yang ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0M2FmY2I3Li44MDY2YzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMTEtMTQgIEpvbmdzZW9rIFlhbmcgIDxqczQ1LnlhbmdAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW1NPVVBdW1dLMl0gSW1wbGVtZW50IHRoZSBmdW5jdGlvbnMgdG8gbWFuYWdlciBj b29raWVzIGluIENvb2tpZUphciBmb3IgV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzNTMKKworICAgICAgICByNzk3MjIgaW5zZXJ0ZWQg dGhlIGZ1bmN0aW9ucyB0byBtYW5hbmdlIGNvb2tpZXMgZnJvbSB3ZWIgcHJvY2Vzcy4KKyAgICAg ICAgKGdldEhvc3RuYW1lc1dpdGhDb29raWVzLGRlbGV0ZUNvb2tpZXNGb3JIb3N0bmFtZSxkZWxl dGVBbGxDb29raWVzKQorICAgICAgICBJbXBsZW1lbnQgdGhlIGZ1bmN0aW9ucyBmb3Igc291cCBu ZXR3b3JrIGJhY2tlbmQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2ll SmFyU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRIb3N0bmFtZXNXaXRoQ29va2llcyk6 CisgICAgICAgIChXZWJDb3JlOjpkZWxldGVDb29raWVzRm9ySG9zdG5hbWUpOgorICAgICAgICAo V2ViQ29yZTo6ZGVsZXRlQWxsQ29va2llcyk6CisKIDIwMTEtMTEtMTQgIEphZWhvb24gSmVvbmcg IDxqaDR1Lmplb25nQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtDTUFLRV0gQWRkIHRoZSBVc2VW OC5jbWFrZSB0byBXZWJDb3JlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL0Nvb2tpZUphclNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL0Nvb2tpZUphclNvdXAuY3BwCmluZGV4IGY3M2E2MTYuLjI3M2ZjOTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29raWVKYXJT b3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2ll SmFyU291cC5jcHAKQEAgLTEyNCwxNyArMTI0LDU1IEBAIHZvaWQgZGVsZXRlQ29va2llKGNvbnN0 IERvY3VtZW50KiwgY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYpCiAKIHZvaWQgZ2V0SG9zdG5h bWVzV2l0aENvb2tpZXMoSGFzaFNldDxTdHJpbmc+JiBob3N0bmFtZXMpCiB7Ci0gICAgLy8gRklY TUU6IE5vdCB5ZXQgaW1wbGVtZW50ZWQKKyAgICBHU0xpc3QqIGNvb2tpZXM7CisgICAgR1NMaXN0 KiBpdGVtOworICAgIFNvdXBDb29raWUqIHNvdXBDb29raWU7CisgICAgY2hhciogZG9tYWluOwor CisgICAgU291cENvb2tpZUphciogY29va2llSmFyID0gV2ViQ29yZTo6ZGVmYXVsdENvb2tpZUph cigpOworCisgICAgY29va2llcyA9IHNvdXBfY29va2llX2phcl9hbGxfY29va2llcyhjb29raWVK YXIpOworICAgIGZvciAoaXRlbSA9IGNvb2tpZXM7IGl0ZW07IGl0ZW0gPSBpdGVtLT5uZXh0KSB7 CisgICAgICAgIHNvdXBDb29raWUgPSBzdGF0aWNfY2FzdDxTb3VwQ29va2llKj4oaXRlbS0+ZGF0 YSk7CisgICAgICAgIGRvbWFpbiA9IGNvbnN0X2Nhc3Q8Y2hhcio+KHNvdXBfY29va2llX2dldF9k b21haW4oc291cENvb2tpZSkpOworICAgICAgICBpZiAoZG9tYWluKQorICAgICAgICAgICAgaG9z dG5hbWVzLmFkZChkb21haW4pOworICAgIH0KKworICAgIHNvdXBfY29va2llc19mcmVlKGNvb2tp ZXMpOwogfQogCiB2b2lkIGRlbGV0ZUNvb2tpZXNGb3JIb3N0bmFtZShjb25zdCBTdHJpbmcmIGhv c3RuYW1lKQogewotICAgIC8vIEZJWE1FOiBOb3QgeWV0IGltcGxlbWVudGVkCisgICAgR1NMaXN0 KiBjb29raWVzOworICAgIEdTTGlzdCogaXRlbTsKKyAgICBTb3VwQ29va2llKiBzb3VwQ29va2ll OworICAgIGNoYXIqIGRvbWFpbjsKKworICAgIFNvdXBDb29raWVKYXIqIGNvb2tpZUphciA9IFdl YkNvcmU6OmRlZmF1bHRDb29raWVKYXIoKTsKKworICAgIGNvb2tpZXMgPSBzb3VwX2Nvb2tpZV9q YXJfYWxsX2Nvb2tpZXMoY29va2llSmFyKTsKKyAgICBmb3IgKGl0ZW0gPSBjb29raWVzOyBpdGVt OyBpdGVtID0gaXRlbS0+bmV4dCkgeworICAgICAgICBzb3VwQ29va2llID0gc3RhdGljX2Nhc3Q8 U291cENvb2tpZSo+KGl0ZW0tPmRhdGEpOworICAgICAgICBkb21haW4gPSBjb25zdF9jYXN0PGNo YXIqPihzb3VwX2Nvb2tpZV9nZXRfZG9tYWluKHNvdXBDb29raWUpKTsKKyAgICAgICAgaWYgKGRv bWFpbiAmJiBkb21haW4gPT0gaG9zdG5hbWUpCisgICAgICAgICAgICBzb3VwX2Nvb2tpZV9qYXJf ZGVsZXRlX2Nvb2tpZShjb29raWVKYXIsIHNvdXBDb29raWUpOworICAgIH0KKworICAgIHNvdXBf Y29va2llc19mcmVlKGNvb2tpZXMpOwogfQogCiB2b2lkIGRlbGV0ZUFsbENvb2tpZXMoKQogewot ICAgIC8vIEZJWE1FOiBOb3QgeWV0IGltcGxlbWVudGVkCisgICAgR1NMaXN0KiBjb29raWVzOwor ICAgIEdTTGlzdCogaXRlbTsKKyAgICBTb3VwQ29va2llSmFyKiBjb29raWVKYXIgPSBXZWJDb3Jl OjpkZWZhdWx0Q29va2llSmFyKCk7CisKKyAgICBjb29raWVzID0gc291cF9jb29raWVfamFyX2Fs bF9jb29raWVzKGNvb2tpZUphcik7CisgICAgZm9yIChpdGVtID0gY29va2llczsgaXRlbTsgaXRl bSA9IGl0ZW0tPm5leHQpCisgICAgICAgIHNvdXBfY29va2llX2phcl9kZWxldGVfY29va2llKGNv b2tpZUphciwgc3RhdGljX2Nhc3Q8U291cENvb2tpZSo+KGl0ZW0tPmRhdGEpKTsKKworICAgIHNv dXBfY29va2llc19mcmVlKGNvb2tpZXMpOwogfQogCiB9Cg== 116885 2011-11-28 21:45:00 -0800 2011-11-29 06:12:48 -0800 Patch bug-72353-20111129144519.patch text/plain 3032 js45.yang U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNjYTY1YWE5YmYxZjkw OWJiNGY4ZWY5YjI5NTUyNTAyNGNlYzljNC4uNDAxNGViOGYzZGUwYmFkOWIzMGExZmE1NTdjZmUw MDY4ZTViMmUyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTExLTI4ICBKb25n c2VvayBZYW5nICA8anM0NS55YW5nQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtTT1VQXVtXSzJd IEltcGxlbWVudCB0aGUgZnVuY3Rpb25zIHRvIG1hbmFnZXIgY29va2llcyBpbiBDb29raWVKYXIg Zm9yIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcyMzUzCisKKyAgICAgICAgcjc5NzIyIGluc2VydGVkIHRoZSBmdW5jdGlvbnMgdG8gbWFu YW5nZSBjb29raWVzIGZyb20gd2ViIHByb2Nlc3MuCisgICAgICAgIChnZXRIb3N0bmFtZXNXaXRo Q29va2llcyxkZWxldGVDb29raWVzRm9ySG9zdG5hbWUsZGVsZXRlQWxsQ29va2llcykKKyAgICAg ICAgSW1wbGVtZW50IHRoZSBmdW5jdGlvbnMgZm9yIHNvdXAgbmV0d29yayBiYWNrZW5kLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9zb3VwL0Nvb2tpZUphclNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0SG9z dG5hbWVzV2l0aENvb2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlQ29va2llc0Zvckhv c3RuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OmRlbGV0ZUFsbENvb2tpZXMpOgorCiAyMDExLTEx LTI5ICBSb2xhbmQgU3RlaW5lciAgPHJvbGFuZHN0ZWluZXJAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIDxzdHlsZSBzY29wZWQ+OiBhZGQgRU5BQkxFKFNUWUxFX1NDT1BFRCkgZmxhZyB0byBXZWJL aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29r aWVKYXJTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29r aWVKYXJTb3VwLmNwcAppbmRleCBmNzNhNjE2MzgyOGFhM2E1NjlmZDEzYzg0OGM1ZjBjZTAwOTFh NGJhLi5lZjU2NTJhYzE5YTdjMTNjNGQ0OGE0ZTk0YTExNmU5M2RlMDM4ZTAzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nvb2tpZUphclNvdXAu Y3BwCkBAIC0xMjQsMTcgKzEyNCw0MiBAQCB2b2lkIGRlbGV0ZUNvb2tpZShjb25zdCBEb2N1bWVu dCosIGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmKQogCiB2b2lkIGdldEhvc3RuYW1lc1dpdGhD b29raWVzKEhhc2hTZXQ8U3RyaW5nPiYgaG9zdG5hbWVzKQogewotICAgIC8vIEZJWE1FOiBOb3Qg eWV0IGltcGxlbWVudGVkCisgICAgU291cENvb2tpZUphciogY29va2llSmFyID0gV2ViQ29yZTo6 ZGVmYXVsdENvb2tpZUphcigpOworICAgIEdTTGlzdCogY29va2llcyA9IHNvdXBfY29va2llX2ph cl9hbGxfY29va2llcyhjb29raWVKYXIpOworICAgIGZvciAoR1NMaXN0KiBpdGVtID0gY29va2ll czsgaXRlbTsgaXRlbSA9IGl0ZW0tPm5leHQpIHsKKyAgICAgICAgU291cENvb2tpZSogc291cENv b2tpZSA9IHN0YXRpY19jYXN0PFNvdXBDb29raWUqPihpdGVtLT5kYXRhKTsKKyAgICAgICAgY2hh ciogZG9tYWluID0gY29uc3RfY2FzdDxjaGFyKj4oc291cF9jb29raWVfZ2V0X2RvbWFpbihzb3Vw Q29va2llKSk7CisgICAgICAgIGlmIChkb21haW4pCisgICAgICAgICAgICBob3N0bmFtZXMuYWRk KGRvbWFpbik7CisgICAgfQorCisgICAgc291cF9jb29raWVzX2ZyZWUoY29va2llcyk7CiB9CiAK IHZvaWQgZGVsZXRlQ29va2llc0Zvckhvc3RuYW1lKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCiB7 Ci0gICAgLy8gRklYTUU6IE5vdCB5ZXQgaW1wbGVtZW50ZWQKKyAgICBDU3RyaW5nIGhvc3ROYW1l U3RyaW5nID0gaG9zdG5hbWUudXRmOCgpOworCisgICAgU291cENvb2tpZUphciogY29va2llSmFy ID0gV2ViQ29yZTo6ZGVmYXVsdENvb2tpZUphcigpOworICAgIEdTTGlzdCogY29va2llcyA9IHNv dXBfY29va2llX2phcl9hbGxfY29va2llcyhjb29raWVKYXIpOworICAgIGZvciAoR1NMaXN0KiBp dGVtID0gY29va2llczsgaXRlbTsgaXRlbSA9IGl0ZW0tPm5leHQpIHsKKyAgICAgICAgU291cENv b2tpZSogc291cENvb2tpZSA9IHN0YXRpY19jYXN0PFNvdXBDb29raWUqPihpdGVtLT5kYXRhKTsK KyAgICAgICAgY2hhciogZG9tYWluID0gY29uc3RfY2FzdDxjaGFyKj4oc291cF9jb29raWVfZ2V0 X2RvbWFpbihzb3VwQ29va2llKSk7CisgICAgICAgIGlmIChkb21haW4gJiYgZ19zdHJfZXF1YWwo ZG9tYWluLCBob3N0TmFtZVN0cmluZy5kYXRhKCkpKQorICAgICAgICAgICAgc291cF9jb29raWVf amFyX2RlbGV0ZV9jb29raWUoY29va2llSmFyLCBzb3VwQ29va2llKTsKKyAgICB9CisKKyAgICBz b3VwX2Nvb2tpZXNfZnJlZShjb29raWVzKTsKIH0KIAogdm9pZCBkZWxldGVBbGxDb29raWVzKCkK IHsKLSAgICAvLyBGSVhNRTogTm90IHlldCBpbXBsZW1lbnRlZAorICAgIFNvdXBDb29raWVKYXIq IGNvb2tpZUphciA9IFdlYkNvcmU6OmRlZmF1bHRDb29raWVKYXIoKTsKKyAgICBHU0xpc3QqIGNv b2tpZXMgPSBzb3VwX2Nvb2tpZV9qYXJfYWxsX2Nvb2tpZXMoY29va2llSmFyKTsKKyAgICBmb3Ig KEdTTGlzdCogaXRlbSA9IGNvb2tpZXM7IGl0ZW07IGl0ZW0gPSBpdGVtLT5uZXh0KQorICAgICAg ICBzb3VwX2Nvb2tpZV9qYXJfZGVsZXRlX2Nvb2tpZShjb29raWVKYXIsIHN0YXRpY19jYXN0PFNv dXBDb29raWUqPihpdGVtLT5kYXRhKSk7CisKKyAgICBzb3VwX2Nvb2tpZXNfZnJlZShjb29raWVz KTsKIH0KIAogfQo= 116957 2011-11-29 06:12:56 -0800 2011-11-30 03:08:05 -0800 Patch bug-72353-20111129231316.patch text/plain 2954 js45.yang U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNjYTY1YWE5YmYxZjkw OWJiNGY4ZWY5YjI5NTUyNTAyNGNlYzljNC4uNDAxNGViOGYzZGUwYmFkOWIzMGExZmE1NTdjZmUw MDY4ZTViMmUyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTExLTI4ICBKb25n c2VvayBZYW5nICA8anM0NS55YW5nQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtTT1VQXVtXSzJd IEltcGxlbWVudCB0aGUgZnVuY3Rpb25zIHRvIG1hbmFnZXIgY29va2llcyBpbiBDb29raWVKYXIg Zm9yIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcyMzUzCisKKyAgICAgICAgcjc5NzIyIGluc2VydGVkIHRoZSBmdW5jdGlvbnMgdG8gbWFu YW5nZSBjb29raWVzIGZyb20gd2ViIHByb2Nlc3MuCisgICAgICAgIChnZXRIb3N0bmFtZXNXaXRo Q29va2llcyxkZWxldGVDb29raWVzRm9ySG9zdG5hbWUsZGVsZXRlQWxsQ29va2llcykKKyAgICAg ICAgSW1wbGVtZW50IHRoZSBmdW5jdGlvbnMgZm9yIHNvdXAgbmV0d29yayBiYWNrZW5kLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9zb3VwL0Nvb2tpZUphclNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0SG9z dG5hbWVzV2l0aENvb2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlQ29va2llc0Zvckhv c3RuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OmRlbGV0ZUFsbENvb2tpZXMpOgorCiAyMDExLTEx LTI5ICBSb2xhbmQgU3RlaW5lciAgPHJvbGFuZHN0ZWluZXJAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIDxzdHlsZSBzY29wZWQ+OiBhZGQgRU5BQkxFKFNUWUxFX1NDT1BFRCkgZmxhZyB0byBXZWJL aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29r aWVKYXJTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29r aWVKYXJTb3VwLmNwcAppbmRleCBmNzNhNjE2MzgyOGFhM2E1NjlmZDEzYzg0OGM1ZjBjZTAwOTFh NGJhLi5mMTcwZDJkNTRlNzFiZjk2MGM2OWZlMjFjMjk2MTIyNDVhM2ZiOGM3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nvb2tpZUphclNvdXAu Y3BwCkBAIC0xMjQsMTcgKzEyNCw0MCBAQCB2b2lkIGRlbGV0ZUNvb2tpZShjb25zdCBEb2N1bWVu dCosIGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmKQogCiB2b2lkIGdldEhvc3RuYW1lc1dpdGhD b29raWVzKEhhc2hTZXQ8U3RyaW5nPiYgaG9zdG5hbWVzKQogewotICAgIC8vIEZJWE1FOiBOb3Qg eWV0IGltcGxlbWVudGVkCisgICAgU291cENvb2tpZUphciogY29va2llSmFyID0gV2ViQ29yZTo6 ZGVmYXVsdENvb2tpZUphcigpOworICAgIEdTTGlzdCogY29va2llcyA9IHNvdXBfY29va2llX2ph cl9hbGxfY29va2llcyhjb29raWVKYXIpOworICAgIGZvciAoR1NMaXN0KiBpdGVtID0gY29va2ll czsgaXRlbTsgaXRlbSA9IGl0ZW0tPm5leHQpIHsKKyAgICAgICAgU291cENvb2tpZSogc291cENv b2tpZSA9IHN0YXRpY19jYXN0PFNvdXBDb29raWUqPihpdGVtLT5kYXRhKTsKKyAgICAgICAgaWYg KGNoYXIqIGRvbWFpbiA9IGNvbnN0X2Nhc3Q8Y2hhcio+KHNvdXBfY29va2llX2dldF9kb21haW4o c291cENvb2tpZSkpKQorICAgICAgICAgICAgaG9zdG5hbWVzLmFkZChTdHJpbmc6OmZyb21VVEY4 KGRvbWFpbikpOworICAgIH0KKworICAgIHNvdXBfY29va2llc19mcmVlKGNvb2tpZXMpOwogfQog CiB2b2lkIGRlbGV0ZUNvb2tpZXNGb3JIb3N0bmFtZShjb25zdCBTdHJpbmcmIGhvc3RuYW1lKQog ewotICAgIC8vIEZJWE1FOiBOb3QgeWV0IGltcGxlbWVudGVkCisgICAgQ1N0cmluZyBob3N0TmFt ZVN0cmluZyA9IGhvc3RuYW1lLnV0ZjgoKTsKKworICAgIFNvdXBDb29raWVKYXIqIGNvb2tpZUph ciA9IFdlYkNvcmU6OmRlZmF1bHRDb29raWVKYXIoKTsKKyAgICBHU0xpc3QqIGNvb2tpZXMgPSBz b3VwX2Nvb2tpZV9qYXJfYWxsX2Nvb2tpZXMoY29va2llSmFyKTsKKyAgICBmb3IgKEdTTGlzdCog aXRlbSA9IGNvb2tpZXM7IGl0ZW07IGl0ZW0gPSBpdGVtLT5uZXh0KSB7CisgICAgICAgIFNvdXBD b29raWUqIHNvdXBDb29raWUgPSBzdGF0aWNfY2FzdDxTb3VwQ29va2llKj4oaXRlbS0+ZGF0YSk7 CisgICAgICAgIGlmIChob3N0TmFtZVN0cmluZyA9PSBzb3VwX2Nvb2tpZV9nZXRfZG9tYWluKHNv dXBDb29raWUpKQorICAgICAgICAgICAgc291cF9jb29raWVfamFyX2RlbGV0ZV9jb29raWUoY29v a2llSmFyLCBzb3VwQ29va2llKTsKKyAgICB9CisKKyAgICBzb3VwX2Nvb2tpZXNfZnJlZShjb29r aWVzKTsKIH0KIAogdm9pZCBkZWxldGVBbGxDb29raWVzKCkKIHsKLSAgICAvLyBGSVhNRTogTm90 IHlldCBpbXBsZW1lbnRlZAorICAgIFNvdXBDb29raWVKYXIqIGNvb2tpZUphciA9IFdlYkNvcmU6 OmRlZmF1bHRDb29raWVKYXIoKTsKKyAgICBHU0xpc3QqIGNvb2tpZXMgPSBzb3VwX2Nvb2tpZV9q YXJfYWxsX2Nvb2tpZXMoY29va2llSmFyKTsKKyAgICBmb3IgKEdTTGlzdCogaXRlbSA9IGNvb2tp ZXM7IGl0ZW07IGl0ZW0gPSBpdGVtLT5uZXh0KQorICAgICAgICBzb3VwX2Nvb2tpZV9qYXJfZGVs ZXRlX2Nvb2tpZShjb29raWVKYXIsIHN0YXRpY19jYXN0PFNvdXBDb29raWUqPihpdGVtLT5kYXRh KSk7CisKKyAgICBzb3VwX2Nvb2tpZXNfZnJlZShjb29raWVzKTsKIH0KIAogfQo=