194103 2019-01-31 11:43:16 -0800 [SOUP] Improve use of SoupCookiePersistentStorageType 2019-02-05 08:03:13 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro berto bugs-noreply cgarcia commit-queue ews-watchlist gustavo mcatanzaro webkit-bug-importer oldest_to_newest 1500675 0 mcatanzaro 2019-01-31 11:43:16 -0800 Improve use of SoupCookiePersistentStorageType. Turn it into an enum class, and stop casting it to and from uint32_t. 1500676 1 360747 mcatanzaro 2019-01-31 11:48:55 -0800 Created attachment 360747 Patch 1500682 2 ews-watchlist 2019-01-31 11:51: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 1501052 3 360747 cgarcia 2019-02-01 00:58:19 -0800 Comment on attachment 360747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360747&action=review > Source/WebKit/Shared/soup/SoupCookiePersistentStorageType.h:30 > +enum class SoupCookiePersistentStorageType : bool { why bool? 1501108 4 360747 mcatanzaro 2019-02-01 08:24:08 -0800 Comment on attachment 360747 Patch Because there's only two possible values. It's an implementation detail -- we can change it whenever we want -- but there's another bool-typed enum in NetworkProcess messages so seemed good to match that. Maybe I'll change it to uint8_t before landing so we'll never have to change it even in the unlikely case we add a new storage type; let's see if that works. 1501133 5 mcatanzaro 2019-02-01 09:28:53 -0800 (In reply to Michael Catanzaro from comment #4) > Maybe I'll change it to uint8_t before landing so we'll never have to change > it even in the unlikely case we add a new storage type; let's see if that > works. Weird build errors. Let's just use int. 1501134 6 mcatanzaro 2019-02-01 09:31:14 -0800 Even that causes strange failures. I'll land it as-is... bool is an OK type for a two-valued enum. 1501145 7 360747 commit-queue 2019-02-01 09:49:15 -0800 Comment on attachment 360747 Patch Clearing flags on attachment: 360747 Committed r240858: <https://trac.webkit.org/changeset/240858> 1501146 8 commit-queue 2019-02-01 09:49:17 -0800 All reviewed patches have been landed. Closing bug. 360747 2019-01-31 11:48:55 -0800 2019-02-01 09:49:15 -0800 Patch bug-194103-20190131134854.patch text/plain 11191 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkMDllMWJjZDc3YzEzOTA0 ZjBlZGVmNjUyNTNmMTE5Mzk1ZTBhMDUuLjk5Y2NhMGY5MWI3OWQ5N2VjYjZkYjZhMTgxNThmNDhl ZTMxODM5ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDEtMzEgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtTT1VQXSBJbXBy b3ZlIHVzZSBvZiBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQxMDMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUdXJuIGl0IGludG8gYW4gZW51bSBj bGFzcywgYW5kIHN0b3AgY2FzdGluZyBpdCB0byBhbmQgZnJvbSB1aW50MzJfdC4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL0Nvb2tpZXMvV2ViQ29va2llTWFuYWdlci5oOgorICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL0Nvb2tpZXMvV2ViQ29va2llTWFuYWdlci5tZXNzYWdlcy5pbjoKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9Db29raWVzL3NvdXAvV2ViQ29va2llTWFuYWdlclNvdXAu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb29raWVNYW5hZ2VyOjpzZXRDb29raWVQZXJzaXN0 ZW50U3RvcmFnZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVh dGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNyZWF0 aW9uUGFyYW1ldGVyczo6cHJpdmF0ZVNlc3Npb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAg ICAgKiBTaGFyZWQvc291cC9Tb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlLmg6CisgICAg ICAgICgpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb29r aWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvb2tpZU1hbmFnZXJQcm94eTo6c2V0Q29va2llUGVy c2lzdGVudFN0b3JhZ2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb29raWVNYW5hZ2VyUHJveHk6 OmdldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlIGNvbnN0KToKKwogMjAxOS0wMS0zMCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBJbXBsZW1l bnQgYmFzaWMgaGl0IHRlc3RpbmcgaW4gdGhlIHNjcm9sbGluZyB0cmVlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Nvb2tpZXMvV2ViQ29va2llTWFuYWdlci5oIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIuaApp bmRleCAzMTU2NDY2ODA3YzljOWUyODU0NDc0ZTJlZTMzNGFhMzM2ZTI3Njk5Li4zNjM5ZWFiNmNm MTJhZTRiYTJiMDFhNTZjY2I5MjIzZTllNzhjNWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0Nvb2tpZXMvV2ViQ29va2llTWFuYWdlci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ29va2llcy9XZWJDb29raWVNYW5hZ2VyLmgKQEAgLTU4LDcg KzU4LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShIVFRQ Q29va2llQWNjZXB0UG9saWN5LCBPcHRpb25hbENhbGxiYWNrSUQpOwogCiAjaWYgVVNFKFNPVVAp Ci0gICAgdm9pZCBzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShQQUw6OlNlc3Npb25JRCwgY29u c3QgU3RyaW5nJiBzdG9yYWdlUGF0aCwgdWludDMyX3Qgc3RvcmFnZVR5cGUpOworICAgIHZvaWQg c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoUEFMOjpTZXNzaW9uSUQsIGNvbnN0IFN0cmluZyYg c3RvcmFnZVBhdGgsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUpOwogI2VuZGlmCiAK ICAgICB2b2lkIG5vdGlmeUNvb2tpZXNEaWRDaGFuZ2UoUEFMOjpTZXNzaW9uSUQpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFn ZXIubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Nvb2tpZXMvV2Vi Q29va2llTWFuYWdlci5tZXNzYWdlcy5pbgppbmRleCAyZWUwNmFkNGFjOTQwNGIxOWQxYWU5ZmFk ZWI3MTg0ZTFlYTU3NzMxLi4yOGY4N2I2YWU0ZDAzNDgwZGJiNDA3MDM1YjEzNmUzNzMwYjU0YmY1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Nvb2tpZXMvV2ViQ29v a2llTWFuYWdlci5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L0Nvb2tpZXMvV2ViQ29va2llTWFuYWdlci5tZXNzYWdlcy5pbgpAQCAtNDIsNiArNDIsNiBAQAog ICAgIHZvaWQgU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMoUEFMOjpTZXNzaW9uSUQgc2Vzc2lv bklEKQogCiAjaWYgVVNFKFNPVVApCi0gICAgU2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoUEFM OjpTZXNzaW9uSUQgc2Vzc2lvbklELCBTdHJpbmcgc3RvcmFnZVBhdGgsIHVpbnQzMl90IHN0b3Jh Z2VUeXBlKQorICAgIHZvaWQgU2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoUEFMOjpTZXNzaW9u SUQgc2Vzc2lvbklELCBTdHJpbmcgc3RvcmFnZVBhdGgsIGVudW06Ym9vbCBXZWJLaXQ6OlNvdXBD b29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUpCiAjZW5kaWYKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ29va2llcy9zb3VwL1dlYkNvb2tp ZU1hbmFnZXJTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ29va2llcy9z b3VwL1dlYkNvb2tpZU1hbmFnZXJTb3VwLmNwcAppbmRleCA2ODk4YzdmMzRkNmY3ODY1OGJhZmRi OTEzMTA2YTM5MjM5OWM4OTg3Li5iODVjOWFlNmJhM2FkMzU3ODc5MDhiYjhlZjEwMTY5MzkyNjk5 NGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Nvb2tpZXMvc291 cC9XZWJDb29raWVNYW5hZ2VyU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9Db29raWVzL3NvdXAvV2ViQ29va2llTWFuYWdlclNvdXAuY3BwCkBAIC0yNyw2ICsyNyw3 IEBACiAjaW5jbHVkZSAiV2ViQ29va2llTWFuYWdlci5oIgogCiAjaW5jbHVkZSAiTmV0d29ya1By b2Nlc3MuaCIKKyNpbmNsdWRlICJTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlLmgiCiAj aW5jbHVkZSA8V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaD4KICNpbmNsdWRlIDxXZWJD b3JlL1NvdXBOZXR3b3JrU2Vzc2lvbi5oPgogI2luY2x1ZGUgPGxpYnNvdXAvc291cC5oPgpAQCAt NzEsMTQgKzcyLDE0IEBAIEhUVFBDb29raWVBY2NlcHRQb2xpY3kgV2ViQ29va2llTWFuYWdlcjo6 cGxhdGZvcm1HZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KCkKICAgICByZXR1cm4gSFRUUENvb2tp ZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOwogfQogCi12b2lkIFdlYkNv b2tpZU1hbmFnZXI6OnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKFBBTDo6U2Vzc2lvbklEIHNl c3Npb25JRCwgY29uc3QgU3RyaW5nJiBzdG9yYWdlUGF0aCwgdWludDMyX3Qgc3RvcmFnZVR5cGUp Cit2b2lkIFdlYkNvb2tpZU1hbmFnZXI6OnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKFBBTDo6 U2Vzc2lvbklEIHNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiBzdG9yYWdlUGF0aCwgU291cENvb2tp ZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSBzdG9yYWdlVHlwZSkKIHsKICAgICBHUmVmUHRyPFNvdXBD b29raWVKYXI+IGphcjsKICAgICBzd2l0Y2ggKHN0b3JhZ2VUeXBlKSB7Ci0gICAgY2FzZSBTb3Vw Q29va2llUGVyc2lzdGVudFN0b3JhZ2VUZXh0OgorICAgIGNhc2UgU291cENvb2tpZVBlcnNpc3Rl bnRTdG9yYWdlVHlwZTo6VGV4dDoKICAgICAgICAgamFyID0gYWRvcHRHUmVmKHNvdXBfY29va2ll X2phcl90ZXh0X25ldyhzdG9yYWdlUGF0aC51dGY4KCkuZGF0YSgpLCBGQUxTRSkpOwogICAgICAg ICBicmVhazsKLSAgICBjYXNlIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVNRTGl0ZToKKyAg ICBjYXNlIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGU6OlNRTGl0ZToKICAgICAgICAg amFyID0gYWRvcHRHUmVmKHNvdXBfY29va2llX2phcl9kYl9uZXcoc3RvcmFnZVBhdGgudXRmOCgp LmRhdGEoKSwgRkFMU0UpKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVhdGlvblBh cmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lv bkNyZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5kZXggY2ZjOWUxMGJiY2YxNzBiMWM4NTM4NjY2NGM4 YzBmNDZkZTBlN2ZjNS4uNmY1YWE1NWNlNDA4OTFlYThlNTgyY2ViOWY1YTc4ZjVjNjg5OWE3MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNy ZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTQ1LDcgKzQ1LDcgQEAgTmV0 d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMgTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFt ZXRlcnM6OnByaXZhdGVTZXNzaW8KICAgICAgICAgLCB7IH0sIHsgfSwgeyB9LCBmYWxzZSwgeyB9 LCB7IH0sIHsgfQogI2VuZGlmCiAjaWYgVVNFKFNPVVApCi0gICAgICAgICwgeyB9LCAwCisgICAg ICAgICwgeyB9LCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlOjpUZXh0CiAjZW5kaWYK ICNpZiBVU0UoQ1VSTCkKICAgICAgICAgLCB7IH0sIHsgfQpAQCAtMTM5LDcgKzEzOSw3IEBAIE9w dGlvbmFsPE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzPiBOZXR3b3JrU2Vzc2lvbkNy ZWF0aW9uUGFyYW1ldGVyczo6ZGVjCiAgICAgaWYgKCFjb29raWVQZXJzaXN0ZW50U3RvcmFnZVBh dGgpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBPcHRpb25hbDx1aW50MzJf dD4gY29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlOworICAgIE9wdGlvbmFsPFNvdXBDb29raWVQ ZXJzaXN0ZW50U3RvcmFnZVR5cGU+IGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZTsKICAgICBk ZWNvZGVyID4+IGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZTsKICAgICBpZiAoIWNvb2tpZVBl cnNpc3RlbnRTdG9yYWdlVHlwZSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVhdGlv blBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Np b25DcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCBjZDVjYWUyMzFiMTJhMGY4ZGNjZTQ5YzdmYjFl NTlmMzZiMzIxYTU3Li40ZmM3MzYxZWY2Zjc3NmI3MTdlNzEyOGI2OTFiYTUzYzM1OTY4MTk2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uQ3Jl YXRpb25QYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0zMSw2ICszMSwxMCBAQAogI2luY2x1 ZGUgPHd0Zi9VUkwuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAorI2lmIFVT RShTT1VQKQorI2luY2x1ZGUgIlNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUuaCIKKyNl bmRpZgorCiAjaWYgVVNFKENVUkwpCiAjaW5jbHVkZSA8V2ViQ29yZS9DdXJsUHJveHlTZXR0aW5n cy5oPgogI2VuZGlmCkBAIC00OCw3ICs1Miw3IEBAIGV4dGVybiAiQyIgQ0ZTdHJpbmdSZWYgY29u c3QgV2ViS2l0MkhUVFBTUHJveHlEZWZhdWx0c0tleTsKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBl bnVtIGNsYXNzIEFsbG93c0NlbGx1bGFyQWNjZXNzIDogYm9vbCB7IE5vLCBZZXMgfTsKLSAgICAK Kwogc3RydWN0IE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICB2b2lkIGVu Y29kZShJUEM6OkVuY29kZXImKSBjb25zdDsKICAgICBzdGF0aWMgT3B0aW9uYWw8TmV0d29ya1Nl c3Npb25DcmVhdGlvblBhcmFtZXRlcnM+IGRlY29kZShJUEM6OkRlY29kZXImKTsKQEAgLTY4LDcg KzcyLDcgQEAgc3RydWN0IE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICNlbmRp ZgogI2lmIFVTRShTT1VQKQogICAgIFN0cmluZyBjb29raWVQZXJzaXN0ZW50U3RvcmFnZVBhdGg7 Ci0gICAgdWludDMyX3QgY29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlIHsgMCB9OworICAgIFNv dXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUgY29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBl IHsgU291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZTo6VGV4dCB9OwogI2VuZGlmCiAjaWYg VVNFKENVUkwpCiAgICAgU3RyaW5nIGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlRmlsZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAvU291cENvb2tpZVBlcnNpc3RlbnRTdG9y YWdlVHlwZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvc291cC9Tb3VwQ29va2llUGVyc2lzdGVu dFN0b3JhZ2VUeXBlLmgKaW5kZXggOWZjMWMzY2QzMTlmZjEyN2MxN2NkMDI4NGZiM2QzMjA4MmJh YTVjZC4uOTVlNGYzMDlmN2QwZjM5ZWU3MzU3NGYzYzhiZTQ4N2ZhZTM0OTExYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9TaGFyZWQvc291cC9Tb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VU eXBlLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvc291cC9Tb3VwQ29va2llUGVyc2lzdGVu dFN0b3JhZ2VUeXBlLmgKQEAgLTIzLDE2ICsyMywxMyBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwog Ci0jaWZuZGVmIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGVfaAotI2RlZmluZSBTb3Vw Q29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlX2gKKyNwcmFnbWEgb25jZQogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAotZW51bSBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlIHsKLSAgICBT b3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUZXh0LAotICAgIFNvdXBDb29raWVQZXJzaXN0ZW50 U3RvcmFnZVNRTGl0ZQorZW51bSBjbGFzcyBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBl IDogYm9vbCB7CisgICAgVGV4dCwKKyAgICBTUUxpdGUKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdAotCi0jZW5kaWYgLy8gU291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZV9oCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb29raWVNYW5h Z2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdENvb2tpZU1h bmFnZXIuY3BwCmluZGV4IDAxZTFhM2VkYTgzZGYwYmQ4YmJkYmRmN2Y2YTY0ZTAyNjYzMjljZDcu LjU3OGNmMDRhYWNkMmEyNjEzN2E4YWQ2N2RmZjQzODkxZDUwNDZmZGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdENvb2tpZU1hbmFnZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdENvb2tpZU1hbmFnZXIu Y3BwCkBAIC03MywxMiArNzMsMTIgQEAgc3RhdGljIGlubGluZSBTb3VwQ29va2llUGVyc2lzdGVu dFN0b3JhZ2VUeXBlIHRvU291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSgKIHsKICAgICBz d2l0Y2ggKGtpdFN0b3JhZ2UpIHsKICAgICBjYXNlIFdFQktJVF9DT09LSUVfUEVSU0lTVEVOVF9T VE9SQUdFX1RFWFQ6Ci0gICAgICAgIHJldHVybiBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VU ZXh0OworICAgICAgICByZXR1cm4gU291cENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZTo6VGV4 dDsKICAgICBjYXNlIFdFQktJVF9DT09LSUVfUEVSU0lTVEVOVF9TVE9SQUdFX1NRTElURToKLSAg ICAgICAgcmV0dXJuIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVNRTGl0ZTsKKyAgICAgICAg cmV0dXJuIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGU6OlNRTGl0ZTsKICAgICBkZWZh dWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIFNvdXBD b29raWVQZXJzaXN0ZW50U3RvcmFnZVRleHQ7CisgICAgICAgIHJldHVybiBTb3VwQ29va2llUGVy c2lzdGVudFN0b3JhZ2VUeXBlOjpUZXh0OwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkuaAppbmRleCBlN2YyZTIwMTUzYzM2Mjc4 MjUxMTNlYTBmYjg4ZDk3OGRhYzg1MjliLi5kYmZmMjhhNWNkMTE2ODNkNDg0OTQ4NTY2ODU4MWU2 OGYyMDBhMTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb29raWVN YW5hZ2VyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJDb29raWVNYW5h Z2VyUHJveHkuaApAQCAtOTgsOCArOTgsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCB1bnJlZ2lzdGVy T2JzZXJ2ZXIoUEFMOjpTZXNzaW9uSUQsIE9ic2VydmVyJik7CiAKICNpZiBVU0UoU09VUCkKLSAg ICB2b2lkIHNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKFBBTDo6U2Vzc2lvbklELCBjb25zdCBT dHJpbmcmIHN0b3JhZ2VQYXRoLCB1aW50MzJfdCBzdG9yYWdlVHlwZSk7Ci0gICAgdm9pZCBnZXRD b29raWVQZXJzaXN0ZW50U3RvcmFnZShQQUw6OlNlc3Npb25JRCwgU3RyaW5nJiBzdG9yYWdlUGF0 aCwgdWludDMyX3QmIHN0b3JhZ2VUeXBlKSBjb25zdDsKKyAgICB2b2lkIHNldENvb2tpZVBlcnNp c3RlbnRTdG9yYWdlKFBBTDo6U2Vzc2lvbklELCBjb25zdCBTdHJpbmcmIHN0b3JhZ2VQYXRoLCBT b3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlKTsKKyAgICB2b2lkIGdldENvb2tpZVBlcnNp c3RlbnRTdG9yYWdlKFBBTDo6U2Vzc2lvbklELCBTdHJpbmcmIHN0b3JhZ2VQYXRoLCBTb3VwQ29v a2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlJikgY29uc3Q7CiAjZW5kaWYKIAogICAgIHVzaW5nIEFQ STo6T2JqZWN0OjpyZWY7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9zb3Vw L1dlYkNvb2tpZU1hbmFnZXJQcm94eVNvdXAuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv c291cC9XZWJDb29raWVNYW5hZ2VyUHJveHlTb3VwLmNwcAppbmRleCAwNmVhMjZkNTExNWYzY2Yx MWViZjAwNTZhMDEyNzAxZjgyMmMzZWU3Li45ZjdiZTNjOTQxYjZjZDBhMWI5NGNiMTM2MDk4ZjNh MDQxY2VmZjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9zb3VwL1dlYkNv b2tpZU1hbmFnZXJQcm94eVNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3Nv dXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHAKQEAgLTMxLDE3ICszMSwxNyBAQAogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBXZWJDb29raWVNYW5hZ2VyUHJveHk6OnNldENvb2tp ZVBlcnNpc3RlbnRTdG9yYWdlKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgY29uc3QgU3RyaW5n JiBzdG9yYWdlUGF0aCwgdWludDMyX3Qgc3RvcmFnZVR5cGUpCit2b2lkIFdlYkNvb2tpZU1hbmFn ZXJQcm94eTo6c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoUEFMOjpTZXNzaW9uSUQgc2Vzc2lv bklELCBjb25zdCBTdHJpbmcmIHN0b3JhZ2VQYXRoLCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3Jh Z2VUeXBlIHN0b3JhZ2VUeXBlKQogewotICAgIG1fY29va2llUGVyc2lzdGVudFN0b3JhZ2VNYXAu c2V0KHNlc3Npb25JRCwgc3RkOjptYWtlX3BhaXIoc3RvcmFnZVBhdGgsIHN0YXRpY19jYXN0PFNv dXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGU+KHN0b3JhZ2VUeXBlKSkpOworICAgIG1fY29v a2llUGVyc2lzdGVudFN0b3JhZ2VNYXAuc2V0KHNlc3Npb25JRCwgc3RkOjptYWtlX3BhaXIoc3Rv cmFnZVBhdGgsIHN0b3JhZ2VUeXBlKSk7CiAgICAgcHJvY2Vzc1Bvb2woKS0+c2VuZFRvTmV0d29y a2luZ1Byb2Nlc3MoTWVzc2FnZXM6OldlYkNvb2tpZU1hbmFnZXI6OlNldENvb2tpZVBlcnNpc3Rl bnRTdG9yYWdlKHNlc3Npb25JRCwgc3RvcmFnZVBhdGgsIHN0b3JhZ2VUeXBlKSk7CiB9CiAKLXZv aWQgV2ViQ29va2llTWFuYWdlclByb3h5OjpnZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShQQUw6 OlNlc3Npb25JRCBzZXNzaW9uSUQsIFN0cmluZyYgc3RvcmFnZVBhdGgsIHVpbnQzMl90JiBzdG9y YWdlVHlwZSkgY29uc3QKK3ZvaWQgV2ViQ29va2llTWFuYWdlclByb3h5OjpnZXRDb29raWVQZXJz aXN0ZW50U3RvcmFnZShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFN0cmluZyYgc3RvcmFnZVBh dGgsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUmIHN0b3JhZ2VUeXBlKSBjb25zdAog ewogICAgIGF1dG8gcGFpciA9IG1fY29va2llUGVyc2lzdGVudFN0b3JhZ2VNYXAuZ2V0KHNlc3Np b25JRCk7CiAgICAgc3RvcmFnZVBhdGggPSBwYWlyLmZpcnN0OwotICAgIHN0b3JhZ2VUeXBlID0g c3RhdGljX2Nhc3Q8dWludDMyX3Q+KHBhaXIuc2Vjb25kKTsKKyAgICBzdG9yYWdlVHlwZSA9IHBh aXIuc2Vjb25kOwogfQogCiB9Cg==