<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>228186</bug_id>
          
          <creation_ts>2021-07-22 09:35:41 -0700</creation_ts>
          <short_desc>[Win] Crash under FontCache::lastResortFallbackFont</short_desc>
          <delta_ts>2021-08-21 15:04:49 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit Misc.</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=229009</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Per Arne Vollan">pvollan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fujii</cc>
    
    <cc>mmaxfield</cc>
    
    <cc>ryanhaddad</cc>
    
    <cc>webkit-bot-watchers-bugzilla</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1778724</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-22 09:35:41 -0700</bug_when>
    <thetext>Frame[00]  Triage Symbol: [WebKit!WebCore::FontCache::lastResortFallbackFont+0xec]
    Frame[01]  Triage Symbol: [WebKit!WebCore::FontCascadeFonts::realizeFallbackRangesAt+0x271]
    Frame[02]  Triage Symbol: [WebKit!WebCore::FontCascade::primaryFont+0x35]
    Frame[03]  Triage Symbol: [WebKit!WebCore::LayoutIntegration::canUseForFontAndText+0x44]
    Frame[04]  Triage Symbol: [WebKit!WebCore::LayoutIntegration::canUseForChild+0x559]
    Frame[05]  Triage Symbol: [WebKit!WebCore::LayoutIntegration::canUseForLineLayoutWithReason+0x3e3]
    Frame[06]  Triage Symbol: [WebKit!WebCore::LayoutIntegration::LineLayout::canUseFor+0x2c]
    Frame[07]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutInlineChildren+0x2e]
    Frame[08]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlock+0x3b6]
    Frame[09]  Triage Symbol: [WebKit!WebCore::RenderBlock::layout+0x80]
    Frame[0a]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlockChild+0x292]
    Frame[0b]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlockChildren+0x47a]
    Frame[0c]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlock+0x3c1]
    Frame[0d]  Triage Symbol: [WebKit!WebCore::RenderBlock::layout+0x80]
    Frame[0e]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlockChild+0x292]
    Frame[0f]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlockChildren+0x47a]
    Frame[10]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlock+0x3c1]
    Frame[11]  Triage Symbol: [WebKit!WebCore::RenderBlock::layout+0x80]
    Frame[12]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlockChild+0x292]
    Frame[13]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlockChildren+0x47a]
    Frame[14]  Triage Symbol: [WebKit!WebCore::RenderBlockFlow::layoutBlock+0x3c1]
    Frame[15]  Triage Symbol: [WebKit!WebCore::RenderBlock::layout+0x80]
    Frame[16]  Triage Symbol: [WebKit!WebCore::RenderView::layout+0x2ed]
    Frame[17]  Triage Symbol: [WebKit!WebCore::FrameViewLayoutContext::layout+0x5bf]
    Frame[18]  Triage Symbol: [WebKit!WebCore::Document::implicitClose+0x32b]
    Frame[19]  Triage Symbol: [WebKit!WebCore::FrameLoader::checkCompleted+0x13f]
    Frame[1a]  Triage Symbol: [WebKit!WebCore::CachedResourceLoader::loadDone+0x80]
    Frame[1b]  Triage Symbol: [WebKit!WebCore::SubresourceLoader::notifyDone+0x55]
    Frame[1c]  Triage Symbol: [WebKit!WebCore::SubresourceLoader::didFinishLoading+0x286]
    Frame[1d]  Triage Symbol: [WebKit!&lt;lambda_e7e2d454785dfeaf6199132ec807941c&gt;::operator+0xec]
    Frame[1e]  Triage Symbol: [WTF!WTF::RunLoop::performWork+0x23f]
    Frame[1f]  Ignore Symbol: [WTF!WTF::RunLoop::RunLoopWndProc+0x5c]
    Frame[20]  Triage Symbol: [USER32!UserCallWinProcCheckWow+0x2bd]
    Frame[21]  Triage Symbol: [USER32!DispatchMessageWorker+0x1e2]
    Frame[22]  Triage Symbol: [DumpRenderTreeLib!runTest+0xaf8]
    Frame[23]  Triage Symbol: [DumpRenderTreeLib!main+0x5d3]
    Frame[24]  Triage Symbol: [DumpRenderTree!main+0x880]
    Frame[25]  Triage Symbol: [DumpRenderTree!__scrt_common_main_seh+0x10c]
    Frame[26]  Triage Symbol: [KERNEL32!BaseThreadInitThunk+0x14]
    Frame[27]  Triage Symbol: [ntdll!RtlUserThreadStart+0x21]</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1778726</commentid>
    <comment_count>1</comment_count>
      <attachid>434015</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-22 09:39:10 -0700</bug_when>
    <thetext>Created attachment 434015
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780403</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-07-29 09:37:12 -0700</bug_when>
    <thetext>&lt;rdar://problem/81275954&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780796</commentid>
    <comment_count>3</comment_count>
      <attachid>434630</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-07-30 08:27:04 -0700</bug_when>
    <thetext>Created attachment 434630
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781288</commentid>
    <comment_count>4</comment_count>
      <attachid>434766</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-08-02 10:05:53 -0700</bug_when>
    <thetext>Created attachment 434766
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781876</commentid>
    <comment_count>5</comment_count>
      <attachid>434902</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-08-04 07:31:19 -0700</bug_when>
    <thetext>Created attachment 434902
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781883</commentid>
    <comment_count>6</comment_count>
      <attachid>434902</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-08-04 08:10:45 -0700</bug_when>
    <thetext>Comment on attachment 434902
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=434902&amp;action=review

