209290 2020-03-19 10:14:41 -0700 [GStreamer] Fail gracefully in the absence of a WebVTT encoder. 2020-03-24 08:07:37 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cturner cturner calvaris cgarcia ews-watchlist gustavo mcrha menard pnormand vjaquez webkit-bug-importer oldest_to_newest 1631709 0 cturner 2020-03-19 10:14:41 -0700 [GStreamer] Fail gracefully in the absence of a WebVTT encoder. 1631711 1 393990 cturner 2020-03-19 10:15:06 -0700 Created attachment 393990 Patch 1631722 2 393990 cturner 2020-03-19 10:25:17 -0700 Comment on attachment 393990 Patch This is not quite right yet... Taking off the review. 1632054 3 394077 cturner 2020-03-20 05:29:29 -0700 Created attachment 394077 Patch 1632057 4 394077 pnormand 2020-03-20 05:34:32 -0700 Comment on attachment 394077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394077&action=review > Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:261 > + GRefPtr<GstElementFactory> elementFactory = gst_element_factory_find("fdkaacdec"); This is transfer-full. Shouldn't we adopt the ref? > Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:267 > + GRefPtr<GstElementFactory> avAACDecoderFactory = gst_element_factory_find(elementNames[i]); Ditto 1632066 5 394079 cturner 2020-03-20 06:25:54 -0700 Created attachment 394079 Patch Fix reference leak, thanks for the review! 1632790 6 ews-feeder 2020-03-23 04:04:03 -0700 Committed r258832: <https://trac.webkit.org/changeset/258832> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394079. 1632791 7 webkit-bug-importer 2020-03-23 04:05:13 -0700 <rdar://problem/60767735> 1633251 8 mcrha 2020-03-24 01:43:56 -0700 Could you claim that: > WTFLogAlways("WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec"); only once per run or anything like that, please? It's boring to see it again and again, on every WebView creation (tried this with WebKitWebView from WebKitGTK+, a new WebView means a new warning on the console). 1633263 9 mcrha 2020-03-24 02:34:05 -0700 I just noticed, the "warning" also shows whenever the inspector is show. I can hide it and show it and it prints the "warning" again. 1633275 10 cturner 2020-03-24 04:32:54 -0700 (In reply to Milan Crha from comment #8) > Could you claim that: > > WTFLogAlways("WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec"); > only once per run or anything like that, please? Due to the multi-process design of WebKit, GStreamer is initialized for each WebView you create. Accounting for whether other *processes* have issued a message is more trouble than its worth in this (special) case. > It's boring to see it again and again. The point is to nag you about a potentially broken system configuration and have you install the FDK AAC Codec Library. However, https://ffmpeg.org/pipermail/ffmpeg-devel/2019-July/247063.html, the upstream report for issues found in FFmpeg's implementation, has seen no follow-up, so the validity of the original checks are also questionable. For these reasons I will simply remove the warning, but leave the rank adjustments for users who have installed the alternative AAC decoder. 1633286 11 mcrha 2020-03-24 05:57:08 -0700 (In reply to Charlie Turner from comment #10) > The point is to nag you about a potentially broken system configuration and > have you install the FDK AAC Codec Library. Right, I understood that it is vital for some use cases (to help diagnose a problem), but not for all. In my case, I do not expect WebKitGTK+ to do any of that, it's used to render emails, which are controlled a lot. It can use GStreamer for audio/video attachments, but it doesn't mean I want to see it all the time. I have also unit tests and it's quite bad to see the warning after every single test run, like below. It's nothing pleasant. When something breaks for the users of the project I work on, there are instructions on how to enable additional debugging, which enables such prints. That makes it possible to claim, but not to bother the users. WebKit has something like WEBKIT_DEBUG environment variable, right? Maybe it should consider it. The output from one of my unit test runs: /paste/singleline-html2html: [rsvg_internals/src/svg.rs:84] &self.load_options.base_url = None WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/singleline-html2plain: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/singleline-plain2html: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/singleline-plain2plain: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/multiline-html2html: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/multiline-html2plain: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/multiline-div-html2html: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/multiline-div-html2plain: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/multiline-p-html2html: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/multiline-p-html2plain: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/multiline-plain2html: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/multiline-plain2plain: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec OK /paste/quoted-singleline-html2html: WARNING: You might have broken LC support in your AAC decoders, consider installing fdkaacdec 1633288 12 cturner 2020-03-24 06:29:36 -0700 (In reply to Milan Crha from comment #11) > (In reply to Charlie Turner from comment #10) > > The point is to nag you about a potentially broken system configuration and > > have you install the FDK AAC Codec Library. > > Right, I understood that it is vital for some use cases (to help diagnose a > problem), but not for all. Sorry for the noise. I decided to remove the warning in https://bugs.webkit.org/show_bug.cgi?id=209472 mostly because it's not clear exactly what is "broken", so its a bad warning anyway. The upstream FFmpeg bug should be followed up to find out more and I'll stop bothering users about it :) 1633298 13 mcrha 2020-03-24 08:07:37 -0700 Okay, thanks a lot. 393990 2020-03-19 10:15:06 -0700 2020-03-20 05:29:26 -0700 Patch bug-209290-20200319171505.patch text/plain 2123 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ3OTUwODc0MGZjZjk4 NGYwYTgyNWRiMDY5YTAzOTgyMTcxM2NkOC4uZDBmYjMxNmVmM2QxYjI2Zjg4ODVlM2I5ODg4OTc1 Mzc1YWYyMjNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAzLTE5ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBG YWlsIGdyYWNlZnVsbHkgaW4gdGhlIGFic2VuY2Ugb2YgYSBXZWJWVFQgZW5jb2Rlci4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTI5MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAo T09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RleHRDb21i aW5lckdTdHJlYW1lci5jcHA6CisgICAgICAgICh3ZWJraXRfdGV4dF9jb21iaW5lcl9jbGFzc19p bml0KToKKyAgICAgICAgKHdlYmtpdFRleHRDb21iaW5lck5ldyk6CisKIDIwMjAtMDMtMTkgIENo YXJsaWUgVHVybmVyICA8Y3R1cm5lckBpZ2FsaWEuY29tPgogCiAgICAgICAgIEZpeCBtYW55IHdh cm5pbmdzIHdpdGggQ2xhbmcgNy4wIG9uIEdUSyB4ODYtNjQgaW4gRGVidWcuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVGV4dENvbWJpbmVy R1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwCmluZGV4IDY2NDIxMjZkMjE3NjNjNzJlZjY5N2Yw MjIyYjc4YzJiZGJlYmY1MDkuLmMwNzhmY2YwNDI3M2NhMGIyZmRkOTcxZDYxMTAyODk5ZWU2ODgz NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwCkBAIC0yNzMsNiAr MjczLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3RleHRfY29tYmluZXJfY2xhc3NfaW5pdChXZWJL aXRUZXh0Q29tYmluZXJDbGFzcyoga2xhc3MpCiAgICAgICAgIEdTVF9ERUJVR19GVU5DUFRSKHdl YmtpdFRleHRDb21iaW5lclJlbGVhc2VQYWQpOwogCiAgICAgR1JlZlB0cjxHc3RFbGVtZW50RmFj dG9yeT4gd2ViVlRURW5jRmFjdG9yeSA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9mYWN0b3J5X2Zp bmQoIndlYnZ0dGVuYyIpKTsKKyAgICBBU1NFUlQod2ViVlRURW5jRmFjdG9yeSk7CiAgICAgZ3N0 X29iamVjdF91bnJlZihnc3RfcGx1Z2luX2ZlYXR1cmVfbG9hZChHU1RfUExVR0lOX0ZFQVRVUkUo d2ViVlRURW5jRmFjdG9yeS5nZXQoKSkpKTsKICAgICB3ZWJWVFRFbmNUeXBlID0gZ3N0X2VsZW1l bnRfZmFjdG9yeV9nZXRfZWxlbWVudF90eXBlKHdlYlZUVEVuY0ZhY3RvcnkuZ2V0KCkpOwogICAg IEFTU0VSVCh3ZWJWVFRFbmNUeXBlKTsKQEAgLTI5Miw2ICsyOTMsMTEgQEAgc3RhdGljIHZvaWQg d2Via2l0X3RleHRfY29tYmluZXJfcGFkX2NsYXNzX2luaXQoV2ViS2l0VGV4dENvbWJpbmVyUGFk Q2xhc3MqIGtsYXMKIAogR3N0RWxlbWVudCogd2Via2l0VGV4dENvbWJpbmVyTmV3KCkKIHsKKyAg ICBpZiAoIVdlYkNvcmU6OmlzR1N0cmVhbWVyUGx1Z2luQXZhaWxhYmxlKCJ3ZWJ2dHRlbmMiKSkg eworICAgICAgICBXVEZMb2dBbHdheXMoIldlYktpdCB3YXNuJ3QgYWJsZSB0byBmaW5kIGEgV2Vi VlRUIGVuY29kZXIuIE5vdCBjb250aW51aW5nIHdpdGhvdXQgcGxhdGZvcm0gc3VwcG9ydCBmb3Ig c3VidGl0bGVzLiIpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKICAgICByZXR1 cm4gR1NUX0VMRU1FTlQoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1RFWFRfQ09NQklORVIsIG51 bGxwdHIpKTsKIH0KIAo= 394077 2020-03-20 05:29:29 -0700 2020-03-20 06:25:51 -0700 Patch bug-209290-20200320122928.patch text/plain 4691 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ3OTUwODc0MGZjZjk4 NGYwYTgyNWRiMDY5YTAzOTgyMTcxM2NkOC4uNDNiMjcyYTQ2YTg5MTJiODI2MmQzMzkzMDc3NGRi YzE5MGExNmUxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAzLTE5ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBG YWlsIGdyYWNlZnVsbHkgaW4gdGhlIGFic2VuY2Ugb2YgYSBXZWJWVFQgZW5jb2Rlci4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTI5MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhp c3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyQ29tbW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluaXRpYWxpemVHU3RyZWFtZXIp OiBHZXRzIHJpZCBvZiAicGx1Z2luIG5vdCBmb3VuZCIKKyAgICAgICAgZXJyb3JzLiBJdCdzIG5v dCBhbiBlcnJvciB0byBoYXZlIHBvdGVudGlhbGx5IGJyb2tlbiBBQUMgZGVjb2RlcnMsCisgICAg ICAgIGJ1dCBpdCdzIG5pY2UgdG8gZ2l2ZSBhIGNsZWFyIHdhcm5pbmcuCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RleHRDb21iaW5lckdTdHJlYW1lci5jcHA6CisgICAg ICAgICh3ZWJraXRfdGV4dF9jb21iaW5lcl9jbGFzc19pbml0KToKKyAgICAgICAgKHdlYmtpdFRl eHRDb21iaW5lck5ldyk6IENoZWNrIGZvciB0aGUgInN1YmVuYyIgKnBsdWdpbiouIFRoaXMKKyAg ICAgICAgY2hlY2sgaW5kaXJlY3RseSB0ZWxscyB1cyB0aGUgIndlYnZ0dGVuYyIgKmVsZW1lbnQq IHdpbGwgZXhpc3QuCisKIDIwMjAtMDMtMTkgIENoYXJsaWUgVHVybmVyICA8Y3R1cm5lckBpZ2Fs aWEuY29tPgogCiAgICAgICAgIEZpeCBtYW55IHdhcm5pbmdzIHdpdGggQ2xhbmcgNy4wIG9uIEdU SyB4ODYtNjQgaW4gRGVidWcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCmluZGV4IDA4OWJm NzRmNzRlYzY0YTZmODA0NDVjMzUzZGRhMzUxMmFiMzU0ZDQuLmMxNmZmZjU3YTg4MDZmMmQ2ZWEz ZTJiZmM5YWJmNjM2MTIwNjA1MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCkBAIC0y NTgsMTggKzI1OCwxOCBAQCBib29sIGluaXRpYWxpemVHU3RyZWFtZXIoT3B0aW9uYWw8VmVjdG9y PFN0cmluZz4+JiYgb3B0aW9ucykKICAgICAgICAgLy8gSWYgdGhlIEZESy1BQUMgZGVjb2RlciBp cyBhdmFpbGFibGUsIHByb21vdGUgaXQgYW5kIGRvd25yYW5rIHRoZQogICAgICAgICAvLyBsaWJh diBBQUMgZGVjb2RlcnMsIGR1ZSB0byB0aGVpciBicm9rZW4gTEMgc3VwcG9ydCwgYXMgcmVwb3J0 ZWQgaW46CiAgICAgICAgIC8vIGh0dHBzOi8vZmZtcGVnLm9yZy9waXBlcm1haWwvZmZtcGVnLWRl dmVsLzIwMTktSnVseS8yNDcwNjMuaHRtbAotICAgICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IGFh Y0RlY29kZXIgPSBnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoImZka2FhY2RlYyIsIG51bGxwdHIp OwotICAgICAgICBpZiAoYWFjRGVjb2RlcikgewotICAgICAgICAgICAgR3N0RWxlbWVudEZhY3Rv cnkqIGZhY3RvcnkgPSBnc3RfZWxlbWVudF9nZXRfZmFjdG9yeShhYWNEZWNvZGVyLmdldCgpKTsK LSAgICAgICAgICAgIGdzdF9wbHVnaW5fZmVhdHVyZV9zZXRfcmFuayhHU1RfUExVR0lOX0ZFQVRV UkVfQ0FTVChmYWN0b3J5KSwgR1NUX1JBTktfUFJJTUFSWSk7CisgICAgICAgIEdSZWZQdHI8R3N0 RWxlbWVudEZhY3Rvcnk+IGVsZW1lbnRGYWN0b3J5ID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9maW5k KCJmZGthYWNkZWMiKTsKKyAgICAgICAgaWYgKGVsZW1lbnRGYWN0b3J5KSB7CisgICAgICAgICAg ICBnc3RfcGx1Z2luX2ZlYXR1cmVfc2V0X3JhbmsoR1NUX1BMVUdJTl9GRUFUVVJFX0NBU1QoZWxl bWVudEZhY3RvcnkuZ2V0KCkpLCBHU1RfUkFOS19QUklNQVJZKTsKIAogICAgICAgICAgICAgY29u c3QgY2hhciogY29uc3QgZWxlbWVudE5hbWVzW10gPSB7ImF2ZGVjX2FhYyIsICJhdmRlY19hYWNf Zml4ZWQiLCAiYXZkZWNfYWFjX2xhdG0ifTsKICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBHX05fRUxFTUVOVFMoZWxlbWVudE5hbWVzKTsgaSsrKSB7Ci0gICAgICAgICAgICAg ICAgR1JlZlB0cjxHc3RFbGVtZW50PiBhdkFBQ0RlY29kZXIgPSBnc3RfZWxlbWVudF9mYWN0b3J5 X21ha2UoZWxlbWVudE5hbWVzW2ldLCBudWxscHRyKTsKLSAgICAgICAgICAgICAgICBpZiAoYXZB QUNEZWNvZGVyKQotICAgICAgICAgICAgICAgICAgICBnc3RfcGx1Z2luX2ZlYXR1cmVfc2V0X3Jh bmsoR1NUX1BMVUdJTl9GRUFUVVJFX0NBU1QoZ3N0X2VsZW1lbnRfZ2V0X2ZhY3RvcnkoYXZBQUNE ZWNvZGVyLmdldCgpKSksIEdTVF9SQU5LX01BUkdJTkFMKTsKKyAgICAgICAgICAgICAgICBHUmVm UHRyPEdzdEVsZW1lbnRGYWN0b3J5PiBhdkFBQ0RlY29kZXJGYWN0b3J5ID0gZ3N0X2VsZW1lbnRf ZmFjdG9yeV9maW5kKGVsZW1lbnROYW1lc1tpXSk7CisgICAgICAgICAgICAgICAgaWYgKGF2QUFD RGVjb2RlckZhY3RvcnkpCisgICAgICAgICAgICAgICAgICAgIGdzdF9wbHVnaW5fZmVhdHVyZV9z ZXRfcmFuayhHU1RfUExVR0lOX0ZFQVRVUkVfQ0FTVChhdkFBQ0RlY29kZXJGYWN0b3J5LmdldCgp KSwgR1NUX1JBTktfTUFSR0lOQUwpOwogICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJXQVJOSU5HOiBZb3UgbWlnaHQgaGF2 ZSBicm9rZW4gTEMgc3VwcG9ydCBpbiB5b3VyIEFBQyBkZWNvZGVycywgY29uc2lkZXIgaW5zdGFs bGluZyBmZGthYWNkZWMiKTsKIAogI2VuZGlmCiAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVGV4dENvbWJpbmVyR1N0cmVhbWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9UZXh0Q29t YmluZXJHU3RyZWFtZXIuY3BwCmluZGV4IDY2NDIxMjZkMjE3NjNjNzJlZjY5N2YwMjIyYjc4YzJi ZGJlYmY1MDkuLjg5MDEzNjBjYzUxY2ViMDliZjBlODc5NTI2YTI4ZjMxOWNhZDAzMmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9UZXh0Q29t YmluZXJHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwCkBAIC0yNzMsNiArMjczLDcgQEAg c3RhdGljIHZvaWQgd2Via2l0X3RleHRfY29tYmluZXJfY2xhc3NfaW5pdChXZWJLaXRUZXh0Q29t YmluZXJDbGFzcyoga2xhc3MpCiAgICAgICAgIEdTVF9ERUJVR19GVU5DUFRSKHdlYmtpdFRleHRD b21iaW5lclJlbGVhc2VQYWQpOwogCiAgICAgR1JlZlB0cjxHc3RFbGVtZW50RmFjdG9yeT4gd2Vi VlRURW5jRmFjdG9yeSA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9mYWN0b3J5X2ZpbmQoIndlYnZ0 dGVuYyIpKTsKKyAgICBBU1NFUlQod2ViVlRURW5jRmFjdG9yeSk7CiAgICAgZ3N0X29iamVjdF91 bnJlZihnc3RfcGx1Z2luX2ZlYXR1cmVfbG9hZChHU1RfUExVR0lOX0ZFQVRVUkUod2ViVlRURW5j RmFjdG9yeS5nZXQoKSkpKTsKICAgICB3ZWJWVFRFbmNUeXBlID0gZ3N0X2VsZW1lbnRfZmFjdG9y eV9nZXRfZWxlbWVudF90eXBlKHdlYlZUVEVuY0ZhY3RvcnkuZ2V0KCkpOwogICAgIEFTU0VSVCh3 ZWJWVFRFbmNUeXBlKTsKQEAgLTI5Miw2ICsyOTMsMTIgQEAgc3RhdGljIHZvaWQgd2Via2l0X3Rl eHRfY29tYmluZXJfcGFkX2NsYXNzX2luaXQoV2ViS2l0VGV4dENvbWJpbmVyUGFkQ2xhc3MqIGts YXMKIAogR3N0RWxlbWVudCogd2Via2l0VGV4dENvbWJpbmVyTmV3KCkKIHsKKyAgICAvLyBUaGUg Y29tYmluZXIgcmVsaWVzIG9uIHdlYnZ0dGVuYywgZmFpbCBlYXJseSBpZiBpdCdzIG5vdCB0aGVy ZS4KKyAgICBpZiAoIVdlYkNvcmU6OmlzR1N0cmVhbWVyUGx1Z2luQXZhaWxhYmxlKCJzdWJlbmMi KSkgeworICAgICAgICBXVEZMb2dBbHdheXMoIldlYktpdCB3YXNuJ3QgYWJsZSB0byBmaW5kIGEg V2ViVlRUIGVuY29kZXIuIE5vdCBjb250aW51aW5nIHdpdGhvdXQgcGxhdGZvcm0gc3VwcG9ydCBm b3Igc3VidGl0bGVzLiIpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKICAgICBy ZXR1cm4gR1NUX0VMRU1FTlQoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1RFWFRfQ09NQklORVIs IG51bGxwdHIpKTsKIH0KIAo= 394079 2020-03-20 06:25:54 -0700 2020-03-23 04:04:04 -0700 Patch bug-209290-20200320132553.patch text/plain 4713 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ3OTUwODc0MGZjZjk4 NGYwYTgyNWRiMDY5YTAzOTgyMTcxM2NkOC4uNDNiMjcyYTQ2YTg5MTJiODI2MmQzMzkzMDc3NGRi YzE5MGExNmUxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAzLTE5ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBG YWlsIGdyYWNlZnVsbHkgaW4gdGhlIGFic2VuY2Ugb2YgYSBXZWJWVFQgZW5jb2Rlci4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTI5MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhp c3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyQ29tbW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluaXRpYWxpemVHU3RyZWFtZXIp OiBHZXRzIHJpZCBvZiAicGx1Z2luIG5vdCBmb3VuZCIKKyAgICAgICAgZXJyb3JzLiBJdCdzIG5v dCBhbiBlcnJvciB0byBoYXZlIHBvdGVudGlhbGx5IGJyb2tlbiBBQUMgZGVjb2RlcnMsCisgICAg ICAgIGJ1dCBpdCdzIG5pY2UgdG8gZ2l2ZSBhIGNsZWFyIHdhcm5pbmcuCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RleHRDb21iaW5lckdTdHJlYW1lci5jcHA6CisgICAg ICAgICh3ZWJraXRfdGV4dF9jb21iaW5lcl9jbGFzc19pbml0KToKKyAgICAgICAgKHdlYmtpdFRl eHRDb21iaW5lck5ldyk6IENoZWNrIGZvciB0aGUgInN1YmVuYyIgKnBsdWdpbiouIFRoaXMKKyAg ICAgICAgY2hlY2sgaW5kaXJlY3RseSB0ZWxscyB1cyB0aGUgIndlYnZ0dGVuYyIgKmVsZW1lbnQq IHdpbGwgZXhpc3QuCisKIDIwMjAtMDMtMTkgIENoYXJsaWUgVHVybmVyICA8Y3R1cm5lckBpZ2Fs aWEuY29tPgogCiAgICAgICAgIEZpeCBtYW55IHdhcm5pbmdzIHdpdGggQ2xhbmcgNy4wIG9uIEdU SyB4ODYtNjQgaW4gRGVidWcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCmluZGV4IDA4OWJm NzRmNzRlYzY0YTZmODA0NDVjMzUzZGRhMzUxMmFiMzU0ZDQuLmY5ZWJiY2JkZTVjMGU1ZTkyZWIw N2JjODExNDlkOTJmZWViZDBmZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCkBAIC0y NTgsMTggKzI1OCwxOCBAQCBib29sIGluaXRpYWxpemVHU3RyZWFtZXIoT3B0aW9uYWw8VmVjdG9y PFN0cmluZz4+JiYgb3B0aW9ucykKICAgICAgICAgLy8gSWYgdGhlIEZESy1BQUMgZGVjb2RlciBp cyBhdmFpbGFibGUsIHByb21vdGUgaXQgYW5kIGRvd25yYW5rIHRoZQogICAgICAgICAvLyBsaWJh diBBQUMgZGVjb2RlcnMsIGR1ZSB0byB0aGVpciBicm9rZW4gTEMgc3VwcG9ydCwgYXMgcmVwb3J0 ZWQgaW46CiAgICAgICAgIC8vIGh0dHBzOi8vZmZtcGVnLm9yZy9waXBlcm1haWwvZmZtcGVnLWRl dmVsLzIwMTktSnVseS8yNDcwNjMuaHRtbAotICAgICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IGFh Y0RlY29kZXIgPSBnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoImZka2FhY2RlYyIsIG51bGxwdHIp OwotICAgICAgICBpZiAoYWFjRGVjb2RlcikgewotICAgICAgICAgICAgR3N0RWxlbWVudEZhY3Rv cnkqIGZhY3RvcnkgPSBnc3RfZWxlbWVudF9nZXRfZmFjdG9yeShhYWNEZWNvZGVyLmdldCgpKTsK LSAgICAgICAgICAgIGdzdF9wbHVnaW5fZmVhdHVyZV9zZXRfcmFuayhHU1RfUExVR0lOX0ZFQVRV UkVfQ0FTVChmYWN0b3J5KSwgR1NUX1JBTktfUFJJTUFSWSk7CisgICAgICAgIEdSZWZQdHI8R3N0 RWxlbWVudEZhY3Rvcnk+IGVsZW1lbnRGYWN0b3J5ID0gYWRvcHRHUmVmKGdzdF9lbGVtZW50X2Zh Y3RvcnlfZmluZCgiZmRrYWFjZGVjIikpOworICAgICAgICBpZiAoZWxlbWVudEZhY3RvcnkpIHsK KyAgICAgICAgICAgIGdzdF9wbHVnaW5fZmVhdHVyZV9zZXRfcmFuayhHU1RfUExVR0lOX0ZFQVRV UkVfQ0FTVChlbGVtZW50RmFjdG9yeS5nZXQoKSksIEdTVF9SQU5LX1BSSU1BUlkpOwogCiAgICAg ICAgICAgICBjb25zdCBjaGFyKiBjb25zdCBlbGVtZW50TmFtZXNbXSA9IHsiYXZkZWNfYWFjIiwg ImF2ZGVjX2FhY19maXhlZCIsICJhdmRlY19hYWNfbGF0bSJ9OwogICAgICAgICAgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IEdfTl9FTEVNRU5UUyhlbGVtZW50TmFtZXMpOyBpKyspIHsKLSAg ICAgICAgICAgICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IGF2QUFDRGVjb2RlciA9IGdzdF9lbGVt ZW50X2ZhY3RvcnlfbWFrZShlbGVtZW50TmFtZXNbaV0sIG51bGxwdHIpOwotICAgICAgICAgICAg ICAgIGlmIChhdkFBQ0RlY29kZXIpCi0gICAgICAgICAgICAgICAgICAgIGdzdF9wbHVnaW5fZmVh dHVyZV9zZXRfcmFuayhHU1RfUExVR0lOX0ZFQVRVUkVfQ0FTVChnc3RfZWxlbWVudF9nZXRfZmFj dG9yeShhdkFBQ0RlY29kZXIuZ2V0KCkpKSwgR1NUX1JBTktfTUFSR0lOQUwpOworICAgICAgICAg ICAgICAgIEdSZWZQdHI8R3N0RWxlbWVudEZhY3Rvcnk+IGF2QUFDRGVjb2RlckZhY3RvcnkgPSBh ZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZmFjdG9yeV9maW5kKGVsZW1lbnROYW1lc1tpXSkpOworICAg ICAgICAgICAgICAgIGlmIChhdkFBQ0RlY29kZXJGYWN0b3J5KQorICAgICAgICAgICAgICAgICAg ICBnc3RfcGx1Z2luX2ZlYXR1cmVfc2V0X3JhbmsoR1NUX1BMVUdJTl9GRUFUVVJFX0NBU1QoYXZB QUNEZWNvZGVyRmFjdG9yeS5nZXQoKSksIEdTVF9SQU5LX01BUkdJTkFMKTsKICAgICAgICAgICAg IH0KLSAgICAgICAgfQorICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygi V0FSTklORzogWW91IG1pZ2h0IGhhdmUgYnJva2VuIExDIHN1cHBvcnQgaW4geW91ciBBQUMgZGVj b2RlcnMsIGNvbnNpZGVyIGluc3RhbGxpbmcgZmRrYWFjZGVjIik7CiAKICNlbmRpZgogICAgIH0p OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L1RleHRDb21iaW5lckdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvVGV4dENvbWJpbmVyR1N0cmVhbWVyLmNwcAppbmRleCA2NjQyMTI2ZDIx NzYzYzcyZWY2OTdmMDIyMmI3OGMyYmRiZWJmNTA5Li44OTAxMzYwY2M1MWNlYjA5YmYwZTg3OTUy NmEyOGYzMTljYWQwMzJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvVGV4dENvbWJpbmVyR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVGV4dENvbWJpbmVyR1N0cmVhbWVyLmNw cApAQCAtMjczLDYgKzI3Myw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF90ZXh0X2NvbWJpbmVyX2Ns YXNzX2luaXQoV2ViS2l0VGV4dENvbWJpbmVyQ2xhc3MqIGtsYXNzKQogICAgICAgICBHU1RfREVC VUdfRlVOQ1BUUih3ZWJraXRUZXh0Q29tYmluZXJSZWxlYXNlUGFkKTsKIAogICAgIEdSZWZQdHI8 R3N0RWxlbWVudEZhY3Rvcnk+IHdlYlZUVEVuY0ZhY3RvcnkgPSBhZG9wdEdSZWYoZ3N0X2VsZW1l bnRfZmFjdG9yeV9maW5kKCJ3ZWJ2dHRlbmMiKSk7CisgICAgQVNTRVJUKHdlYlZUVEVuY0ZhY3Rv cnkpOwogICAgIGdzdF9vYmplY3RfdW5yZWYoZ3N0X3BsdWdpbl9mZWF0dXJlX2xvYWQoR1NUX1BM VUdJTl9GRUFUVVJFKHdlYlZUVEVuY0ZhY3RvcnkuZ2V0KCkpKSk7CiAgICAgd2ViVlRURW5jVHlw ZSA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfZ2V0X2VsZW1lbnRfdHlwZSh3ZWJWVFRFbmNGYWN0b3J5 LmdldCgpKTsKICAgICBBU1NFUlQod2ViVlRURW5jVHlwZSk7CkBAIC0yOTIsNiArMjkzLDEyIEBA IHN0YXRpYyB2b2lkIHdlYmtpdF90ZXh0X2NvbWJpbmVyX3BhZF9jbGFzc19pbml0KFdlYktpdFRl eHRDb21iaW5lclBhZENsYXNzKiBrbGFzCiAKIEdzdEVsZW1lbnQqIHdlYmtpdFRleHRDb21iaW5l ck5ldygpCiB7CisgICAgLy8gVGhlIGNvbWJpbmVyIHJlbGllcyBvbiB3ZWJ2dHRlbmMsIGZhaWwg ZWFybHkgaWYgaXQncyBub3QgdGhlcmUuCisgICAgaWYgKCFXZWJDb3JlOjppc0dTdHJlYW1lclBs dWdpbkF2YWlsYWJsZSgic3ViZW5jIikpIHsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJXZWJLaXQg d2Fzbid0IGFibGUgdG8gZmluZCBhIFdlYlZUVCBlbmNvZGVyLiBOb3QgY29udGludWluZyB3aXRo b3V0IHBsYXRmb3JtIHN1cHBvcnQgZm9yIHN1YnRpdGxlcy4iKTsKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisgICAgfQorCiAgICAgcmV0dXJuIEdTVF9FTEVNRU5UKGdfb2JqZWN0X25ldyhXRUJL SVRfVFlQRV9URVhUX0NPTUJJTkVSLCBudWxscHRyKSk7CiB9CiAK