240327 2022-05-11 18:20:36 -0700 [GTK][WPE] Do not return pointer to disposed timezone string 2022-05-12 10:45:55 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yurys yurys bugs-noreply clopez mcatanzaro oldest_to_newest 1868276 0 yurys 2022-05-11 18:20:36 -0700 [GTK][WPE] Do not return pointer to disposed timezone string 1868277 1 459196 yurys 2022-05-11 18:22:04 -0700 Created attachment 459196 Patch 1868294 2 459201 yurys 2022-05-11 19:19:23 -0700 Created attachment 459201 Patch 1868381 3 459201 mcatanzaro 2022-05-12 06:42:23 -0700 Comment on attachment 459201 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459201&action=review > Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:396 > + if (const auto* override = g_value_get_string(value); isTimeZoneValid(override)) IMO it's more readable if you use two ifs rather than a semicolon. > Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:-1883 > -/** > - * webkit_web_context_set_time_zone_override: > - * @context: a #WebKitWebContext > - * @time_zone_override: value to set > - * > - * Set the #WebKitWebContext:time-zone-override property. Refer to the IANA database for valid > - * specifiers, https://en.wikipedia.org/wiki/List_of_tz_database_time_zones > - * > - * Since: 2.38 > - */ > -void webkit_web_context_set_time_zone_override(WebKitWebContext* context, const gchar* timeZoneOverride) Hm, why are you removing this? Since it's declared in public headers, you need to remove it from the headers too. > Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:-1888 > - context->priv->timeZoneOverride = String::fromUTF8(timeZoneOverride); If you don't want to remove the setter, I think you can just do: context->priv->timeZoneOverride = timeZoneOverride ? 1868453 4 459201 yurys 2022-05-12 09:55:46 -0700 Comment on attachment 459201 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459201&action=review >> Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:396 >> + if (const auto* override = g_value_get_string(value); isTimeZoneValid(override)) > > IMO it's more readable if you use two ifs rather than a semicolon. Changed. I personally prefer single statement per line but in another review[1] I was suggested reduce the scope of variables to the if block when possible. [1] https://bugs.webkit.org/show_bug.cgi?id=213884#c37 >> Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:-1883 >> -void webkit_web_context_set_time_zone_override(WebKitWebContext* context, const gchar* timeZoneOverride) > > Hm, why are you removing this? > > Since it's declared in public headers, you need to remove it from the headers too. Removed it from the header as well. There is no point in this method as calling it after context has been created will not update WebProcessPool configuration (and that is intentional as we don't want to have mixed time zones for pages in one pool). 1868455 5 459236 yurys 2022-05-12 10:03:32 -0700 Created attachment 459236 Patch 1868458 6 mcatanzaro 2022-05-12 10:08:33 -0700 (In reply to Yury Semikhatsky from comment #4) > Removed it from the header as well. There is no point in this method as > calling it after context has been created will not update WebProcessPool > configuration (and that is intentional as we don't want to have mixed time > zones for pages in one pool). Ah yes, I see the property is construct only, so that's a good clue that there should definitely not be a setter function. Another concern: removing it without breaking any tests reveals that there was no API test for it, which would have caught that it could not work. 1868471 7 ews-feeder 2022-05-12 10:45:47 -0700 Committed r294109 (250492@main): <https://commits.webkit.org/250492@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459236. 459196 2022-05-11 18:22:04 -0700 2022-05-11 19:19:21 -0700 Patch bug-240327-20220511182204.patch text/plain 3002 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExODY3NDMwMzNkMWM5ZjZj YjU1ZWQzNWI3YTM3NzdiYjY0YWMyMzYuLjNmYTA3OWU4MTI0MjNmODM3ZTk3NjhjM2NjOGJkODM1 MDg4NmE4ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjItMDUtMTEgIFl1cnkgU2Vt aWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0dUS11bV1BFXSBEbyBu b3QgcmV0dXJuIHBvaW50ZXIgdG8gZGlzcG9zZWQgdGltZXpvbmUgc3RyaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAzMjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9yZSB0aW1lIHpvbmUgbmFt ZSBpbiBDU3RyaW5nIHRvIGF2b2lkIHJldHVybmluZyBwb2ludGVyIHRvIGEgdGVtcAorICAgICAg ICBzdHJpbmcgd2hpY2ggZGlzcG9zZWQgYmVmb3JlIHJldHVybmluZyBmcm9tIHdlYmtpdF93ZWJf Y29udGV4dF9nZXRfdGltZV96b25lX292ZXJyaWRlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g Q292ZXJlZCBieSBleGlzdGluZyB1bml0IHRlc3RzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9nbGliL1dlYktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAod2Via2l0V2ViQ29udGV4dENv bnN0cnVjdGVkKToKKyAgICAgICAgKHdlYmtpdF93ZWJfY29udGV4dF9zZXRfdGltZV96b25lX292 ZXJyaWRlKToKKyAgICAgICAgKHdlYmtpdF93ZWJfY29udGV4dF9nZXRfdGltZV96b25lX292ZXJy aWRlKToKKwogMjAyMi0wNS0xMSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbV2luQ2Fpcm9dIFN1cHBvcnQgZmlsZSBkb3dubG9hZHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdlYkNvbnRleHQuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAK aW5kZXggYTE1OGExMGU2NzNjNzU0YjMwZjM2NzhlM2JhZDU2NTNjOWUyZjhkZS4uMGM2MGJiNTFh OTk0OWNiMDNjZjI3NDQ1Y2MxZDFhNDNkOTBhNzRkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTI0OCw3ICsy NDgsNyBAQCBzdHJ1Y3QgX1dlYktpdFdlYkNvbnRleHRQcml2YXRlIHsKIAogICAgIFdlYktpdE1l bW9yeVByZXNzdXJlU2V0dGluZ3MqIG1lbW9yeVByZXNzdXJlU2V0dGluZ3M7CiAKLSAgICBTdHJp bmcgdGltZVpvbmVPdmVycmlkZTsKKyAgICBDU3RyaW5nIHRpbWVab25lT3ZlcnJpZGU7CiB9Owog CiBzdGF0aWMgZ3VpbnQgc2lnbmFsc1tMQVNUX1NJR05BTF0gPSB7IDAsIH07CkBAIC00MjUsNyAr NDI1LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViQ29udGV4dENvbnN0cnVjdGVkKEdPYmplY3Qq IG9iamVjdCkKICAgICAgICAgLy8gT25jZSB0aGUgc2V0dGluZ3MgaGF2ZSBiZWVuIHBhc3NlZCB0 byB0aGUgUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLCB3ZSBkb24ndCBuZWVkIHRoZW0gYW55bW9y ZSBzbyB3ZSBjYW4gZnJlZSB0aGVtLgogICAgICAgICBnX2NsZWFyX3BvaW50ZXIoJnByaXYtPm1l bW9yeVByZXNzdXJlU2V0dGluZ3MsIHdlYmtpdF9tZW1vcnlfcHJlc3N1cmVfc2V0dGluZ3NfZnJl ZSk7CiAgICAgfQotICAgIGNvbmZpZ3VyYXRpb24uc2V0VGltZVpvbmVPdmVycmlkZShwcml2LT50 aW1lWm9uZU92ZXJyaWRlKTsKKyAgICBjb25maWd1cmF0aW9uLnNldFRpbWVab25lT3ZlcnJpZGUo U3RyaW5nOjpmcm9tVVRGOChwcml2LT50aW1lWm9uZU92ZXJyaWRlLmRhdGEoKSwgcHJpdi0+dGlt ZVpvbmVPdmVycmlkZS5sZW5ndGgoKSkpOwogCiAgICAgaWYgKCFwcml2LT53ZWJzaXRlRGF0YU1h bmFnZXIpCiAgICAgICAgIHByaXYtPndlYnNpdGVEYXRhTWFuYWdlciA9IGFkb3B0R1JlZih3ZWJr aXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJfbmV3KCJsb2NhbC1zdG9yYWdlLWRpcmVjdG9yeSIsIHBy aXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5kYXRhKCksIG51bGxwdHIpKTsKQEAgLTE4ODUsNyAr MTg4NSw3IEBAIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X3NldF90aW1lX3pvbmVfb3ZlcnJpZGUo V2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgY29uc3QKICAgICBnX3JldHVybl9pZl9mYWlsKFdF QktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0KSk7CiAgICAgZ19yZXR1cm5faWZfZmFpbChpc1Rp bWVab25lVmFsaWQodGltZVpvbmVPdmVycmlkZSkpOwogCi0gICAgY29udGV4dC0+cHJpdi0+dGlt ZVpvbmVPdmVycmlkZSA9IFN0cmluZzo6ZnJvbVVURjgodGltZVpvbmVPdmVycmlkZSk7CisgICAg Y29udGV4dC0+cHJpdi0+dGltZVpvbmVPdmVycmlkZSA9IHRpbWVab25lT3ZlcnJpZGU7CiB9CiAK IC8qKgpAQCAtMTkwMCw3ICsxOTAwLDcgQEAgY29uc3QgZ2NoYXIqIHdlYmtpdF93ZWJfY29udGV4 dF9nZXRfdGltZV96b25lX292ZXJyaWRlKFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQKIHsKICAg ICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0NPTlRFWFQoY29udGV4dCksIG51 bGxwdHIpOwogCi0gICAgcmV0dXJuIGNvbnRleHQtPnByaXYtPnRpbWVab25lT3ZlcnJpZGUudXRm OCgpLmRhdGEoKTsKKyAgICByZXR1cm4gY29udGV4dC0+cHJpdi0+dGltZVpvbmVPdmVycmlkZS5k YXRhKCk7CiB9CiAKIHZvaWQgd2Via2l0V2ViQ29udGV4dEluaXRpYWxpemVOb3RpZmljYXRpb25Q ZXJtaXNzaW9ucyhXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0KQo= 459201 2022-05-11 19:19:23 -0700 2022-05-12 10:03:29 -0700 Patch bug-240327-20220511191922.patch text/plain 4063 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExODY3NDMwMzNkMWM5ZjZj YjU1ZWQzNWI3YTM3NzdiYjY0YWMyMzYuLjQ5NjY5ZjJiZjQ4ZjY5NTM5ZWYzNmZkY2U1YmJmMjM0 YjFlZDhhMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDUtMTEgIFl1cnkgU2Vt aWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0dUS11bV1BFXSBEbyBu b3QgcmV0dXJuIHBvaW50ZXIgdG8gZGlzcG9zZWQgdGltZXpvbmUgc3RyaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAzMjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9yZSB0aW1lIHpvbmUgbmFt ZSBpbiBDU3RyaW5nIHRvIGF2b2lkIHJldHVybmluZyBwb2ludGVyIHRvIGEgdGVtcCBzdHJpbmcg d2hpY2ggd2FzCisgICAgICAgIGRpc3Bvc2VkIGJlZm9yZSByZXR1cm5pbmcgZnJvbSB3ZWJraXRf d2ViX2NvbnRleHRfZ2V0X3RpbWVfem9uZV9vdmVycmlkZS4KKworICAgICAgICBObyBuZXcgdGVz dHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdW5pdCB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYkNvbnRl eHRDb25zdHJ1Y3RlZCk6CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3RpbWVfem9u ZV9vdmVycmlkZSk6IGRlbGV0ZWQgdGhpcyBmdW5jdGlvbiBhcyB0aGUgdGltZSB6b25lIGNhbgor ICAgICAgICBvbmx5IGJlIG92ZXJyaWRkZW4gZHVyaW5nIGNvbnRleHQgY29uc3RydWN0aW9uLgor ICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0X2dldF90aW1lX3pvbmVfb3ZlcnJpZGUpOgorCiAy MDIyLTA1LTExICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFtXaW5DYWlyb10gU3VwcG9ydCBmaWxlIGRvd25sb2FkcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcAppbmRleCBhMTU4 YTEwZTY3M2M3NTRiMzBmMzY3OGUzYmFkNTY1M2M5ZTJmOGRlLi4yMDc3NjdjOGE2MjNjYzRhYzE4 YzZhNDU0MTVkMTgwNmQ0MzI1MTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMjQ4LDcgKzI0OCw3IEBAIHN0 cnVjdCBfV2ViS2l0V2ViQ29udGV4dFByaXZhdGUgewogCiAgICAgV2ViS2l0TWVtb3J5UHJlc3N1 cmVTZXR0aW5ncyogbWVtb3J5UHJlc3N1cmVTZXR0aW5nczsKIAotICAgIFN0cmluZyB0aW1lWm9u ZU92ZXJyaWRlOworICAgIENTdHJpbmcgdGltZVpvbmVPdmVycmlkZTsKIH07CiAKIHN0YXRpYyBn dWludCBzaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwgfTsKQEAgLTM5Myw4ICszOTMsOCBAQCBz dGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0U2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBn dWludCBwcm9wSUQsIGNvbnN0IEdWYQogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSBQ Uk9QX1RJTUVfWk9ORV9PVkVSUklERTogewotICAgICAgICBpZiAoY29uc3QgYXV0byogb3ZlcnJp ZGUgPSBnX3ZhbHVlX2dldF9zdHJpbmcodmFsdWUpKQotICAgICAgICAgICAgd2Via2l0X3dlYl9j b250ZXh0X3NldF90aW1lX3pvbmVfb3ZlcnJpZGUoY29udGV4dCwgb3ZlcnJpZGUpOworICAgICAg ICBpZiAoY29uc3QgYXV0byogb3ZlcnJpZGUgPSBnX3ZhbHVlX2dldF9zdHJpbmcodmFsdWUpOyBp c1RpbWVab25lVmFsaWQob3ZlcnJpZGUpKQorICAgICAgICAgICAgY29udGV4dC0+cHJpdi0+dGlt ZVpvbmVPdmVycmlkZSA9IG92ZXJyaWRlOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgZGVm YXVsdDoKQEAgLTQyNSw3ICs0MjUsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29u c3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAgICAgICAvLyBPbmNlIHRoZSBzZXR0aW5ncyBo YXZlIGJlZW4gcGFzc2VkIHRvIHRoZSBQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24sIHdlIGRvbid0 IG5lZWQgdGhlbSBhbnltb3JlIHNvIHdlIGNhbiBmcmVlIHRoZW0uCiAgICAgICAgIGdfY2xlYXJf cG9pbnRlcigmcHJpdi0+bWVtb3J5UHJlc3N1cmVTZXR0aW5ncywgd2Via2l0X21lbW9yeV9wcmVz c3VyZV9zZXR0aW5nc19mcmVlKTsKICAgICB9Ci0gICAgY29uZmlndXJhdGlvbi5zZXRUaW1lWm9u ZU92ZXJyaWRlKHByaXYtPnRpbWVab25lT3ZlcnJpZGUpOworICAgIGNvbmZpZ3VyYXRpb24uc2V0 VGltZVpvbmVPdmVycmlkZShTdHJpbmc6OmZyb21VVEY4KHByaXYtPnRpbWVab25lT3ZlcnJpZGUu ZGF0YSgpLCBwcml2LT50aW1lWm9uZU92ZXJyaWRlLmxlbmd0aCgpKSk7CiAKICAgICBpZiAoIXBy aXYtPndlYnNpdGVEYXRhTWFuYWdlcikKICAgICAgICAgcHJpdi0+d2Vic2l0ZURhdGFNYW5hZ2Vy ID0gYWRvcHRHUmVmKHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9uZXcoImxvY2FsLXN0b3Jh Z2UtZGlyZWN0b3J5IiwgcHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5LmRhdGEoKSwgbnVsbHB0 cikpOwpAQCAtMTg3MCwyNCArMTg3MCw2IEBAIGdib29sZWFuIHdlYmtpdF93ZWJfY29udGV4dF9n ZXRfdXNlX3N5c3RlbV9hcHBlYXJhbmNlX2Zvcl9zY3JvbGxiYXJzKFdlYktpdFdlYkNvCiB9CiAj ZW5kaWYKIAotLyoqCi0gKiB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3RpbWVfem9uZV9vdmVycmlk ZToKLSAqIEBjb250ZXh0OiBhICNXZWJLaXRXZWJDb250ZXh0Ci0gKiBAdGltZV96b25lX292ZXJy aWRlOiB2YWx1ZSB0byBzZXQKLSAqCi0gKiBTZXQgdGhlICNXZWJLaXRXZWJDb250ZXh0OnRpbWUt em9uZS1vdmVycmlkZSBwcm9wZXJ0eS4gUmVmZXIgdG8gdGhlIElBTkEgZGF0YWJhc2UgZm9yIHZh bGlkCi0gKiBzcGVjaWZpZXJzLCBodHRwczovL2VuLndpa2lwZWRpYS5vcmcvd2lraS9MaXN0X29m X3R6X2RhdGFiYXNlX3RpbWVfem9uZXMKLSAqCi0gKiBTaW5jZTogMi4zOAotICovCi12b2lkIHdl YmtpdF93ZWJfY29udGV4dF9zZXRfdGltZV96b25lX292ZXJyaWRlKFdlYktpdFdlYkNvbnRleHQq IGNvbnRleHQsIGNvbnN0IGdjaGFyKiB0aW1lWm9uZU92ZXJyaWRlKQotewotICAgIGdfcmV0dXJu X2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9DT05URVhUKGNvbnRleHQpKTsKLSAgICBnX3JldHVybl9p Zl9mYWlsKGlzVGltZVpvbmVWYWxpZCh0aW1lWm9uZU92ZXJyaWRlKSk7Ci0KLSAgICBjb250ZXh0 LT5wcml2LT50aW1lWm9uZU92ZXJyaWRlID0gU3RyaW5nOjpmcm9tVVRGOCh0aW1lWm9uZU92ZXJy aWRlKTsKLX0KLQogLyoqCiAgKiB3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3RpbWVfem9uZV9vdmVy cmlkZToKICAqIEBjb250ZXh0OiBhICNXZWJLaXRXZWJDb250ZXh0CkBAIC0xOTAwLDcgKzE4ODIs NyBAQCBjb25zdCBnY2hhciogd2Via2l0X3dlYl9jb250ZXh0X2dldF90aW1lX3pvbmVfb3ZlcnJp ZGUoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dAogewogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWls KFdFQktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0KSwgbnVsbHB0cik7CiAKLSAgICByZXR1cm4g Y29udGV4dC0+cHJpdi0+dGltZVpvbmVPdmVycmlkZS51dGY4KCkuZGF0YSgpOworICAgIHJldHVy biBjb250ZXh0LT5wcml2LT50aW1lWm9uZU92ZXJyaWRlLmRhdGEoKTsKIH0KIAogdm9pZCB3ZWJr aXRXZWJDb250ZXh0SW5pdGlhbGl6ZU5vdGlmaWNhdGlvblBlcm1pc3Npb25zKFdlYktpdFdlYkNv bnRleHQqIGNvbnRleHQpCg== 459236 2022-05-12 10:03:32 -0700 2022-05-12 10:45:51 -0700 Patch bug-240327-20220512100331.patch text/plain 5991 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDExODY3NDMwMzNkMWM5ZjZj YjU1ZWQzNWI3YTM3NzdiYjY0YWMyMzYuLmUzOTk1MmU0NzZlMmIzZmQ5NzAyZGZkMDYzMDhmNzQ1 OTA4MGQ2ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjItMDUtMTEgIFl1cnkgU2Vt aWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0dUS11bV1BFXSBEbyBu b3QgcmV0dXJuIHBvaW50ZXIgdG8gZGlzcG9zZWQgdGltZXpvbmUgc3RyaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAzMjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9yZSB0aW1lIHpvbmUgbmFt ZSBpbiBDU3RyaW5nIHRvIGF2b2lkIHJldHVybmluZyBwb2ludGVyIHRvIGEgdGVtcCBzdHJpbmcg d2hpY2ggd2FzCisgICAgICAgIGRpc3Bvc2VkIGJlZm9yZSByZXR1cm5pbmcgZnJvbSB3ZWJraXRf d2ViX2NvbnRleHRfZ2V0X3RpbWVfem9uZV9vdmVycmlkZS4KKworICAgICAgICBObyBuZXcgdGVz dHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdW5pdCB0ZXN0cy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYkNvbnRl eHRTZXRQcm9wZXJ0eSk6CisgICAgICAgICh3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQpOgor ICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0X2dldF90aW1lX3pvbmVfb3ZlcnJpZGUpOgorICAg ICAgICAod2Via2l0X3dlYl9jb250ZXh0X3NldF90aW1lX3pvbmVfb3ZlcnJpZGUpOiBEZWxldGVk IHRoaXMgZnVuY3Rpb24gYXMgdGhlIHRpbWUgem9uZSBjYW4KKyAgICAgICAgb25seSBiZSBvdmVy cmlkZGVuIGR1cmluZyBjb250ZXh0IGNvbnN0cnVjdGlvbi4KKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS93cGUv V2ViS2l0V2ViQ29udGV4dC5oOgorCiAyMDIyLTA1LTExICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVy eXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtXaW5DYWlyb10gU3VwcG9ydCBmaWxlIGRvd25s b2FkcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0 V2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRX ZWJDb250ZXh0LmNwcAppbmRleCBhMTU4YTEwZTY3M2M3NTRiMzBmMzY3OGUzYmFkNTY1M2M5ZTJm OGRlLi43Zjc4NTFlMTU0Mzg1ZTJmNWNjNmIxMDRmYWJmZDU5NmYwYWU0NjIxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJDb250ZXh0LmNw cApAQCAtMjQ4LDcgKzI0OCw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViQ29udGV4dFByaXZhdGUgewog CiAgICAgV2ViS2l0TWVtb3J5UHJlc3N1cmVTZXR0aW5ncyogbWVtb3J5UHJlc3N1cmVTZXR0aW5n czsKIAotICAgIFN0cmluZyB0aW1lWm9uZU92ZXJyaWRlOworICAgIENTdHJpbmcgdGltZVpvbmVP dmVycmlkZTsKIH07CiAKIHN0YXRpYyBndWludCBzaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwg fTsKQEAgLTM5Myw4ICszOTMsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0U2V0UHJv cGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSUQsIGNvbnN0IEdWYQogICAgICAgICBi cmVhazsKICAgICB9CiAgICAgY2FzZSBQUk9QX1RJTUVfWk9ORV9PVkVSUklERTogewotICAgICAg ICBpZiAoY29uc3QgYXV0byogb3ZlcnJpZGUgPSBnX3ZhbHVlX2dldF9zdHJpbmcodmFsdWUpKQot ICAgICAgICAgICAgd2Via2l0X3dlYl9jb250ZXh0X3NldF90aW1lX3pvbmVfb3ZlcnJpZGUoY29u dGV4dCwgb3ZlcnJpZGUpOworICAgICAgICBjb25zdCBhdXRvKiB0aW1lWm9uZSA9IGdfdmFsdWVf Z2V0X3N0cmluZyh2YWx1ZSk7CisgICAgICAgIGlmIChpc1RpbWVab25lVmFsaWQodGltZVpvbmUp KQorICAgICAgICAgICAgY29udGV4dC0+cHJpdi0+dGltZVpvbmVPdmVycmlkZSA9IHRpbWVab25l OwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgZGVmYXVsdDoKQEAgLTQyNSw3ICs0MjYsNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0 KQogICAgICAgICAvLyBPbmNlIHRoZSBzZXR0aW5ncyBoYXZlIGJlZW4gcGFzc2VkIHRvIHRoZSBQ cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24sIHdlIGRvbid0IG5lZWQgdGhlbSBhbnltb3JlIHNvIHdl IGNhbiBmcmVlIHRoZW0uCiAgICAgICAgIGdfY2xlYXJfcG9pbnRlcigmcHJpdi0+bWVtb3J5UHJl c3N1cmVTZXR0aW5ncywgd2Via2l0X21lbW9yeV9wcmVzc3VyZV9zZXR0aW5nc19mcmVlKTsKICAg ICB9Ci0gICAgY29uZmlndXJhdGlvbi5zZXRUaW1lWm9uZU92ZXJyaWRlKHByaXYtPnRpbWVab25l T3ZlcnJpZGUpOworICAgIGNvbmZpZ3VyYXRpb24uc2V0VGltZVpvbmVPdmVycmlkZShTdHJpbmc6 OmZyb21VVEY4KHByaXYtPnRpbWVab25lT3ZlcnJpZGUuZGF0YSgpLCBwcml2LT50aW1lWm9uZU92 ZXJyaWRlLmxlbmd0aCgpKSk7CiAKICAgICBpZiAoIXByaXYtPndlYnNpdGVEYXRhTWFuYWdlcikK ICAgICAgICAgcHJpdi0+d2Vic2l0ZURhdGFNYW5hZ2VyID0gYWRvcHRHUmVmKHdlYmtpdF93ZWJz aXRlX2RhdGFfbWFuYWdlcl9uZXcoImxvY2FsLXN0b3JhZ2UtZGlyZWN0b3J5IiwgcHJpdi0+bG9j YWxTdG9yYWdlRGlyZWN0b3J5LmRhdGEoKSwgbnVsbHB0cikpOwpAQCAtMTg3MCwyNCArMTg3MSw2 IEBAIGdib29sZWFuIHdlYmtpdF93ZWJfY29udGV4dF9nZXRfdXNlX3N5c3RlbV9hcHBlYXJhbmNl X2Zvcl9zY3JvbGxiYXJzKFdlYktpdFdlYkNvCiB9CiAjZW5kaWYKIAotLyoqCi0gKiB3ZWJraXRf d2ViX2NvbnRleHRfc2V0X3RpbWVfem9uZV9vdmVycmlkZToKLSAqIEBjb250ZXh0OiBhICNXZWJL aXRXZWJDb250ZXh0Ci0gKiBAdGltZV96b25lX292ZXJyaWRlOiB2YWx1ZSB0byBzZXQKLSAqCi0g KiBTZXQgdGhlICNXZWJLaXRXZWJDb250ZXh0OnRpbWUtem9uZS1vdmVycmlkZSBwcm9wZXJ0eS4g UmVmZXIgdG8gdGhlIElBTkEgZGF0YWJhc2UgZm9yIHZhbGlkCi0gKiBzcGVjaWZpZXJzLCBodHRw czovL2VuLndpa2lwZWRpYS5vcmcvd2lraS9MaXN0X29mX3R6X2RhdGFiYXNlX3RpbWVfem9uZXMK LSAqCi0gKiBTaW5jZTogMi4zOAotICovCi12b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfdGlt ZV96b25lX292ZXJyaWRlKFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IGdjaGFyKiB0 aW1lWm9uZU92ZXJyaWRlKQotewotICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9D T05URVhUKGNvbnRleHQpKTsKLSAgICBnX3JldHVybl9pZl9mYWlsKGlzVGltZVpvbmVWYWxpZCh0 aW1lWm9uZU92ZXJyaWRlKSk7Ci0KLSAgICBjb250ZXh0LT5wcml2LT50aW1lWm9uZU92ZXJyaWRl ID0gU3RyaW5nOjpmcm9tVVRGOCh0aW1lWm9uZU92ZXJyaWRlKTsKLX0KLQogLyoqCiAgKiB3ZWJr aXRfd2ViX2NvbnRleHRfZ2V0X3RpbWVfem9uZV9vdmVycmlkZToKICAqIEBjb250ZXh0OiBhICNX ZWJLaXRXZWJDb250ZXh0CkBAIC0xOTAwLDcgKzE4ODMsNyBAQCBjb25zdCBnY2hhciogd2Via2l0 X3dlYl9jb250ZXh0X2dldF90aW1lX3pvbmVfb3ZlcnJpZGUoV2ViS2l0V2ViQ29udGV4dCogY29u dGV4dAogewogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfQ09OVEVYVChj b250ZXh0KSwgbnVsbHB0cik7CiAKLSAgICByZXR1cm4gY29udGV4dC0+cHJpdi0+dGltZVpvbmVP dmVycmlkZS51dGY4KCkuZGF0YSgpOworICAgIHJldHVybiBjb250ZXh0LT5wcml2LT50aW1lWm9u ZU92ZXJyaWRlLmRhdGEoKTsKIH0KIAogdm9pZCB3ZWJraXRXZWJDb250ZXh0SW5pdGlhbGl6ZU5v dGlmaWNhdGlvblBlcm1pc3Npb25zKFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oCmluZGV4 IDk3YTRkNThmMjY3Nzc0M2FjOGE5Yjk2ZGQ0ZTBiYTNkOGEwNGQyYjUuLjRhM2Y0N2E2ZjMxZGNi M2VhNTFmZjE0ZWM1NGUyZTY0ZjFjMTgyMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oCkBAIC0zMDIsMTAgKzMwMiw2IEBAIHdl YmtpdF93ZWJfY29udGV4dF9zZXRfdXNlX3N5c3RlbV9hcHBlYXJhbmNlX2Zvcl9zY3JvbGxiYXJz IChXZWJLaXRXZWJDb250ZXh0CiBXRUJLSVRfQVBJIGdib29sZWFuCiB3ZWJraXRfd2ViX2NvbnRl eHRfZ2V0X3VzZV9zeXN0ZW1fYXBwZWFyYW5jZV9mb3Jfc2Nyb2xsYmFycyAoV2ViS2l0V2ViQ29u dGV4dCAgICAgICpjb250ZXh0KTsKIAotV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfd2ViX2NvbnRl eHRfc2V0X3RpbWVfem9uZV9vdmVycmlkZSAgICAgICAgICAgKFdlYktpdFdlYkNvbnRleHQgICAg ICAgICAgICAgICpjb250ZXh0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgICAgICAgICAqdGltZV96b25l X292ZXJyaWRlKTsKLQogV0VCS0lUX0FQSSBjb25zdCBnY2hhcioKIHdlYmtpdF93ZWJfY29udGV4 dF9nZXRfdGltZV96b25lX292ZXJyaWRlICAgICAgICAgICAoV2ViS2l0V2ViQ29udGV4dCAgICAg ICAgICAgICAgKmNvbnRleHQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvd3BlL1dlYktpdFdlYkNvbnRleHQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS93cGUvV2ViS2l0V2ViQ29udGV4dC5oCmluZGV4IGVhNTVmODc2YzMxZWJkMGJlYmViNGJiZmRj YWNjOTM3YTljNzk3YmIuLjU4YjAwZWUwYjNhZTViYzA4NmI1NTA0MTlhZDUwZDNiZTUwOWYxYTAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0V2ViQ29u dGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0V2ViQ29u dGV4dC5oCkBAIC0yOTEsMTAgKzI5MSw2IEBAIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3dlYl9j b250ZXh0X3NlbmRfbWVzc2FnZV90b19hbGxfZXh0ZW5zaW9ucyAgIChXZWJLaXRXZWJDb250ZXh0 ICAgICAgICAgICAgICAqY29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgV2ViS2l0VXNlck1lc3NhZ2UgICAgICAgICAgICAgKm1lc3Nh Z2UpOwogCi1XRUJLSVRfQVBJIHZvaWQKLXdlYmtpdF93ZWJfY29udGV4dF9zZXRfdGltZV96b25l X292ZXJyaWRlICAgICAgICAgICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAgICAgICAgKmNvbnRl eHQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGdjaGFyICAgICAgICAgICAgICAgICAgICp0aW1lX3pvbmVfb3ZlcnJpZGUpOwotCiBX RUJLSVRfQVBJIGNvbnN0IGdjaGFyKgogd2Via2l0X3dlYl9jb250ZXh0X2dldF90aW1lX3pvbmVf b3ZlcnJpZGUgICAgICAgICAgIChXZWJLaXRXZWJDb250ZXh0ICAgICAgICAgICAgICAqY29udGV4 dCk7CiAK