&gt; Source/WebKitLegacy/win/WebView.cpp:1327
&gt; +    if (hdc) {

I wonder if we should just have an early return if hdc is blank? But this is fine as-is.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785493</commentid>
    <comment_count>7</comment_count>
      <attachid>435874</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-08-19 09:34:39 -0700</bug_when>
    <thetext>Created attachment 435874
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785871</commentid>
    <comment_count>8</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2021-08-20 09:43:31 -0700</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #7)
&gt; Created attachment 435874 [details]
&gt; Patch
Though it ultimately passed on retry, it looks like the Win EWS run had a flaky crash, is this related to the patch?

https://ews-build.s3-us-west-2.amazonaws.com/Windows-EWS/r435874-101940-rerun/fast/forms/input-placeholder-paint-order-crash-log.txt</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785893</commentid>
    <comment_count>9</comment_count>
      <attachid>436006</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-08-20 10:16:12 -0700</bug_when>
    <thetext>Created attachment 436006
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785894</commentid>
    <comment_count>10</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-08-20 10:16:54 -0700</bug_when>
    <thetext>(In reply to Ryan Haddad from comment #8)
&gt; (In reply to Per Arne Vollan from comment #7)
&gt; &gt; Created attachment 435874 [details]
&gt; &gt; Patch
&gt; Though it ultimately passed on retry, it looks like the Win EWS run had a
&gt; flaky crash, is this related to the patch?
&gt; 
&gt; https://ews-build.s3-us-west-2.amazonaws.com/Windows-EWS/r435874-101940-
&gt; rerun/fast/forms/input-placeholder-paint-order-crash-log.txt

I think this should be resolved in the latest WIP patch.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786171</commentid>
    <comment_count>11</comment_count>
      <attachid>436006</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-08-21 14:59:48 -0700</bug_when>
    <thetext>Comment on attachment 436006
Patch

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786173</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-21 15:04:47 -0700</bug_when>
    <thetext>Committed r281380 (240795@main): &lt;https://commits.webkit.org/240795@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 436006.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434015</attachid>
            <date>2021-07-22 09:39:10 -0700</date>
            <delta_ts>2021-07-30 08:27:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228186-20210722093908.patch</filename>
            <type>text/plain</type>
            <size>1546</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4MDE3NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA3LTIyICBQZXIgQXJu
ZSAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIENyYXNoIHVuZGVyIEZvbnRD
YWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgQWRkIG51bGwgcG9pbnRlciBjaGVjay4KKworICAgICAgICAq
IHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6Rm9udENhY2hlOjpsYXN0UmVzb3J0RmFsbGJhY2tGb250KToKKwogMjAyMS0wNy0yMiAgRnLD
qWTDqXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KIAogICAgICAgICBudWxscHRyIGNyYXNo
IGluIEFwcGx5U3R5bGVDb21tYW5kOjphcHBseVJlbGF0aXZlRm9udFN0eWxlQ2hhbmdlCkluZGV4
OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENh
Y2hlV2luLmNwcAkocmV2aXNpb24gMjc5NjM5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyMCw4ICs0
MjAsMTEgQEAgUmVmPEZvbnQ+IEZvbnRDYWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRgogICAgICAg
ICB9CiAgICAgfSk7CiAKLSAgICBpZiAoIWZhbGxiYWNrRm9udE5hbWUuZ2V0KCkuaXNFbXB0eSgp
KQotICAgICAgICByZXR1cm4gKmZvbnRGb3JGYW1pbHkoZm9udERlc2NyaXB0aW9uLCBmYWxsYmFj
a0ZvbnROYW1lKTsKKyAgICBpZiAoIWZhbGxiYWNrRm9udE5hbWUuZ2V0KCkuaXNFbXB0eSgpKSB7
CisgICAgICAgIGF1dG8gZmFsbGJhY2tGb250ID0gZm9udEZvckZhbWlseShmb250RGVzY3JpcHRp
b24sIGZhbGxiYWNrRm9udE5hbWUpOworICAgICAgICBpZiAoZmFsbGJhY2tGb250KQorICAgICAg
ICAgICAgcmV0dXJuICpmYWxsYmFja0ZvbnQ7CisgICAgfQogCiAgICAgYXV0byBoRm9udCA9IGFk
b3B0R0RJT2JqZWN0KHN0YXRpY19jYXN0PEhGT05UPihHZXRTdG9ja09iamVjdChERUZBVUxUX0dV
SV9GT05UKSkpOwogICAgIEZvbnRQbGF0Zm9ybURhdGEgcGxhdGZvcm1EYXRhKFdURk1vdmUoaEZv
bnQpLCBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwgZmFsc2UsIGZhbHNlLCBm
YWxzZSk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434630</attachid>
            <date>2021-07-30 08:27:04 -0700</date>
            <delta_ts>2021-08-02 10:05:52 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228186-20210730082703.patch</filename>
            <type>text/plain</type>
            <size>2956</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4MDI5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA3LTIyICBQZXIgQXJu
ZSAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIENyYXNoIHVuZGVyIEZvbnRD
YWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgQWRkIG51bGwgcG9pbnRlciBjaGVjay4KKworICAgICAgICAq
IHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6Rm9udENhY2hlOjpsYXN0UmVzb3J0RmFsbGJhY2tGb250KToKKwogMjAyMS0wNy0yNiAgUGhp
bGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1BpcGV3aXJl
XSBNdXRpbmcgdGhlIGRpc3BsYXkgY2FwdHVyZSBjbG9zZXMgdGhlIFBvcnRhbCBzZXNzaW9uCklu
ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNw
cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9u
dENhY2hlV2luLmNwcAkocmV2aXNpb24gMjgwMjk0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyMCw4
ICs0MjAsMTEgQEAgUmVmPEZvbnQ+IEZvbnRDYWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRgogICAg
ICAgICB9CiAgICAgfSk7CiAKLSAgICBpZiAoIWZhbGxiYWNrRm9udE5hbWUuZ2V0KCkuaXNFbXB0
eSgpKQotICAgICAgICByZXR1cm4gKmZvbnRGb3JGYW1pbHkoZm9udERlc2NyaXB0aW9uLCBmYWxs
YmFja0ZvbnROYW1lKTsKKyAgICBpZiAoIWZhbGxiYWNrRm9udE5hbWUuZ2V0KCkuaXNFbXB0eSgp
KSB7CisgICAgICAgIGF1dG8gZmFsbGJhY2tGb250ID0gZm9udEZvckZhbWlseShmb250RGVzY3Jp
cHRpb24sIGZhbGxiYWNrRm9udE5hbWUpOworICAgICAgICBpZiAoZmFsbGJhY2tGb250KQorICAg
ICAgICAgICAgcmV0dXJuICpmYWxsYmFja0ZvbnQ7CisgICAgfQogCiAgICAgYXV0byBoRm9udCA9
IGFkb3B0R0RJT2JqZWN0KHN0YXRpY19jYXN0PEhGT05UPihHZXRTdG9ja09iamVjdChERUZBVUxU
X0dVSV9GT05UKSkpOwogICAgIEZvbnRQbGF0Zm9ybURhdGEgcGxhdGZvcm1EYXRhKFdURk1vdmUo
aEZvbnQpLCBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwgZmFsc2UsIGZhbHNl
LCBmYWxzZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3Jh
cGhpY3NDb250ZXh0Q0dXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5jcHAJKHJldmlzaW9uIDI4MDI5
NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRl
eHRDR1dpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDggKzUxLDEwIEBAIHN0YXRpYyBSZXRh
aW5QdHI8Q0dDb250ZXh0UmVmPiBDR0NvbnRleHQKICAgICAvLyBleGl0IGdyYWNlZnVsbHkgYW5k
IGxvb2sgYXQgaXQgbGF0ZXI6CiAgICAgLy8gIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD01MjA0MSAgIAogICAgIC8vIEFTU0VSVChiaXRtYXBCaXRzLmJpdHNQZXJQaXhl
bCgpID09IDMyKTsKLSAgICBpZiAocGl4ZWxEYXRhLmJpdHNQZXJQaXhlbCgpICE9IDMyKQorICAg
IGlmIChwaXhlbERhdGEuYml0c1BlclBpeGVsKCkgIT0gMzIpIHsKKyAgICAgICAgcHJpbnRmKHN0
ZGVyciwgIkludmFsaWQgYml0cyBwZXIgcGl4ZWwgcmVxdWVzdGVkOiAlZCIsIHBpeGVsRGF0YS5i
aXRzUGVyUGl4ZWwoKSk7CiAgICAgICAgIHJldHVybiAwOworICAgIH0KIAogICAgIENHQml0bWFw
SW5mbyBiaXRtYXBJbmZvID0ga0NHQml0bWFwQnl0ZU9yZGVyMzJMaXR0bGUgfCAoaGFzQWxwaGEg
PyBrQ0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZEZpcnN0IDoga0NHSW1hZ2VBbHBoYU5vbmVTa2lw
Rmlyc3QpOwogICAgIGF1dG8gY29udGV4dCA9IGFkb3B0Q0YoQ0dCaXRtYXBDb250ZXh0Q3JlYXRl
KHBpeGVsRGF0YS5idWZmZXIoKSwgcGl4ZWxEYXRhLnNpemUoKS53aWR0aCgpLCBwaXhlbERhdGEu
c2l6ZSgpLmhlaWdodCgpLCA4LCBwaXhlbERhdGEuYnl0ZXNQZXJSb3coKSwgc1JHQkNvbG9yU3Bh
Y2VSZWYoKSwgYml0bWFwSW5mbykpOwpAQCAtNzAsNyArNzIsOCBAQCBzdGF0aWMgUmV0YWluUHRy
PENHQ29udGV4dFJlZj4gQ0dDb250ZXh0CiBHcmFwaGljc0NvbnRleHRDRzo6R3JhcGhpY3NDb250
ZXh0Q0coSERDIGhkYywgYm9vbCBoYXNBbHBoYSkKICAgICA6IEdyYXBoaWNzQ29udGV4dENHKENH
Q29udGV4dFdpdGhIREMoaGRjLCBoYXNBbHBoYSkuZ2V0KCkpCiB7Ci0gICAgbV9kYXRhLT5tX2hk
YyA9IGhkYzsKKyAgICBpZiAobV9kYXRhKQorICAgICAgICBtX2RhdGEtPm1faGRjID0gaGRjOwog
fQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6cmVsZWFzZVdpbmRvd3NDb250ZXh0KEhEQyBoZGMs
IGNvbnN0IEludFJlY3QmIGRzdFJlY3QsIGJvb2wgc3VwcG9ydEFscGhhQmxlbmQpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434766</attachid>
            <date>2021-08-02 10:05:53 -0700</date>
            <delta_ts>2021-08-04 07:31:17 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228186-20210802100553.patch</filename>
            <type>text/plain</type>
            <size>2954</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4MDQwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA4LTAyICBQZXIgQXJu
ZSAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIENyYXNoIHVuZGVyIEZvbnRD
YWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgQWRkIG51bGwgcG9pbnRlciBjaGVjay4KKworICAgICAgICAq
IHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6Rm9udENhY2hlOjpsYXN0UmVzb3J0RmFsbGJhY2tGb250KToKKwogMjAyMS0wNy0yOCAgTXls
ZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJv
Y2Vzc10gU3RhcnQgdHJhY2tpbmcgcmVzb3VyY2UgdXNlcyBmb3IgSW1hZ2VCdWZmZXJzCkluZGV4
OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENh
Y2hlV2luLmNwcAkocmV2aXNpb24gMjgwNDA2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyMCw4ICs0
MjAsMTEgQEAgUmVmPEZvbnQ+IEZvbnRDYWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRgogICAgICAg
ICB9CiAgICAgfSk7CiAKLSAgICBpZiAoIWZhbGxiYWNrRm9udE5hbWUuZ2V0KCkuaXNFbXB0eSgp
KQotICAgICAgICByZXR1cm4gKmZvbnRGb3JGYW1pbHkoZm9udERlc2NyaXB0aW9uLCBmYWxsYmFj
a0ZvbnROYW1lKTsKKyAgICBpZiAoIWZhbGxiYWNrRm9udE5hbWUuZ2V0KCkuaXNFbXB0eSgpKSB7
CisgICAgICAgIGF1dG8gZmFsbGJhY2tGb250ID0gZm9udEZvckZhbWlseShmb250RGVzY3JpcHRp
b24sIGZhbGxiYWNrRm9udE5hbWUpOworICAgICAgICBpZiAoZmFsbGJhY2tGb250KQorICAgICAg
ICAgICAgcmV0dXJuICpmYWxsYmFja0ZvbnQ7CisgICAgfQogCiAgICAgYXV0byBoRm9udCA9IGFk
b3B0R0RJT2JqZWN0KHN0YXRpY19jYXN0PEhGT05UPihHZXRTdG9ja09iamVjdChERUZBVUxUX0dV
SV9GT05UKSkpOwogICAgIEZvbnRQbGF0Zm9ybURhdGEgcGxhdGZvcm1EYXRhKFdURk1vdmUoaEZv
bnQpLCBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwgZmFsc2UsIGZhbHNlLCBm
YWxzZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhp
Y3NDb250ZXh0Q0dXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5jcHAJKHJldmlzaW9uIDI4MDQwNikK
KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRD
R1dpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDggKzUxLDEwIEBAIHN0YXRpYyBSZXRhaW5Q
dHI8Q0dDb250ZXh0UmVmPiBDR0NvbnRleHQKICAgICAvLyBleGl0IGdyYWNlZnVsbHkgYW5kIGxv
b2sgYXQgaXQgbGF0ZXI6CiAgICAgLy8gIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD01MjA0MSAgIAogICAgIC8vIEFTU0VSVChiaXRtYXBCaXRzLmJpdHNQZXJQaXhlbCgp
ID09IDMyKTsKLSAgICBpZiAocGl4ZWxEYXRhLmJpdHNQZXJQaXhlbCgpICE9IDMyKQorICAgIGlm
IChwaXhlbERhdGEuYml0c1BlclBpeGVsKCkgIT0gMzIpIHsKKyAgICAgICAgZnByaW50ZihzdGRl
cnIsICJJbnZhbGlkIGJpdHMgcGVyIHBpeGVsIHJlcXVlc3RlZDogJWQiLCBwaXhlbERhdGEuYml0
c1BlclBpeGVsKCkpOwogICAgICAgICByZXR1cm4gMDsKKyAgICB9CiAKICAgICBDR0JpdG1hcElu
Zm8gYml0bWFwSW5mbyA9IGtDR0JpdG1hcEJ5dGVPcmRlcjMyTGl0dGxlIHwgKGhhc0FscGhhID8g
a0NHSW1hZ2VBbHBoYVByZW11bHRpcGxpZWRGaXJzdCA6IGtDR0ltYWdlQWxwaGFOb25lU2tpcEZp
cnN0KTsKICAgICBhdXRvIGNvbnRleHQgPSBhZG9wdENGKENHQml0bWFwQ29udGV4dENyZWF0ZShw
aXhlbERhdGEuYnVmZmVyKCksIHBpeGVsRGF0YS5zaXplKCkud2lkdGgoKSwgcGl4ZWxEYXRhLnNp
emUoKS5oZWlnaHQoKSwgOCwgcGl4ZWxEYXRhLmJ5dGVzUGVyUm93KCksIHNSR0JDb2xvclNwYWNl
UmVmKCksIGJpdG1hcEluZm8pKTsKQEAgLTcwLDcgKzcyLDggQEAgc3RhdGljIFJldGFpblB0cjxD
R0NvbnRleHRSZWY+IENHQ29udGV4dAogR3JhcGhpY3NDb250ZXh0Q0c6OkdyYXBoaWNzQ29udGV4
dENHKEhEQyBoZGMsIGJvb2wgaGFzQWxwaGEpCiAgICAgOiBHcmFwaGljc0NvbnRleHRDRyhDR0Nv
bnRleHRXaXRoSERDKGhkYywgaGFzQWxwaGEpLmdldCgpKQogewotICAgIG1fZGF0YS0+bV9oZGMg
PSBoZGM7CisgICAgaWYgKG1fZGF0YSkKKyAgICAgICAgbV9kYXRhLT5tX2hkYyA9IGhkYzsKIH0K
IAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnJlbGVhc2VXaW5kb3dzQ29udGV4dChIREMgaGRjLCBj
b25zdCBJbnRSZWN0JiBkc3RSZWN0LCBib29sIHN1cHBvcnRBbHBoYUJsZW5kKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434902</attachid>
            <date>2021-08-04 07:31:19 -0700</date>
            <delta_ts>2021-08-19 09:34:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228186-20210804073118.patch</filename>
            <type>text/plain</type>
            <size>2759</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT
b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4MDYzMykKKysrIFNv
dXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx
LDEzIEBACisyMDIxLTA4LTA0ICBQZXIgQXJuZSAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAg
ICAgIFtXaW5dIENyYXNoIHVuZGVyIEZvbnRDYWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRm9udAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTg2CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3
LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OnBhaW50KToKKwogMjAyMS0wOC0wMiAgRnVqaWkgSGly
b25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXSBBU1NFUlRJ
T04gRkFJTEVEOiBldnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50IHx8IGV2
dC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5rZXlwcmVzc0V2ZW50IGluIFdlYlZpZXc6OmludGVy
cHJldEtleUV2ZW50IHNpbmNlIHIyODA0OTIKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2lu
L1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZp
ZXcuY3BwCShyZXZpc2lvbiAyODA1NDApCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJW
aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMyNCwyNiArMTMyNCwyOCBAQCB2b2lkIFdlYlZp
ZXc6OnBhaW50KEhEQyBkYywgTFBBUkFNIG9wdGlvCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK
LSAgICBhdXRvIGJpdG1hcERDID0gYWRvcHRHRElPYmplY3QoOjpDcmVhdGVDb21wYXRpYmxlREMo
aGRjKSk7Ci0gICAgSEdESU9CSiBvbGRCaXRtYXAgPSA6OlNlbGVjdE9iamVjdChiaXRtYXBEQy5n
ZXQoKSwgbV9iYWNraW5nU3RvcmVCaXRtYXAtPmdldCgpKTsKKyAgICBpZiAoaGRjKSB7CisgICAg
ICAgIGF1dG8gYml0bWFwREMgPSBhZG9wdEdESU9iamVjdCg6OkNyZWF0ZUNvbXBhdGlibGVEQyho
ZGMpKTsKKyAgICAgICAgSEdESU9CSiBvbGRCaXRtYXAgPSA6OlNlbGVjdE9iamVjdChiaXRtYXBE
Qy5nZXQoKSwgbV9iYWNraW5nU3RvcmVCaXRtYXAtPmdldCgpKTsKIAotICAgIC8vIFVwZGF0ZSBv
dXIgYmFja2luZyBzdG9yZSBpZiBuZWVkZWQuCi0gICAgdXBkYXRlQmFja2luZ1N0b3JlKGZyYW1l
VmlldywgYml0bWFwREMuZ2V0KCksIGJhY2tpbmdTdG9yZUNvbXBsZXRlbHlEaXJ0eSk7CisgICAg
ICAgIC8vIFVwZGF0ZSBvdXIgYmFja2luZyBzdG9yZSBpZiBuZWVkZWQuCisgICAgICAgIHVwZGF0
ZUJhY2tpbmdTdG9yZShmcmFtZVZpZXcsIGJpdG1hcERDLmdldCgpLCBiYWNraW5nU3RvcmVDb21w
bGV0ZWx5RGlydHkpOwogCi0gICAgLy8gTm93IHdlIGJsaXQgdGhlIHVwZGF0ZWQgYmFja2luZyBz
dG9yZQotICAgIEludFJlY3Qgd2luZG93RGlydHlSZWN0ID0gcmNQYWludDsKLSAgICAKLSAgICAv
LyBBcHBseSB0aGUgc2FtZSBoZXVyaXN0aWMgZm9yIHRoaXMgdXBkYXRlIHJlZ2lvbiB0b28uCi0g
ICAgVmVjdG9yPEludFJlY3Q+IGJsaXRSZWN0czsKLSAgICBpZiAocmVnaW9uICYmIHJlZ2lvblR5
cGUgPT0gQ09NUExFWFJFR0lPTikKLSAgICAgICAgZ2V0VXBkYXRlUmVjdHMocmVnaW9uLmdldCgp
LCB3aW5kb3dEaXJ0eVJlY3QsIGJsaXRSZWN0cyk7Ci0gICAgZWxzZQotICAgICAgICBibGl0UmVj
dHMuYXBwZW5kKHdpbmRvd0RpcnR5UmVjdCk7CisgICAgICAgIC8vIE5vdyB3ZSBibGl0IHRoZSB1
cGRhdGVkIGJhY2tpbmcgc3RvcmUKKyAgICAgICAgSW50UmVjdCB3aW5kb3dEaXJ0eVJlY3QgPSBy
Y1BhaW50OworICAgICAgICAKKyAgICAgICAgLy8gQXBwbHkgdGhlIHNhbWUgaGV1cmlzdGljIGZv
ciB0aGlzIHVwZGF0ZSByZWdpb24gdG9vLgorICAgICAgICBWZWN0b3I8SW50UmVjdD4gYmxpdFJl
Y3RzOworICAgICAgICBpZiAocmVnaW9uICYmIHJlZ2lvblR5cGUgPT0gQ09NUExFWFJFR0lPTikK
KyAgICAgICAgICAgIGdldFVwZGF0ZVJlY3RzKHJlZ2lvbi5nZXQoKSwgd2luZG93RGlydHlSZWN0
LCBibGl0UmVjdHMpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBibGl0UmVjdHMuYXBwZW5k
KHdpbmRvd0RpcnR5UmVjdCk7CiAKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgYmxpdFJl
Y3RzLnNpemUoKTsgKytpKQotICAgICAgICBwYWludEludG9XaW5kb3coYml0bWFwREMuZ2V0KCks
IGhkYywgYmxpdFJlY3RzW2ldKTsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGJs
aXRSZWN0cy5zaXplKCk7ICsraSkKKyAgICAgICAgICAgIHBhaW50SW50b1dpbmRvdyhiaXRtYXBE
Qy5nZXQoKSwgaGRjLCBibGl0UmVjdHNbaV0pOwogCi0gICAgOjpTZWxlY3RPYmplY3QoYml0bWFw
REMuZ2V0KCksIG9sZEJpdG1hcCk7CisgICAgICAgIDo6U2VsZWN0T2JqZWN0KGJpdG1hcERDLmdl
dCgpLCBvbGRCaXRtYXApOworICAgIH0KIAogICAgIGlmICghZGMpIHsKICAgICAgICAgRW5kUGFp
bnQobV92aWV3V2luZG93LCAmcHMpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435874</attachid>
            <date>2021-08-19 09:34:39 -0700</date>
            <delta_ts>2021-08-20 10:16:10 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228186-20210819093439.patch</filename>
            <type>text/plain</type>
            <size>2689</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4MDg0OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA4LTE5ICBQZXIgQXJu
ZSAgPHB2b2xsYW5AYXBwbGUuY29tPgorIAorICAgICAgICBbV2luXSBDcmFzaCB1bmRlciBGb250
Q2FjaGU6Omxhc3RSZXNvcnRGYWxsYmFja0ZvbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODE4NgorIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKyAKKyAgICAgICAgQWRkIG51bGwgcG9pbnRlciBjaGVjay4KKyAKKyAgICAg
ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OkZvbnRDYWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRm9udCk6CisKIDIwMjEtMDgtMTAg
IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gUkVH
UkVTU0lPTihyMjc4ODUwKTogbW9kaWZ5aW5nIGBwbGF5YmFja1JhdGVgIHZpYSBKUyBvbiBhIFRv
dWNoQmFyIG1hYyBvbmx5IHNvbWV0aW1lcyB3b3JrcyBhbmQgYWxzbyBjYXVzZXMgdGhlIGBkZWZh
dWx0UGxheWJhY2tSYXRlYCB0byBjaGFuZ2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCShyZXZpc2lvbiAyODA3
MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2lu
LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDIwLDggKzQyMCwxMSBAQCBSZWY8Rm9udD4gRm9udENh
Y2hlOjpsYXN0UmVzb3J0RmFsbGJhY2tGCiAgICAgICAgIH0KICAgICB9KTsKIAotICAgIGlmICgh
ZmFsbGJhY2tGb250TmFtZS5nZXQoKS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiAqZm9udEZv
ckZhbWlseShmb250RGVzY3JpcHRpb24sIGZhbGxiYWNrRm9udE5hbWUpOworICAgIGlmICghZmFs
bGJhY2tGb250TmFtZS5nZXQoKS5pc0VtcHR5KCkpIHsKKyAgICAgICAgYXV0byBmYWxsYmFja0Zv
bnQgPSBmb250Rm9yRmFtaWx5KGZvbnREZXNjcmlwdGlvbiwgZmFsbGJhY2tGb250TmFtZSk7Cisg
ICAgICAgIGlmIChmYWxsYmFja0ZvbnQpCisgICAgICAgICAgICByZXR1cm4gKmZhbGxiYWNrRm9u
dDsKKyAgICB9CiAKICAgICBhdXRvIGhGb250ID0gYWRvcHRHRElPYmplY3Qoc3RhdGljX2Nhc3Q8
SEZPTlQ+KEdldFN0b2NrT2JqZWN0KERFRkFVTFRfR1VJX0ZPTlQpKSk7CiAgICAgRm9udFBsYXRm
b3JtRGF0YSBwbGF0Zm9ybURhdGEoV1RGTW92ZShoRm9udCksIGZvbnREZXNjcmlwdGlvbi5jb21w
dXRlZFBpeGVsU2l6ZSgpLCBmYWxzZSwgZmFsc2UsIGZhbHNlKTsKSW5kZXg6IFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5jcHAKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29u
dGV4dENHV2luLmNwcAkocmV2aXNpb24gMjgwNzM0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29udGV4dENHV2luLmNwcAkod29ya2luZyBjb3B5KQpA
QCAtNTEsOCArNTEsMTAgQEAgc3RhdGljIFJldGFpblB0cjxDR0NvbnRleHRSZWY+IENHQ29udGV4
dAogICAgIC8vIGV4aXQgZ3JhY2VmdWxseSBhbmQgbG9vayBhdCBpdCBsYXRlcjoKICAgICAvLyAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyMDQxICAgCiAgICAgLy8g
QVNTRVJUKGJpdG1hcEJpdHMuYml0c1BlclBpeGVsKCkgPT0gMzIpOwotICAgIGlmIChwaXhlbERh
dGEuYml0c1BlclBpeGVsKCkgIT0gMzIpCisgICAgaWYgKHBpeGVsRGF0YS5iaXRzUGVyUGl4ZWwo
KSAhPSAzMikgeworICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkludmFsaWQgYml0cyBwZXIgcGl4
ZWwgcmVxdWVzdGVkOiAlZCBoZGMgPSAlcCIsIHBpeGVsRGF0YS5iaXRzUGVyUGl4ZWwoKSwgaGRj
KTsKICAgICAgICAgcmV0dXJuIDA7CisgICAgfQogCiAgICAgQ0dCaXRtYXBJbmZvIGJpdG1hcElu
Zm8gPSBrQ0dCaXRtYXBCeXRlT3JkZXIzMkxpdHRsZSB8IChoYXNBbHBoYSA/IGtDR0ltYWdlQWxw
aGFQcmVtdWx0aXBsaWVkRmlyc3QgOiBrQ0dJbWFnZUFscGhhTm9uZVNraXBGaXJzdCk7CiAgICAg
YXV0byBjb250ZXh0ID0gYWRvcHRDRihDR0JpdG1hcENvbnRleHRDcmVhdGUocGl4ZWxEYXRhLmJ1
ZmZlcigpLCBwaXhlbERhdGEuc2l6ZSgpLndpZHRoKCksIHBpeGVsRGF0YS5zaXplKCkuaGVpZ2h0
KCksIDgsIHBpeGVsRGF0YS5ieXRlc1BlclJvdygpLCBzUkdCQ29sb3JTcGFjZVJlZigpLCBiaXRt
YXBJbmZvKSk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436006</attachid>
            <date>2021-08-20 10:16:12 -0700</date>
            <delta_ts>2021-08-21 15:04:48 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228186-20210820101611.patch</filename>
            <type>text/plain</type>
            <size>5135</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4MTMyMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTIwICBQZXIgQXJu
ZSAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIENyYXNoIHVuZGVyIEZvbnRD
YWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgQWRkIG51bGwgY2hlY2sgdG8gcmVzb2x2ZSBjcmFzaCBpbiBG
b250Q2FjaGU6Omxhc3RSZXNvcnRGYWxsYmFja0ZvbnQuIEFkZGl0aW9uYWxseSwgcmV0dXJuIGVh
cmx5IGluIEJpdG1hcEltYWdlOjpnZXRIQklUTUFQT2ZTaXplCisgICAgICAgIHdoZW4gdGhlIGJp
dHMgcGVyIHBpeGVsIGluIHRoZSBiaXRtYXAgaXMgb2YgdW5leHBlY3RlZCBzaXplLCBzaW5jZSB0
aGF0IHdpbGwgY2F1c2UgYSBjcmFzaCB1bmRlciB0aGlzIGZ1bmN0aW9uLiBUaGlzIGNhbiBoYXBw
ZW4KKyAgICAgICAgaWYgYW4gZXZlbnQgaXMgYmVpbmcgaGFuZGxlZCB3aGlsZSBhbHJlYWR5IGlu
IHRoZSBXaW5kb3dzIHBhaW50IGhhbmRsZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj
cy93aW4vRm9udENhY2hlV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNoZTo6bGFz
dFJlc29ydEZhbGxiYWNrRm9udCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dy
YXBoaWNzQ29udGV4dENHV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNHQ29udGV4dFdpdGhI
REMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9JbWFnZUNHV2luLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpnZXRIQklUTUFQT2ZTaXplKToKKwogMjAyMS0w
OC0yMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAg
VW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyODEzMDcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcAkocmV2aXNpb24g
MjgwNzM0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNo
ZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyMCw4ICs0MjAsMTEgQEAgUmVmPEZvbnQ+IEZv
bnRDYWNoZTo6bGFzdFJlc29ydEZhbGxiYWNrRgogICAgICAgICB9CiAgICAgfSk7CiAKLSAgICBp
ZiAoIWZhbGxiYWNrRm9udE5hbWUuZ2V0KCkuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gKmZv
bnRGb3JGYW1pbHkoZm9udERlc2NyaXB0aW9uLCBmYWxsYmFja0ZvbnROYW1lKTsKKyAgICBpZiAo
IWZhbGxiYWNrRm9udE5hbWUuZ2V0KCkuaXNFbXB0eSgpKSB7CisgICAgICAgIGF1dG8gZmFsbGJh
Y2tGb250ID0gZm9udEZvckZhbWlseShmb250RGVzY3JpcHRpb24sIGZhbGxiYWNrRm9udE5hbWUp
OworICAgICAgICBpZiAoZmFsbGJhY2tGb250KQorICAgICAgICAgICAgcmV0dXJuICpmYWxsYmFj
a0ZvbnQ7CisgICAgfQogCiAgICAgYXV0byBoRm9udCA9IGFkb3B0R0RJT2JqZWN0KHN0YXRpY19j
YXN0PEhGT05UPihHZXRTdG9ja09iamVjdChERUZBVUxUX0dVSV9GT05UKSkpOwogICAgIEZvbnRQ
bGF0Zm9ybURhdGEgcGxhdGZvcm1EYXRhKFdURk1vdmUoaEZvbnQpLCBmb250RGVzY3JpcHRpb24u
Y29tcHV0ZWRQaXhlbFNpemUoKSwgZmFsc2UsIGZhbHNlLCBmYWxzZSk7CkluZGV4OiBTb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0Q0dXaW4uY3BwCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGlj
c0NvbnRleHRDR1dpbi5jcHAJKHJldmlzaW9uIDI4MDczNCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5jcHAJKHdvcmtpbmcgY29w
eSkKQEAgLTUxLDggKzUxLDEwIEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0dDb250ZXh0UmVmPiBDR0Nv
bnRleHQKICAgICAvLyBleGl0IGdyYWNlZnVsbHkgYW5kIGxvb2sgYXQgaXQgbGF0ZXI6CiAgICAg
Ly8gIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjA0MSAgIAogICAg
IC8vIEFTU0VSVChiaXRtYXBCaXRzLmJpdHNQZXJQaXhlbCgpID09IDMyKTsKLSAgICBpZiAocGl4
ZWxEYXRhLmJpdHNQZXJQaXhlbCgpICE9IDMyKQorICAgIGlmIChwaXhlbERhdGEuYml0c1BlclBp
eGVsKCkgIT0gMzIpIHsKKyAgICAgICAgZnByaW50ZihzdGRlcnIsICJJbnZhbGlkIGJpdHMgcGVy
IHBpeGVsIHJlcXVlc3RlZDogJWQgaGRjID0gJXAiLCBwaXhlbERhdGEuYml0c1BlclBpeGVsKCks
IGhkYyk7CiAgICAgICAgIHJldHVybiAwOworICAgIH0KIAogICAgIENHQml0bWFwSW5mbyBiaXRt
YXBJbmZvID0ga0NHQml0bWFwQnl0ZU9yZGVyMzJMaXR0bGUgfCAoaGFzQWxwaGEgPyBrQ0dJbWFn
ZUFscGhhUHJlbXVsdGlwbGllZEZpcnN0IDoga0NHSW1hZ2VBbHBoYU5vbmVTa2lwRmlyc3QpOwog
ICAgIGF1dG8gY29udGV4dCA9IGFkb3B0Q0YoQ0dCaXRtYXBDb250ZXh0Q3JlYXRlKHBpeGVsRGF0
YS5idWZmZXIoKSwgcGl4ZWxEYXRhLnNpemUoKS53aWR0aCgpLCBwaXhlbERhdGEuc2l6ZSgpLmhl
aWdodCgpLCA4LCBwaXhlbERhdGEuYnl0ZXNQZXJSb3coKSwgc1JHQkNvbG9yU3BhY2VSZWYoKSwg
Yml0bWFwSW5mbykpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu
L0ltYWdlQ0dXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL3dpbi9JbWFnZUNHV2luLmNwcAkocmV2aXNpb24gMjgwNzM0KQorKysgU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ltYWdlQ0dXaW4uY3BwCSh3b3JraW5nIGNvcHkp
CkBAIC02OCw2ICs2OCw5IEBAIGJvb2wgQml0bWFwSW1hZ2U6OmdldEhCSVRNQVBPZlNpemUoSEJJ
VE0KICAgICBHZXRPYmplY3QoYm1wLCBzaXplb2YoQklUTUFQKSwgJmJtcEluZm8pOwogCiAgICAg
QVNTRVJUKGJtcEluZm8uYm1CaXRzUGl4ZWwgPT0gMzIpOworICAgIGlmIChibXBJbmZvLmJtQml0
c1BpeGVsICE9IDMyKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpbnQgYnVmZmVyU2l6
ZSA9IGJtcEluZm8uYm1XaWR0aEJ5dGVzICogYm1wSW5mby5ibUhlaWdodDsKICAgICAKICAgICBh
dXRvIGNnQ29udGV4dCA9IGFkb3B0Q0YoQ0dCaXRtYXBDb250ZXh0Q3JlYXRlKGJtcEluZm8uYm1C
aXRzLCBibXBJbmZvLmJtV2lkdGgsIGJtcEluZm8uYm1IZWlnaHQsCkluZGV4OiBTb3VyY2UvV2Vi
S2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2Fj
eS93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiAyODA3MzQpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5
L3dpbi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wOC0w
NCAgUGVyIEFybmUgIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBDcmFzaCB1
bmRlciBGb250Q2FjaGU6Omxhc3RSZXNvcnRGYWxsYmFja0ZvbnQKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODE4NgorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBudWxsIGNoZWNrIGZvciBiaXRtYXBE
Qy4gUHJvY2VlZGluZyB3aXRob3V0IGEgdmFsaWQgYml0bWFwREMgd2lsbCBjYXVzZSBhIGNyYXNo
LiBXaGVuIHBhaW50aW5nIGlzIGJlaW5nIGRvbmUgd2hpbGUgYWxyZWFkeSBpbiB0aGUgV2luZG93
cyBwYWludCBoYW5kbGVyLAorICAgICAgICB3ZSBjYW4gZW5kIHVwIHdpdGggYSBiaXRtYXBEQyB3
aGljaCBpcyBudWxsLgorCisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3
OjpwYWludEludG9CYWNraW5nU3RvcmUpOgorCiAyMDIxLTA4LTAyICBGdWppaSBIaXJvbm9yaSAg
PEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5dIEFTU0VSVElPTiBGQUlM
RUQ6IGV2dC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5rZXlkb3duRXZlbnQgfHwgZXZ0LT50eXBl
KCkgPT0gZXZlbnROYW1lcygpLmtleXByZXNzRXZlbnQgaW4gV2ViVmlldzo6aW50ZXJwcmV0S2V5
RXZlbnQgc2luY2UgcjI4MDQ5MgpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVmll
dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVmlldy5jcHAJ
KHJldmlzaW9uIDI4MDczNCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZpZXcuY3Bw
CSh3b3JraW5nIGNvcHkpCkBAIC0xMzc4LDYgKzEzNzgsOSBAQCB2b2lkIFdlYlZpZXc6OnBhaW50
SW50b0JhY2tpbmdTdG9yZShGcmFtCiAKICAgICBSRUNUIHJlY3QgPSBkaXJ0eVJlY3RQaXhlbHM7
CiAKKyAgICBpZiAoIWJpdG1hcERDKQorICAgICAgICByZXR1cm47CisgICAgCiAjaWYgRkxBU0hf
QkFDS0lOR19TVE9SRV9SRURSQVcKICAgICB7CiAgICAgICAgIEhXbmREQyBkYyhtX3ZpZXdXaW5k
b3cpOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>