125576 2013-12-11 07:24:16 -0800 [WK2][SOUP] Fix handling of cookies when network process is enabled 2013-12-28 02:14:37 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108832 1 skyul skyul brian.holt cgarcia commit-queue gustavo mrobinson ossy svillar oldest_to_newest 958711 0 skyul 2013-12-11 07:24:16 -0800 Initialize the network process with cookie accept policy, persistent storage path and type. Use WebContext::sendToNetworkingProcessRelaunchingIfNecessary instead of WebContext::sendToAllProcessesRelaunchingThemIfNecessary to send SetCookiePersistentStorage message. 958712 1 218962 skyul 2013-12-11 07:26:20 -0800 Created attachment 218962 Patch 958713 2 commit-queue 2013-12-11 07:27:14 -0800 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 958715 3 218963 skyul 2013-12-11 07:30:00 -0800 Created attachment 218963 Patch 958719 4 skyul 2013-12-11 07:37:22 -0800 Unfortunately, TestCookieManager.cpp: still fails: TEST: ./Tools/gtk/../../WebKitBuild/Release/Programs/WebKit2APITests/TestCookieManager... (pid=31499) ** ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp:191:void testCookieManagerAcceptPolicy(CookieManagerTest*, gconstpointer): assertion failed (g_strv_length(domains) == 2): (1 == 2) Further investigation shows that: g_assert(test->hasDomain(kFirstPartyDomain)) -> fail g_assert(test->hasDomain(kThirdPartyDomain)) -> pass It seems the test becomes flaky because we can pass testCookieManagerAcceptPolicy by simply reordering the test sequence by moving WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS case to the first. 963162 5 218963 cgarcia 2013-12-28 01:47:37 -0800 Comment on attachment 218963 Patch I've tried it here locally and it works for me: $ Programs/WebKit2APITests/TestCookieManager /webkit2/WebKitCookieManager/accept-policy: OK /webkit2/WebKitCookieManager/delete-cookies: OK /webkit2/WebKitCookieManager/cookies-changed: OK /webkit2/WebKitCookieManager/persistent-storage: OK $ WEBKIT_USE_NETWORK_PROCESS=1 Programs/WebKit2APITests/TestCookieManager /webkit2/WebKitCookieManager/accept-policy: OK /webkit2/WebKitCookieManager/delete-cookies: OK /webkit2/WebKitCookieManager/cookies-changed: OK /webkit2/WebKitCookieManager/persistent-storage: OK 963163 6 218963 commit-queue 2013-12-28 02:14:34 -0800 Comment on attachment 218963 Patch Clearing flags on attachment: 218963 Committed r161112: <http://trac.webkit.org/changeset/161112> 963164 7 commit-queue 2013-12-28 02:14:37 -0800 All reviewed patches have been landed. Closing bug. 218962 2013-12-11 07:26:20 -0800 2013-12-11 07:29:56 -0800 Patch bug-125576-20131212002616.patch text/plain 11134 skyul U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwNDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjcyNmM5NmVjNWFiYzE2 NWFkMmVhMDg4ZjJjODlmYTQ1OWNjYTU1MC4uOTBhMGJkOWI3MDgyYjAzNjgzOTQ3NWY2ZjMwZTYx NmM1NDAwMWQ4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEzLTEyLTExICBLd2Fu ZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+CiAKKyAgICAgICAgW1dLMl1bU09VUF0g Rml4IGhhbmRsaW5nIG9mIGNvb2tpZXMgd2hlbiBuZXR3b3JrIHByb2Nlc3MgaXMgZW5hYmxlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NTc2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5pdGlhbGl6 ZSB0aGUgbmV0d29yayBwcm9jZXNzIHdpdGggY29va2llIGFjY2VwdCBwb2xpY3ksIHBlcnNpc3Rl bnQKKyAgICAgICAgc3RvcmFnZSBwYXRoIGFuZCB0eXBlLiBVc2UKKyAgICAgICAgV2ViQ29udGV4 dDo6c2VuZFRvTmV0d29ya2luZ1Byb2Nlc3NSZWxhdW5jaGluZ0lmTmVjZXNzYXJ5IGluc3RlYWQg b2YKKyAgICAgICAgV2ViQ29udGV4dDo6c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVt SWZOZWNlc3NhcnkgdG8gc2VuZAorICAgICAgICBTZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZSBt ZXNzYWdlLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc1Nv dXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs aXplTmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdvcmtQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9OZXR3 b3JrL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9j ZXNzL3NvdXAvV2ViQ29udGV4dFNvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0 OjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNz L3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkNvb2tpZU1hbmFnZXJQcm94eTo6c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UpOgorICAgICAg ICAqIFdlYlByb2Nlc3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorCisyMDEzLTEyLTEx ICBLd2FuZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+CisKICAgICAgICAgW1dLMl1b U09VUF0gV2ViQ29udGV4dDo6YWxsb3dTcGVjaWZpY0hUVFBTQ2VydGlmaWNhdGVGb3JIb3N0IGRv ZXMgbm90IHdvcmsgY29ycmVjdGx5IHdoZW4gbV91c2VzTmV0d29ya1Byb2Nlc3MgaXMgZmFsc2UK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTU2NAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtQ cm9jZXNzU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdv cmtQcm9jZXNzU291cC5jcHAKaW5kZXggZmIxZjY3NDJlMTg3YmQ5ZjlhZjY2ZDQ3NDNlNGYyZjI2 YmVhNjkzMy4uNmQ3Y2Y5NzNlNzBhZDcyMDJhZjQxMGY3MmJhMjdiMGRlZmYyNTc0NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc1Nv dXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1By b2Nlc3NTb3VwLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkNlcnRpZmljYXRlSW5m by5oIgogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjaW5j bHVkZSAiUmVzb3VyY2VDYWNoZXNUb0NsZWFyLmgiCisjaW5jbHVkZSAiV2ViQ29va2llTWFuYWdl ci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPFdlYkNvcmUv Tm90SW1wbGVtZW50ZWQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CkBA IC04MCw2ICs4MSwxMiBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVO ZXR3b3JrUHJvY2Vzcyhjb25zdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aQogICAgIHNvdXBfc2Vzc2lv bl9hZGRfZmVhdHVyZShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGVmYXVsdFNlc3Npb24oKSwg U09VUF9TRVNTSU9OX0ZFQVRVUkUoc291cENhY2hlLmdldCgpKSk7CiAgICAgc291cF9jYWNoZV9s b2FkKHNvdXBDYWNoZS5nZXQoKSk7CiAKKyAgICBpZiAoIXBhcmFtZXRlcnMuY29va2llUGVyc2lz dGVudFN0b3JhZ2VQYXRoLmlzRW1wdHkoKSkgeworICAgICAgICBzdXBwbGVtZW50PFdlYkNvb2tp ZU1hbmFnZXI+KCktPnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKHBhcmFtZXRlcnMuY29va2ll UGVyc2lzdGVudFN0b3JhZ2VQYXRoLAorICAgICAgICAgICAgcGFyYW1ldGVycy5jb29raWVQZXJz aXN0ZW50U3RvcmFnZVR5cGUpOworICAgIH0KKyAgICBzdXBwbGVtZW50PFdlYkNvb2tpZU1hbmFn ZXI+KCktPnNldEhUVFBDb29raWVBY2NlcHRQb2xpY3kocGFyYW1ldGVycy5jb29raWVBY2NlcHRQ b2xpY3kpOworCiAgICAgc2V0SWdub3JlVExTRXJyb3JzKHBhcmFtZXRlcnMuaWdub3JlVExTRXJy b3JzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0 d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IDM3MmFl ZTZiNmM1YTg1Y2RiZTMwOWJhNzY0NTQyYWFlN2NkMzM1Y2IuLmQxZWJmYzdlMDM3MTg4ZGNhNmZm MWE2ZWMzMjk0OWIxYWUxYjdjY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9O ZXR3b3JrL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5j cHAKQEAgLTU1LDYgKzU1LDkgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy czo6ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikKICAgICBlbmNvZGVy IDw8IGh0dHBzUHJveHk7CiAjZW5kaWYKICNpZiBVU0UoU09VUCkKKyAgICBlbmNvZGVyIDw8IGNv b2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aDsKKyAgICBlbmNvZGVyIDw8IGNvb2tpZVBlcnNpc3Rl bnRTdG9yYWdlVHlwZTsKKyAgICBlbmNvZGVyLmVuY29kZUVudW0oY29va2llQWNjZXB0UG9saWN5 KTsKICAgICBlbmNvZGVyIDw8IGlnbm9yZVRMU0Vycm9yczsKICNlbmRpZgogfQpAQCAtOTEsNiAr OTQsMTIgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKENv cmVJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwKICNlbmRpZgogCiAjaWYgVVNFKFNPVVAp CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuY29va2llUGVyc2lzdGVudFN0b3JhZ2VQ YXRoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVz dWx0LmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICBpZiAoIWRlY29kZXIuZGVjb2RlRW51bShyZXN1bHQuY29va2llQWNjZXB0UG9saWN5KSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lmln bm9yZVRMU0Vycm9ycykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggZDg3OWJjYWM5Y2VlNmU4MTZjOGVkNjdkYTNiYjJj NmMwMjI4MzcxMy4uNjQyOTA1MjVjZDI2ZjlkY2UzNmY1Y2IxMTQ5MzcxZDFiMzJiYjRjZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3 b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0zMyw2ICszMywxMCBAQAogI2luY2x1 ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAorI2lm IFVTRShTT1VQKQorI2luY2x1ZGUgIkhUVFBDb29raWVBY2NlcHRQb2xpY3kuaCIKKyNlbmRpZgor CiBuYW1lc3BhY2UgQ29yZUlQQyB7CiAgICAgY2xhc3MgQXJndW1lbnREZWNvZGVyOwogICAgIGNs YXNzIEFyZ3VtZW50RW5jb2RlcjsKQEAgLTY5LDYgKzczLDkgQEAgc3RydWN0IE5ldHdvcmtQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICNlbmRpZgogCiAjaWYgVVNFKFNPVVApCisgICAgU3Ry aW5nIGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aDsKKyAgICB1aW50MzJfdCBjb29raWVQZXJz aXN0ZW50U3RvcmFnZVR5cGU7CisgICAgSFRUUENvb2tpZUFjY2VwdFBvbGljeSBjb29raWVBY2Nl cHRQb2xpY3k7CiAgICAgYm9vbCBpZ25vcmVUTFNFcnJvcnM7CiAjZW5kaWYKIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0Q29va2llTWFu YWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0Q29v a2llTWFuYWdlci5jcHAKaW5kZXggYWRjNmI1YjliYWZjMDE0Mjc2M2EwNGE1Njc1ODVhZjdmOTAz NThiZS4uZDQ4OTVhMTZjNmJkNWM5ZGZjNzJhZTIzY2NlMDA3ZjJmNDAzMmM3MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdENvb2tpZU1hbmFn ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RD b29raWVNYW5hZ2VyLmNwcApAQCAtMTgxLDIzICsxODEsMjkgQEAgc3RhdGljIHZvaWQgdGVzdENv b2tpZU1hbmFnZXJBY2NlcHRQb2xpY3koQ29va2llTWFuYWdlclRlc3QqIHRlc3QsIGdjb25zdHBv aW50ZXIKICAgICBnX2Fzc2VydF9jbXBpbnQoZ19zdHJ2X2xlbmd0aChkb21haW5zKSwgPT0sIDEp OwogICAgIGdfYXNzZXJ0X2NtcHN0cihkb21haW5zWzBdLCA9PSwga0ZpcnN0UGFydHlEb21haW4p OwogICAgIHRlc3QtPmRlbGV0ZUFsbENvb2tpZXMoKTsKK30KIAorc3RhdGljIHZvaWQgdGVzdENv b2tpZU1hbmFnZXJBY2NlcHRQb2xpY3kyKENvb2tpZU1hbmFnZXJUZXN0KiB0ZXN0LCBnY29uc3Rw b2ludGVyKQorewogICAgIHRlc3QtPnNldEFjY2VwdFBvbGljeShXRUJLSVRfQ09PS0lFX1BPTElD WV9BQ0NFUFRfQUxXQVlTKTsKICAgICBnX2Fzc2VydF9jbXBpbnQodGVzdC0+Z2V0QWNjZXB0UG9s aWN5KCksID09LCBXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfQUxXQVlTKTsKICAgICB0ZXN0 LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9pbmRleC5odG1sIikuZGF0YSgpKTsK ICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKLSAgICBkb21haW5zID0gdGVzdC0+ Z2V0RG9tYWlucygpOworICAgIGNoYXIqKiBkb21haW5zID0gdGVzdC0+Z2V0RG9tYWlucygpOwog ICAgIGdfYXNzZXJ0KGRvbWFpbnMpOwogICAgIGdfYXNzZXJ0X2NtcGludChnX3N0cnZfbGVuZ3Ro KGRvbWFpbnMpLCA9PSwgMik7CiAgICAgZ19hc3NlcnQodGVzdC0+aGFzRG9tYWluKGtGaXJzdFBh cnR5RG9tYWluKSk7CiAgICAgZ19hc3NlcnQodGVzdC0+aGFzRG9tYWluKGtUaGlyZFBhcnR5RG9t YWluKSk7CiAgICAgdGVzdC0+ZGVsZXRlQWxsQ29va2llcygpOworfQogCitzdGF0aWMgdm9pZCB0 ZXN0Q29va2llTWFuYWdlckFjY2VwdFBvbGljeTMoQ29va2llTWFuYWdlclRlc3QqIHRlc3QsIGdj b25zdHBvaW50ZXIpCit7CiAgICAgdGVzdC0+c2V0QWNjZXB0UG9saWN5KFdFQktJVF9DT09LSUVf UE9MSUNZX0FDQ0VQVF9ORVZFUik7CiAgICAgZ19hc3NlcnRfY21waW50KHRlc3QtPmdldEFjY2Vw dFBvbGljeSgpLCA9PSwgV0VCS0lUX0NPT0tJRV9QT0xJQ1lfQUNDRVBUX05FVkVSKTsKICAgICB0 ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9pbmRleC5odG1sIikuZGF0YSgp KTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKLSAgICBkb21haW5zID0gdGVz dC0+Z2V0RG9tYWlucygpOworICAgIGNoYXIqKiBkb21haW5zID0gdGVzdC0+Z2V0RG9tYWlucygp OwogICAgIGdfYXNzZXJ0KGRvbWFpbnMpOwogICAgIGdfYXNzZXJ0X2NtcGludChnX3N0cnZfbGVu Z3RoKGRvbWFpbnMpLCA9PSwgMCk7CiB9CkBAIC0zMTksNiArMzI1LDggQEAgdm9pZCBiZWZvcmVB bGwoKQogICAgIGdfYXNzZXJ0KGtUZW1wRGlyZWN0b3J5KTsKIAogICAgIENvb2tpZU1hbmFnZXJU ZXN0OjphZGQoIldlYktpdENvb2tpZU1hbmFnZXIiLCAiYWNjZXB0LXBvbGljeSIsIHRlc3RDb29r aWVNYW5hZ2VyQWNjZXB0UG9saWN5KTsKKyAgICBDb29raWVNYW5hZ2VyVGVzdDo6YWRkKCJXZWJL aXRDb29raWVNYW5hZ2VyIiwgImFjY2VwdC1wb2xpY3kyIiwgdGVzdENvb2tpZU1hbmFnZXJBY2Nl cHRQb2xpY3kyKTsKKyAgICBDb29raWVNYW5hZ2VyVGVzdDo6YWRkKCJXZWJLaXRDb29raWVNYW5h Z2VyIiwgImFjY2VwdC1wb2xpY3kzIiwgdGVzdENvb2tpZU1hbmFnZXJBY2NlcHRQb2xpY3kzKTsK ICAgICBDb29raWVNYW5hZ2VyVGVzdDo6YWRkKCJXZWJLaXRDb29raWVNYW5hZ2VyIiwgImRlbGV0 ZS1jb29raWVzIiwgdGVzdENvb2tpZU1hbmFnZXJEZWxldGVDb29raWVzKTsKICAgICBDb29raWVN YW5hZ2VyVGVzdDo6YWRkKCJXZWJLaXRDb29raWVNYW5hZ2VyIiwgImNvb2tpZXMtY2hhbmdlZCIs IHRlc3RDb29raWVNYW5hZ2VyQ29va2llc0NoYW5nZWQpOwogICAgIENvb2tpZU1hbmFnZXJUZXN0 OjphZGQoIldlYktpdENvb2tpZU1hbmFnZXIiLCAicGVyc2lzdGVudC1zdG9yYWdlIiwgdGVzdENv b2tpZU1hbmFnZXJQZXJzaXN0ZW50U3RvcmFnZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3Mvc291cC9XZWJDb250ZXh0U291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3Mvc291cC9XZWJDb250ZXh0U291cC5jcHAKaW5kZXggOWRmZGU1ZWNkMjAwZmM3YzIzYWMz NjhlN2E3NTY3ODM0ZGU1OTc4My4uODgxYzAzNDk0ZDYwNjdjNDEyZmExYzM4YTZlOTYxZGY3Njdl NzkyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NvdXAvV2ViQ29udGV4 dFNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9zb3VwL1dlYkNvbnRleHRT b3VwLmNwcApAQCAtMjgsMTEgKzI4LDE0IEBACiAjaW5jbHVkZSAiV2ViQ29udGV4dC5oIgogCiAj aW5jbHVkZSAiTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaCIKKyNpbmNsdWRlICJX ZWJDb29raWVNYW5hZ2VyUHJveHkuaCIKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKIHZvaWQgV2Vi Q29udGV4dDo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3MoTmV0d29ya1Byb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CisgICAgc3VwcGxlbWVudDxXZWJDb29r aWVNYW5hZ2VyUHJveHk+KCktPmdldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKHBhcmFtZXRlcnMu Y29va2llUGVyc2lzdGVudFN0b3JhZ2VQYXRoLCBwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRT dG9yYWdlVHlwZSk7CisgICAgcGFyYW1ldGVycy5jb29raWVBY2NlcHRQb2xpY3kgPSBtX2luaXRp YWxIVFRQQ29va2llQWNjZXB0UG9saWN5OwogICAgIHBhcmFtZXRlcnMuaWdub3JlVExTRXJyb3Jz ID0gbV9pZ25vcmVUTFNFcnJvcnM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9zb3VwL1dlYkNvb2tpZU1hbmFnZXJQcm94eVNvdXAuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHAKaW5kZXggZjk2 NGU0OTgxNjUzMTYzM2JhNDlmZTg3MmE2ODM2ZjVkZGY4NDIxNC4uNDU3ZTAzNzBmODNkMmZiMjlj NjgwNGZlZDNiOTFlNzJiY2M0MzJiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHAKQEAgLTMzLDcg KzMzLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHZvaWQgV2ViQ29va2llTWFuYWdlclByb3h5 OjpzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShjb25zdCBTdHJpbmcmIHN0b3JhZ2VQYXRoLCB1 aW50MzJfdCBzdG9yYWdlVHlwZSkKIHsKLSAgICBjb250ZXh0KCktPnNlbmRUb0FsbFByb2Nlc3Nl c1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJDb29raWVNYW5hZ2VyOjpT ZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShzdG9yYWdlUGF0aCwgc3RvcmFnZVR5cGUpKTsKKyAg ICBjb250ZXh0KCktPnNlbmRUb05ldHdvcmtpbmdQcm9jZXNzUmVsYXVuY2hpbmdJZk5lY2Vzc2Fy eShNZXNzYWdlczo6V2ViQ29va2llTWFuYWdlcjo6U2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2Uo c3RvcmFnZVBhdGgsIHN0b3JhZ2VUeXBlKSk7CiAKICAgICBtX2Nvb2tpZVBlcnNpc3RlbnRTdG9y YWdlUGF0aCA9IHN0b3JhZ2VQYXRoOwogICAgIG1fY29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBl ID0gc3RhdGljX2Nhc3Q8U291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZT4oc3RvcmFnZVR5 cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nl c3NTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9XZWJQcm9jZXNzU291 cC5jcHAKaW5kZXggMzNjYzUyMWY0NGQxOTYxMmU1YjY4OWRmNTcyZTRjYmIxZDdhYmNmMy4uYjMw MzdmNWYwMzA0ZmViMDU1Yjc1YmY1NTUwMTEyOWUzZTViNzMzMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1NvdXAuY3BwCkBAIC0yMDUsNiArMjA1 LDEyIEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyhjb25z dCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzCiAgICAgICAgIEdSZWZQdHI8U291cENhY2hl PiBzb3VwQ2FjaGUgPSBhZG9wdEdSZWYoc291cF9jYWNoZV9uZXcocGFyYW1ldGVycy5kaXNrQ2Fj aGVEaXJlY3RvcnkudXRmOCgpLmRhdGEoKSwgU09VUF9DQUNIRV9TSU5HTEVfVVNFUikpOwogICAg ICAgICBzb3VwX3Nlc3Npb25fYWRkX2ZlYXR1cmUoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmRl ZmF1bHRTZXNzaW9uKCksIFNPVVBfU0VTU0lPTl9GRUFUVVJFKHNvdXBDYWNoZS5nZXQoKSkpOwog ICAgICAgICBzb3VwX2NhY2hlX2xvYWQoc291cENhY2hlLmdldCgpKTsKKworICAgICAgICBpZiAo IXBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VQYXRoLmlzRW1wdHkoKSkgeworICAg ICAgICAgICAgc3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigpLT5zZXRDb29raWVQZXJzaXN0 ZW50U3RvcmFnZShwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aCwKKyAgICAg ICAgICAgICAgICBwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSk7CisgICAg ICAgIH0KKyAgICAgICAgc3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigpLT5zZXRIVFRQQ29v a2llQWNjZXB0UG9saWN5KHBhcmFtZXRlcnMuY29va2llQWNjZXB0UG9saWN5KTsKICNpZiBFTkFC TEUoTkVUV09SS19QUk9DRVNTKQogICAgIH0KICNlbmRpZgpAQCAtMjE0LDEyICsyMjAsNiBAQCB2 b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoY29uc3QgV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcGFyYW1l dGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZC5zaXplKCk7IGkrKykKICAgICAgICAgc3VwcGxlbWVu dDxXZWJTb3VwUmVxdWVzdE1hbmFnZXI+KCktPnJlZ2lzdGVyVVJJU2NoZW1lKHBhcmFtZXRlcnMu dXJsU2NoZW1lc1JlZ2lzdGVyZWRbaV0pOwogCi0gICAgaWYgKCFwYXJhbWV0ZXJzLmNvb2tpZVBl cnNpc3RlbnRTdG9yYWdlUGF0aC5pc0VtcHR5KCkpIHsKLSAgICAgICAgc3VwcGxlbWVudDxXZWJD b29raWVNYW5hZ2VyPigpLT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShwYXJhbWV0ZXJzLmNv b2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aCwKLSAgICAgICAgICAgIHBhcmFtZXRlcnMuY29va2ll UGVyc2lzdGVudFN0b3JhZ2VUeXBlKTsKLSAgICB9Ci0gICAgc3VwcGxlbWVudDxXZWJDb29raWVN YW5hZ2VyPigpLT5zZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KHBhcmFtZXRlcnMuY29va2llQWNj ZXB0UG9saWN5KTsKLQogICAgIHNldElnbm9yZVRMU0Vycm9ycyhwYXJhbWV0ZXJzLmlnbm9yZVRM U0Vycm9ycyk7CiAKICAgICBXZWJDb3JlOjphZGRMYW5ndWFnZUNoYW5nZU9ic2VydmVyKHRoaXMs IGxhbmd1YWdlQ2hhbmdlZCk7Cg== 218963 2013-12-11 07:30:00 -0800 2013-12-28 02:14:34 -0800 Patch bug-125576-20131212002957.patch text/plain 8701 skyul U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwNDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjcyNmM5NmVjNWFiYzE2 NWFkMmVhMDg4ZjJjODlmYTQ1OWNjYTU1MC4uOTBhMGJkOWI3MDgyYjAzNjgzOTQ3NWY2ZjMwZTYx NmM1NDAwMWQ4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEzLTEyLTExICBLd2Fu ZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+CiAKKyAgICAgICAgW1dLMl1bU09VUF0g Rml4IGhhbmRsaW5nIG9mIGNvb2tpZXMgd2hlbiBuZXR3b3JrIHByb2Nlc3MgaXMgZW5hYmxlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NTc2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5pdGlhbGl6 ZSB0aGUgbmV0d29yayBwcm9jZXNzIHdpdGggY29va2llIGFjY2VwdCBwb2xpY3ksIHBlcnNpc3Rl bnQKKyAgICAgICAgc3RvcmFnZSBwYXRoIGFuZCB0eXBlLiBVc2UKKyAgICAgICAgV2ViQ29udGV4 dDo6c2VuZFRvTmV0d29ya2luZ1Byb2Nlc3NSZWxhdW5jaGluZ0lmTmVjZXNzYXJ5IGluc3RlYWQg b2YKKyAgICAgICAgV2ViQ29udGV4dDo6c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVt SWZOZWNlc3NhcnkgdG8gc2VuZAorICAgICAgICBTZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZSBt ZXNzYWdlLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc1Nv dXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs aXplTmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdvcmtQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9OZXR3 b3JrL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9j ZXNzL3NvdXAvV2ViQ29udGV4dFNvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0 OjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNz L3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkNvb2tpZU1hbmFnZXJQcm94eTo6c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UpOgorICAgICAg ICAqIFdlYlByb2Nlc3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorCisyMDEzLTEyLTEx ICBLd2FuZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+CisKICAgICAgICAgW1dLMl1b U09VUF0gV2ViQ29udGV4dDo6YWxsb3dTcGVjaWZpY0hUVFBTQ2VydGlmaWNhdGVGb3JIb3N0IGRv ZXMgbm90IHdvcmsgY29ycmVjdGx5IHdoZW4gbV91c2VzTmV0d29ya1Byb2Nlc3MgaXMgZmFsc2UK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTU2NAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtQ cm9jZXNzU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdv cmtQcm9jZXNzU291cC5jcHAKaW5kZXggZmIxZjY3NDJlMTg3YmQ5ZjlhZjY2ZDQ3NDNlNGYyZjI2 YmVhNjkzMy4uNmQ3Y2Y5NzNlNzBhZDcyMDJhZjQxMGY3MmJhMjdiMGRlZmYyNTc0NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc1Nv dXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1By b2Nlc3NTb3VwLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkNlcnRpZmljYXRlSW5m by5oIgogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjaW5j bHVkZSAiUmVzb3VyY2VDYWNoZXNUb0NsZWFyLmgiCisjaW5jbHVkZSAiV2ViQ29va2llTWFuYWdl ci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPFdlYkNvcmUv Tm90SW1wbGVtZW50ZWQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CkBA IC04MCw2ICs4MSwxMiBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVO ZXR3b3JrUHJvY2Vzcyhjb25zdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aQogICAgIHNvdXBfc2Vzc2lv bl9hZGRfZmVhdHVyZShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGVmYXVsdFNlc3Npb24oKSwg U09VUF9TRVNTSU9OX0ZFQVRVUkUoc291cENhY2hlLmdldCgpKSk7CiAgICAgc291cF9jYWNoZV9s b2FkKHNvdXBDYWNoZS5nZXQoKSk7CiAKKyAgICBpZiAoIXBhcmFtZXRlcnMuY29va2llUGVyc2lz dGVudFN0b3JhZ2VQYXRoLmlzRW1wdHkoKSkgeworICAgICAgICBzdXBwbGVtZW50PFdlYkNvb2tp ZU1hbmFnZXI+KCktPnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKHBhcmFtZXRlcnMuY29va2ll UGVyc2lzdGVudFN0b3JhZ2VQYXRoLAorICAgICAgICAgICAgcGFyYW1ldGVycy5jb29raWVQZXJz aXN0ZW50U3RvcmFnZVR5cGUpOworICAgIH0KKyAgICBzdXBwbGVtZW50PFdlYkNvb2tpZU1hbmFn ZXI+KCktPnNldEhUVFBDb29raWVBY2NlcHRQb2xpY3kocGFyYW1ldGVycy5jb29raWVBY2NlcHRQ b2xpY3kpOworCiAgICAgc2V0SWdub3JlVExTRXJyb3JzKHBhcmFtZXRlcnMuaWdub3JlVExTRXJy b3JzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0 d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IDM3MmFl ZTZiNmM1YTg1Y2RiZTMwOWJhNzY0NTQyYWFlN2NkMzM1Y2IuLmQxZWJmYzdlMDM3MTg4ZGNhNmZm MWE2ZWMzMjk0OWIxYWUxYjdjY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9O ZXR3b3JrL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5j cHAKQEAgLTU1LDYgKzU1LDkgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy czo6ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikKICAgICBlbmNvZGVy IDw8IGh0dHBzUHJveHk7CiAjZW5kaWYKICNpZiBVU0UoU09VUCkKKyAgICBlbmNvZGVyIDw8IGNv b2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aDsKKyAgICBlbmNvZGVyIDw8IGNvb2tpZVBlcnNpc3Rl bnRTdG9yYWdlVHlwZTsKKyAgICBlbmNvZGVyLmVuY29kZUVudW0oY29va2llQWNjZXB0UG9saWN5 KTsKICAgICBlbmNvZGVyIDw8IGlnbm9yZVRMU0Vycm9yczsKICNlbmRpZgogfQpAQCAtOTEsNiAr OTQsMTIgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKENv cmVJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwKICNlbmRpZgogCiAjaWYgVVNFKFNPVVAp CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuY29va2llUGVyc2lzdGVudFN0b3JhZ2VQ YXRoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVz dWx0LmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICBpZiAoIWRlY29kZXIuZGVjb2RlRW51bShyZXN1bHQuY29va2llQWNjZXB0UG9saWN5KSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lmln bm9yZVRMU0Vycm9ycykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggZDg3OWJjYWM5Y2VlNmU4MTZjOGVkNjdkYTNiYjJj NmMwMjI4MzcxMy4uNjQyOTA1MjVjZDI2ZjlkY2UzNmY1Y2IxMTQ5MzcxZDFiMzJiYjRjZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3 b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0zMyw2ICszMywxMCBAQAogI2luY2x1 ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAorI2lm IFVTRShTT1VQKQorI2luY2x1ZGUgIkhUVFBDb29raWVBY2NlcHRQb2xpY3kuaCIKKyNlbmRpZgor CiBuYW1lc3BhY2UgQ29yZUlQQyB7CiAgICAgY2xhc3MgQXJndW1lbnREZWNvZGVyOwogICAgIGNs YXNzIEFyZ3VtZW50RW5jb2RlcjsKQEAgLTY5LDYgKzczLDkgQEAgc3RydWN0IE5ldHdvcmtQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICNlbmRpZgogCiAjaWYgVVNFKFNPVVApCisgICAgU3Ry aW5nIGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aDsKKyAgICB1aW50MzJfdCBjb29raWVQZXJz aXN0ZW50U3RvcmFnZVR5cGU7CisgICAgSFRUUENvb2tpZUFjY2VwdFBvbGljeSBjb29raWVBY2Nl cHRQb2xpY3k7CiAgICAgYm9vbCBpZ25vcmVUTFNFcnJvcnM7CiAjZW5kaWYKIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvc291cC9XZWJDb250ZXh0U291cC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvc291cC9XZWJDb250ZXh0U291cC5jcHAKaW5kZXggOWRm ZGU1ZWNkMjAwZmM3YzIzYWMzNjhlN2E3NTY3ODM0ZGU1OTc4My4uODgxYzAzNDk0ZDYwNjdjNDEy ZmExYzM4YTZlOTYxZGY3NjdlNzkyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3NvdXAvV2ViQ29udGV4dFNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9zb3VwL1dlYkNvbnRleHRTb3VwLmNwcApAQCAtMjgsMTEgKzI4LDE0IEBACiAjaW5jbHVkZSAi V2ViQ29udGV4dC5oIgogCiAjaW5jbHVkZSAiTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuaCIKKyNpbmNsdWRlICJXZWJDb29raWVNYW5hZ2VyUHJveHkuaCIKIAogbmFtZXNwYWNlIFdl YktpdCB7CiAKIHZvaWQgV2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nl c3MoTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CisgICAg c3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyUHJveHk+KCktPmdldENvb2tpZVBlcnNpc3RlbnRT dG9yYWdlKHBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VQYXRoLCBwYXJhbWV0ZXJz LmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSk7CisgICAgcGFyYW1ldGVycy5jb29raWVBY2Nl cHRQb2xpY3kgPSBtX2luaXRpYWxIVFRQQ29va2llQWNjZXB0UG9saWN5OwogICAgIHBhcmFtZXRl cnMuaWdub3JlVExTRXJyb3JzID0gbV9pZ25vcmVUTFNFcnJvcnM7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9zb3VwL1dlYkNvb2tpZU1hbmFnZXJQcm94eVNvdXAu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5 U291cC5jcHAKaW5kZXggZjk2NGU0OTgxNjUzMTYzM2JhNDlmZTg3MmE2ODM2ZjVkZGY4NDIxNC4u NDU3ZTAzNzBmODNkMmZiMjljNjgwNGZlZDNiOTFlNzJiY2M0MzJiZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5 U291cC5jcHAKQEAgLTMzLDcgKzMzLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHZvaWQgV2Vi Q29va2llTWFuYWdlclByb3h5OjpzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShjb25zdCBTdHJp bmcmIHN0b3JhZ2VQYXRoLCB1aW50MzJfdCBzdG9yYWdlVHlwZSkKIHsKLSAgICBjb250ZXh0KCkt PnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpX ZWJDb29raWVNYW5hZ2VyOjpTZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShzdG9yYWdlUGF0aCwg c3RvcmFnZVR5cGUpKTsKKyAgICBjb250ZXh0KCktPnNlbmRUb05ldHdvcmtpbmdQcm9jZXNzUmVs YXVuY2hpbmdJZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViQ29va2llTWFuYWdlcjo6U2V0Q29va2ll UGVyc2lzdGVudFN0b3JhZ2Uoc3RvcmFnZVBhdGgsIHN0b3JhZ2VUeXBlKSk7CiAKICAgICBtX2Nv b2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aCA9IHN0b3JhZ2VQYXRoOwogICAgIG1fY29va2llUGVy c2lzdGVudFN0b3JhZ2VUeXBlID0gc3RhdGljX2Nhc3Q8U291cENvb2tpZVBlcnNpc3RlbnRTdG9y YWdlVHlwZT4oc3RvcmFnZVR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv c291cC9XZWJQcm9jZXNzU291cC5jcHAKaW5kZXggMzNjYzUyMWY0NGQxOTYxMmU1YjY4OWRmNTcy ZTRjYmIxZDdhYmNmMy4uYjMwMzdmNWYwMzA0ZmViMDU1Yjc1YmY1NTUwMTEyOWUzZTViNzMzMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3Vw LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1NvdXAu Y3BwCkBAIC0yMDUsNiArMjA1LDEyIEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs aXplV2ViUHJvY2Vzcyhjb25zdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzCiAgICAgICAg IEdSZWZQdHI8U291cENhY2hlPiBzb3VwQ2FjaGUgPSBhZG9wdEdSZWYoc291cF9jYWNoZV9uZXco cGFyYW1ldGVycy5kaXNrQ2FjaGVEaXJlY3RvcnkudXRmOCgpLmRhdGEoKSwgU09VUF9DQUNIRV9T SU5HTEVfVVNFUikpOwogICAgICAgICBzb3VwX3Nlc3Npb25fYWRkX2ZlYXR1cmUoV2ViQ29yZTo6 UmVzb3VyY2VIYW5kbGU6OmRlZmF1bHRTZXNzaW9uKCksIFNPVVBfU0VTU0lPTl9GRUFUVVJFKHNv dXBDYWNoZS5nZXQoKSkpOwogICAgICAgICBzb3VwX2NhY2hlX2xvYWQoc291cENhY2hlLmdldCgp KTsKKworICAgICAgICBpZiAoIXBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VQYXRo LmlzRW1wdHkoKSkgeworICAgICAgICAgICAgc3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigp LT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRT dG9yYWdlUGF0aCwKKyAgICAgICAgICAgICAgICBwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRT dG9yYWdlVHlwZSk7CisgICAgICAgIH0KKyAgICAgICAgc3VwcGxlbWVudDxXZWJDb29raWVNYW5h Z2VyPigpLT5zZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KHBhcmFtZXRlcnMuY29va2llQWNjZXB0 UG9saWN5KTsKICNpZiBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQogICAgIH0KICNlbmRpZgpAQCAt MjE0LDEyICsyMjAsNiBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlBy b2Nlc3MoY29uc3QgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycwogICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgcGFyYW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZC5zaXplKCk7IGkrKykK ICAgICAgICAgc3VwcGxlbWVudDxXZWJTb3VwUmVxdWVzdE1hbmFnZXI+KCktPnJlZ2lzdGVyVVJJ U2NoZW1lKHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRbaV0pOwogCi0gICAgaWYgKCFw YXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aC5pc0VtcHR5KCkpIHsKLSAgICAg ICAgc3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigpLT5zZXRDb29raWVQZXJzaXN0ZW50U3Rv cmFnZShwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aCwKLSAgICAgICAgICAg IHBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlKTsKLSAgICB9Ci0gICAgc3Vw cGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigpLT5zZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KHBh cmFtZXRlcnMuY29va2llQWNjZXB0UG9saWN5KTsKLQogICAgIHNldElnbm9yZVRMU0Vycm9ycyhw YXJhbWV0ZXJzLmlnbm9yZVRMU0Vycm9ycyk7CiAKICAgICBXZWJDb3JlOjphZGRMYW5ndWFnZUNo YW5nZU9ic2VydmVyKHRoaXMsIGxhbmd1YWdlQ2hhbmdlZCk7Cg==