<?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>227137</bug_id>
          
          <creation_ts>2021-06-17 12:08:19 -0700</creation_ts>
          <short_desc>[Mac] libwebrtc CMBaseClass objects need alignment fixup</short_desc>
          <delta_ts>2021-06-21 19:15:59 -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>WebRTC</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <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>
          <dependson>227153</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Eric Carlson">eric.carlson</reporter>
          <assigned_to name="Eric Carlson">eric.carlson</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1770754</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-17 12:08:19 -0700</bug_when>
    <thetext>libwebrtc CMBaseClass objects used for VP8 and VP9 decoders need alignment fixup.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770755</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-06-17 12:08:47 -0700</bug_when>
    <thetext>&lt;rdar://problem/79464124&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770763</commentid>
    <comment_count>2</comment_count>
      <attachid>431701</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-17 12:17:45 -0700</bug_when>
    <thetext>Created attachment 431701
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770770</commentid>
    <comment_count>3</comment_count>
      <attachid>431705</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-17 12:29:47 -0700</bug_when>
    <thetext>Created attachment 431705
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770786</commentid>
    <comment_count>4</comment_count>
      <attachid>431711</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-17 13:04:53 -0700</bug_when>
    <thetext>Created attachment 431711
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770838</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-17 15:02:04 -0700</bug_when>
    <thetext>Committed r279011 (238936@main): &lt;https://commits.webkit.org/238936@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 431711.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770879</commentid>
    <comment_count>6</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2021-06-17 16:20:30 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 227153</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771132</commentid>
    <comment_count>7</comment_count>
      <attachid>431808</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-19 16:17:56 -0700</bug_when>
    <thetext>Created attachment 431808
Updated patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771359</commentid>
    <comment_count>8</comment_count>
      <attachid>431881</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-21 11:13:40 -0700</bug_when>
    <thetext>Created attachment 431881
Updated patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771452</commentid>
    <comment_count>9</comment_count>
      <attachid>431909</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-21 14:17:34 -0700</bug_when>
    <thetext>Created attachment 431909
Updated patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771506</commentid>
    <comment_count>10</comment_count>
      <attachid>431921</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-06-21 16:05:07 -0700</bug_when>
    <thetext>Created attachment 431921
Updated patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771573</commentid>
    <comment_count>11</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-21 19:15:58 -0700</bug_when>
    <thetext>Committed r279101 (239018@main): &lt;https://commits.webkit.org/239018@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 431921.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431701</attachid>
            <date>2021-06-17 12:17:45 -0700</date>
            <delta_ts>2021-06-17 13:02:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227137-20210617121744.patch</filename>
            <type>text/plain</type>
            <size>6159</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n
ZUxvZwppbmRleCBhZjM5ODMyMTM3ZDIyM2E3ZmJkNzc1M2UzNmFhNmVkZTY1MTZiOTEzLi4zZWM3
Y2E4YTNjN2NiZWU5ODMyNTZkNDIzOWRhOWI1N2I4NDU3ZjgzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wNi0xNyAgRXJpYyBDYXJs
c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBsaWJ3ZWJydGMg
Q01CYXNlQ2xhc3Mgb2JqZWN0cyBuZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTM3CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL3Nkay9XZWJL
aXQvV2ViS2l0VlA4RGVjb2Rlci5jcHA6CisgICAgICAgICh3ZWJydGM6OmNyZWF0ZVdlYktpdFZQ
OERlY29kZXIpOiBBZGQgcGFkZGluZyB0byB0aGUgQ01CYXNlQ2xhc3Mgb2JqZWN0IG9uIHg4Nl82
NAorICAgICAgICBzbyBmdW5jdGlvbiBwb2ludGVycyBhcmUgbmF0dXJhbGx5IGFsaWduZWQuIEFk
ZCBzdGF0aWNfYXNzZXJ0cyB0byBlbnN1cmUgYWxpZ25tZW50CisgICAgICAgIGFuZCBzaXplcyBh
cmUgY29ycmVjdC4KKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5
RGVjb2Rlci5jcHA6CisgICAgICAgICh3ZWJydGM6OmNyZWF0ZVdlYktpdFZQOURlY29kZXIpOiBE
aXR0by4KKwogMjAyMS0wNi0xMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+IGFu
ZCBWaWN0b3IgTS4gSmFxdWV6IEwuIDx2amFxdWV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgVXBk
YXRlIGxpYndlYnJ0YyB0byBNOTIKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndl
YnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA4RGVjb2Rlci5jcHAgYi9Tb3Vy
Y2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQ
OERlY29kZXIuY3BwCmluZGV4IDIwNWQwMjUwN2ZkODc0ZGRhYWJiZTlkNmVhMjI1NWNjZWRiMzZm
OWUuLmFjMDdlNDY0YWQ1OTk4M2MxMjA5MWNhOWE0MDg1ZDhiOTM5ODI3MTcgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2Vi
S2l0VlA4RGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJj
ZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDhEZWNvZGVyLmNwcApAQCAtNDgsMTkgKzQ4LDMz
IEBAIHN0YXRpYyBPU1N0YXR1cyBpbnZhbGlkYXRlVlA4RGVjb2RlcihDTUJhc2VPYmplY3RSZWYp
Owogc3RhdGljIHZvaWQgZmluYWxpemVWUDhEZWNvZGVyKENNQmFzZU9iamVjdFJlZik7CiBzdGF0
aWMgQ0ZTdHJpbmdSZWYgY29weVZQOERlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9uKENNQmFzZU9iamVj
dFJlZik7CiAKLXN0YXRpYyBjb25zdCBDTUJhc2VDbGFzcyBXZWJLaXRWUDhEZWNvZGVyX0Jhc2VD
bGFzcyA9Ci17Ci0gICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwKLSAgICBzaXplb2Yo
V2ViS2l0VlA4RGVjb2RlciksCi0gICAgbnVsbHB0ciwgLy8gQ29tcGFyaXNvbiBieSBwb2ludGVy
IGVxdWFsaXR5Ci0gICAgaW52YWxpZGF0ZVZQOERlY29kZXIsCi0gICAgZmluYWxpemVWUDhEZWNv
ZGVyLAotICAgIGNvcHlWUDhEZWNvZGVyRGVidWdEZXNjcmlwdGlvbiwKLSAgICBudWxscHRyLCAv
LyBDb3B5UHJvcGVydHkKLSAgICBudWxscHRyLCAvLyBTZXRQcm9wZXJ0eQotICAgIG51bGxwdHIs
Ci0gICAgbnVsbHB0cgotfTsKKyNpZiBkZWZpbmVkKFdFQlJUQ19BUkNIX1g4Nl82NCkKKyAgICBj
b25zdGV4cHIgc2l6ZV90IHBhZFNpemUgPSA0OworI2Vsc2UKKyAgICBjb25zdGV4cHIgc2l6ZV90
IHBhZFNpemUgPSAwOworI2VuZGlmCisKKyNwcmFnbWEgcGFjayhwdXNoLCA0KQorICAgIHN0cnVj
dCBEZWNvZGVyQ2xhc3MgeyB1aW50OF90IHBhZFtwYWRTaXplXTsgQ01CYXNlQ2xhc3MgYWxpZ25l
ZENsYXNzOyB9IFdlYktpdFZQOERlY29kZXJfQmFzZUNsYXNzIHsgeyB9LCB7CisgICAgICAgIGtD
TUJhc2VPYmplY3RfQ2xhc3NWZXJzaW9uXzEsCisgICAgICAgIHNpemVvZihXZWJLaXRWUDhEZWNv
ZGVyKSwKKyAgICAgICAgbnVsbHB0ciwgLy8gQ29tcGFyaXNvbiBieSBwb2ludGVyIGVxdWFsaXR5
CisgICAgICAgIGludmFsaWRhdGVWUDhEZWNvZGVyLAorICAgICAgICBmaW5hbGl6ZVZQOERlY29k
ZXIsCisgICAgICAgIGNvcHlWUDhEZWNvZGVyRGVidWdEZXNjcmlwdGlvbiwKKyAgICAgICAgbnVs
bHB0ciwgLy8gQ29weVByb3BlcnR5CisgICAgICAgIG51bGxwdHIsIC8vIFNldFByb3BlcnR5Cisg
ICAgICAgIG51bGxwdHIsCisgICAgICAgIG51bGxwdHIKKyAgICB9IH07CisjcHJhZ21hIHBhY2so
cG9wKQorCisjaWYgZGVmaW5lZChXRUJSVENfQVJDSF9YODZfNjQpCisgICAgc3RhdGljX2Fzc2Vy
dChzaXplb2YoV2ViS2l0VlA4RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25lZENsYXNzLnZlcnNpb24p
ICE9IHNpemVvZih2b2lkKiksICJDTUJhc2VDbGFzcyBmaXh1cCBpcyByZXF1aXJlZCBvbiBYODZf
NjQiKTsKKyNlbHNlCisgICAgc3RhdGljX2Fzc2VydChzaXplb2YoV2ViS2l0VlA4RGVjb2Rlcl9C
YXNlQ2xhc3MuYWxpZ25lZENsYXNzLnZlcnNpb24pID09IHNpemVvZih2b2lkKiksICJDTUJhc2VD
bGFzcyBmaXh1cCBvbmx5IHJlcXVpcmVkIG9uIFg4Nl82NCIpOworI2VuZGlmCisgICAgc3RhdGlj
X2Fzc2VydChhbGlnbm9mKERlY29kZXJDbGFzcykgPT0gNCwgIkNNQmFzZUNsYXNzIG11c3QgaGF2
ZSA0IGJ5dGUgYWxpZ25tZW50Iik7CiAKIHN0YXRpYyBPU1N0YXR1cyBzdGFydFZQOERlY29kZXJT
ZXNzaW9uKFZUVmlkZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlclNlc3Npb24sIENNVmlkZW9G
b3JtYXREZXNjcmlwdGlvblJlZik7CiBzdGF0aWMgT1NTdGF0dXMgZGVjb2RlVlA4RGVjb2RlckZy
YW1lKFZUVmlkZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlckZyYW1lLCBDTVNhbXBsZUJ1ZmZl
clJlZiwgVlREZWNvZGVGcmFtZUZsYWdzLCBWVERlY29kZUluZm9GbGFncyopOwpAQCAtODIsNyAr
OTYsNyBAQCBzdGF0aWMgY29uc3QgVlRWaWRlb0RlY29kZXJDbGFzcyBXZWJLaXRWUDhEZWNvZGVy
X1ZpZGVvRGVjb2RlckNsYXNzID0KIAogc3RhdGljIGNvbnN0IFZUVmlkZW9EZWNvZGVyVlRhYmxl
IFdlYktpdFZQOERlY29kZXJWVGFibGUgPQogewotICAgIHsgbnVsbHB0ciwgJldlYktpdFZQOERl
Y29kZXJfQmFzZUNsYXNzIH0sCisgICAgeyBudWxscHRyLCAmV2ViS2l0VlA4RGVjb2Rlcl9CYXNl
Q2xhc3MuYWxpZ25lZENsYXNzIH0sCiAgICAgJldlYktpdFZQOERlY29kZXJfVmlkZW9EZWNvZGVy
Q2xhc3MKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3Vy
Y2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVjb2Rlci5jcHAgYi9Tb3VyY2UvVGhpcmRQ
YXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOURlY29kZXIu
Y3BwCmluZGV4IDEyMzk5NTIyNmQ4YjY4OWFiMDdiOTAxZjMzMWViNjdhODcxN2RiYTguLmFjODQ4
YzZkODEwNDc4Mjg3YTdhYzdkOWM3ZGJlOWM1Y2I5NGMxYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9U
aGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVj
b2Rlci5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMv
c2RrL1dlYktpdC9XZWJLaXRWUDlEZWNvZGVyLmNwcApAQCAtNDgsMTkgKzQ4LDMzIEBAIHN0YXRp
YyBPU1N0YXR1cyBpbnZhbGlkYXRlVlA5RGVjb2RlcihDTUJhc2VPYmplY3RSZWYpOwogc3RhdGlj
IHZvaWQgZmluYWxpemVWUDlEZWNvZGVyKENNQmFzZU9iamVjdFJlZik7CiBzdGF0aWMgQ0ZTdHJp
bmdSZWYgY29weVZQOURlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9uKENNQmFzZU9iamVjdFJlZik7CiAK
LXN0YXRpYyBjb25zdCBDTUJhc2VDbGFzcyBXZWJLaXRWUDlEZWNvZGVyX0Jhc2VDbGFzcyA9Ci17
Ci0gICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwKLSAgICBzaXplb2YoV2ViS2l0VlA5
RGVjb2RlciksCi0gICAgbnVsbHB0ciwgLy8gQ29tcGFyaXNvbiBieSBwb2ludGVyIGVxdWFsaXR5
Ci0gICAgaW52YWxpZGF0ZVZQOURlY29kZXIsCi0gICAgZmluYWxpemVWUDlEZWNvZGVyLAotICAg
IGNvcHlWUDlEZWNvZGVyRGVidWdEZXNjcmlwdGlvbiwKLSAgICBudWxscHRyLCAvLyBDb3B5UHJv
cGVydHkKLSAgICBudWxscHRyLCAvLyBTZXRQcm9wZXJ0eQotICAgIG51bGxwdHIsCi0gICAgbnVs
bHB0cgotfTsKKyNpZiBkZWZpbmVkKFdFQlJUQ19BUkNIX1g4Nl82NCkKKyAgICBjb25zdGV4cHIg
c2l6ZV90IHBhZFNpemUgPSA0OworI2Vsc2UKKyAgICBjb25zdGV4cHIgc2l6ZV90IHBhZFNpemUg
PSAwOworI2VuZGlmCisKKyNwcmFnbWEgcGFjayhwdXNoLCA0KQorICAgIHN0cnVjdCBEZWNvZGVy
Q2xhc3MgeyB1aW50OF90IHBhZFtwYWRTaXplXTsgQ01CYXNlQ2xhc3MgYWxpZ25lZENsYXNzOyB9
IFdlYktpdFZQOURlY29kZXJfQmFzZUNsYXNzIHsgeyB9LCB7CisgICAgICAgIGtDTUJhc2VPYmpl
Y3RfQ2xhc3NWZXJzaW9uXzEsCisgICAgICAgIHNpemVvZihXZWJLaXRWUDlEZWNvZGVyKSwKKyAg
ICAgICAgbnVsbHB0ciwgLy8gQ29tcGFyaXNvbiBieSBwb2ludGVyIGVxdWFsaXR5CisgICAgICAg
IGludmFsaWRhdGVWUDlEZWNvZGVyLAorICAgICAgICBmaW5hbGl6ZVZQOURlY29kZXIsCisgICAg
ICAgIGNvcHlWUDlEZWNvZGVyRGVidWdEZXNjcmlwdGlvbiwKKyAgICAgICAgbnVsbHB0ciwgLy8g
Q29weVByb3BlcnR5CisgICAgICAgIG51bGxwdHIsIC8vIFNldFByb3BlcnR5CisgICAgICAgIG51
bGxwdHIsCisgICAgICAgIG51bGxwdHIKKyAgICB9IH07CisjcHJhZ21hIHBhY2socG9wKQorCisj
aWYgZGVmaW5lZChXRUJSVENfQVJDSF9YODZfNjQpCisgICAgc3RhdGljX2Fzc2VydChzaXplb2Yo
V2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25lZENsYXNzLnZlcnNpb24pICE9IHNpemVv
Zih2b2lkKiksICJDTUJhc2VDbGFzcyBmaXh1cCBpcyByZXF1aXJlZCBvbiBYODZfNjQiKTsKKyNl
bHNlCisgICAgc3RhdGljX2Fzc2VydChzaXplb2YoV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3Mu
YWxpZ25lZENsYXNzLnZlcnNpb24pID09IHNpemVvZih2b2lkKiksICJDTUJhc2VDbGFzcyBmaXh1
cCBvbmx5IHJlcXVpcmVkIG9uIFg4Nl82NCIpOworI2VuZGlmCisgICAgc3RhdGljX2Fzc2VydChh
bGlnbm9mKERlY29kZXJDbGFzcykgPT0gNCwgIkNNQmFzZUNsYXNzIG11c3QgaGF2ZSA0IGJ5dGUg
YWxpZ25tZW50Iik7CiAKIHN0YXRpYyBPU1N0YXR1cyBzdGFydFZQOURlY29kZXJTZXNzaW9uKFZU
VmlkZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlclNlc3Npb24sIENNVmlkZW9Gb3JtYXREZXNj
cmlwdGlvblJlZik7CiBzdGF0aWMgT1NTdGF0dXMgZGVjb2RlVlA5RGVjb2RlckZyYW1lKFZUVmlk
ZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlckZyYW1lLCBDTVNhbXBsZUJ1ZmZlclJlZiwgVlRE
ZWNvZGVGcmFtZUZsYWdzLCBWVERlY29kZUluZm9GbGFncyopOwpAQCAtODIsNyArOTYsNyBAQCBz
dGF0aWMgY29uc3QgVlRWaWRlb0RlY29kZXJDbGFzcyBXZWJLaXRWUDlEZWNvZGVyX1ZpZGVvRGVj
b2RlckNsYXNzID0KIAogc3RhdGljIGNvbnN0IFZUVmlkZW9EZWNvZGVyVlRhYmxlIFdlYktpdFZQ
OURlY29kZXJWVGFibGUgPQogewotICAgIHsgbnVsbHB0ciwgJldlYktpdFZQOURlY29kZXJfQmFz
ZUNsYXNzIH0sCisgICAgeyBudWxscHRyLCAmV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MuYWxp
Z25lZENsYXNzIH0sCiAgICAgJldlYktpdFZQOURlY29kZXJfVmlkZW9EZWNvZGVyQ2xhc3MKIH07
CiAK
</data>
<flag name="commit-queue"
          id="453547"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431705</attachid>
            <date>2021-06-17 12:29:47 -0700</date>
            <delta_ts>2021-06-17 13:13:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227137-20210617122946.patch</filename>
            <type>text/plain</type>
            <size>6650</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n
ZUxvZwppbmRleCBhZjM5ODMyMTM3ZDIyM2E3ZmJkNzc1M2UzNmFhNmVkZTY1MTZiOTEzLi5mZTA5
ODAwNjkxYjQ4MzdhYjBlMmRlYTUyOTdkNmFiNzYyZWM3NmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wNi0xNyAgRXJpYyBDYXJs
c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBsaWJ3ZWJydGMg
Q01CYXNlQ2xhc3Mgb2JqZWN0cyBuZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTM3CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICAqIFNvdXJjZS93ZWJydGMvc2RrL1dlYktp
dC9XZWJLaXRWUDhEZWNvZGVyLmNwcDoKKyAgICAgICAgKHdlYnJ0Yzo6Y3JlYXRlV2ViS2l0VlA4
RGVjb2Rlcik6IEFkZCBwYWRkaW5nIHRvIHRoZSBDTUJhc2VDbGFzcyBvYmplY3Qgb24geDg2XzY0
CisgICAgICAgIHNvIGZ1bmN0aW9uIHBvaW50ZXJzIGFyZSBuYXR1cmFsbHkgYWxpZ25lZC4gQWRk
IHN0YXRpY19hc3NlcnRzIHRvIGVuc3VyZSBhbGlnbm1lbnQKKyAgICAgICAgYW5kIHNpemVzIGFy
ZSBjb3JyZWN0LgorICAgICAgICAqIFNvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlE
ZWNvZGVyLmNwcDoKKyAgICAgICAgKHdlYnJ0Yzo6Y3JlYXRlV2ViS2l0VlA5RGVjb2Rlcik6IERp
dHRvLgorCiAyMDIxLTA2LTEwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4gYW5k
IFZpY3RvciBNLiBKYXF1ZXogTC4gPHZqYXF1ZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBVcGRh
dGUgbGlid2VicnRjIHRvIE05MgpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2Vi
cnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDhEZWNvZGVyLmNwcCBiL1NvdXJj
ZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA4
RGVjb2Rlci5jcHAKaW5kZXggMjA1ZDAyNTA3ZmQ4NzRkZGFhYmJlOWQ2ZWEyMjU1Y2NlZGIzNmY5
ZS4uNjQ0NWI3ZGIzNzM3ZGJmYjA2YWM1NWQ3OWY1OTYzYWI1NGExOGQ1MSAxMDA2NDQKLS0tIGEv
U291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJL
aXRWUDhEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNl
L3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOERlY29kZXIuY3BwCkBAIC0yNyw2ICsyNyw3IEBA
CiAKICNpbmNsdWRlICJXZWJLaXREZWNvZGVyLmgiCiAjaW5jbHVkZSAiV2ViS2l0RGVjb2RlclJl
Y2VpdmVyLmgiCisjaW5jbHVkZSAiYXJjaC5oIgogI2luY2x1ZGUgIm1vZHVsZXMvdmlkZW9fY29k
aW5nL2NvZGVjcy92cDgvbGlidnB4X3ZwOF9kZWNvZGVyLmgiCiAjaW5jbHVkZSAicnRjX2Jhc2Uv
bG9nZ2luZy5oIgogI2luY2x1ZGUgInN5c3RlbV93cmFwcGVycy9pbmNsdWRlL2NwdV9pbmZvLmgi
CkBAIC00OCwxOSArNDksMzMgQEAgc3RhdGljIE9TU3RhdHVzIGludmFsaWRhdGVWUDhEZWNvZGVy
KENNQmFzZU9iamVjdFJlZik7CiBzdGF0aWMgdm9pZCBmaW5hbGl6ZVZQOERlY29kZXIoQ01CYXNl
T2JqZWN0UmVmKTsKIHN0YXRpYyBDRlN0cmluZ1JlZiBjb3B5VlA4RGVjb2RlckRlYnVnRGVzY3Jp
cHRpb24oQ01CYXNlT2JqZWN0UmVmKTsKIAotc3RhdGljIGNvbnN0IENNQmFzZUNsYXNzIFdlYktp
dFZQOERlY29kZXJfQmFzZUNsYXNzID0KLXsKLSAgICBrQ01CYXNlT2JqZWN0X0NsYXNzVmVyc2lv
bl8xLAotICAgIHNpemVvZihXZWJLaXRWUDhEZWNvZGVyKSwKLSAgICBudWxscHRyLCAvLyBDb21w
YXJpc29uIGJ5IHBvaW50ZXIgZXF1YWxpdHkKLSAgICBpbnZhbGlkYXRlVlA4RGVjb2RlciwKLSAg
ICBmaW5hbGl6ZVZQOERlY29kZXIsCi0gICAgY29weVZQOERlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9u
LAotICAgIG51bGxwdHIsIC8vIENvcHlQcm9wZXJ0eQotICAgIG51bGxwdHIsIC8vIFNldFByb3Bl
cnR5Ci0gICAgbnVsbHB0ciwKLSAgICBudWxscHRyCi19OworI2lmIGRlZmluZWQoV0VCUlRDX0FS
Q0hfWDg2XzY0KQorICAgIGNvbnN0ZXhwciBzaXplX3QgcGFkU2l6ZSA9IDQ7CisjZWxzZQorICAg
IGNvbnN0ZXhwciBzaXplX3QgcGFkU2l6ZSA9IDA7CisjZW5kaWYKKworI3ByYWdtYSBwYWNrKHB1
c2gsIDQpCisgICAgc3RydWN0IERlY29kZXJDbGFzcyB7IHVpbnQ4X3QgcGFkW3BhZFNpemVdOyBD
TUJhc2VDbGFzcyBhbGlnbmVkQ2xhc3M7IH0gV2ViS2l0VlA4RGVjb2Rlcl9CYXNlQ2xhc3MgeyB7
IH0sIHsKKyAgICAgICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwKKyAgICAgICAgc2l6
ZW9mKFdlYktpdFZQOERlY29kZXIpLAorICAgICAgICBudWxscHRyLCAvLyBDb21wYXJpc29uIGJ5
IHBvaW50ZXIgZXF1YWxpdHkKKyAgICAgICAgaW52YWxpZGF0ZVZQOERlY29kZXIsCisgICAgICAg
IGZpbmFsaXplVlA4RGVjb2RlciwKKyAgICAgICAgY29weVZQOERlY29kZXJEZWJ1Z0Rlc2NyaXB0
aW9uLAorICAgICAgICBudWxscHRyLCAvLyBDb3B5UHJvcGVydHkKKyAgICAgICAgbnVsbHB0ciwg
Ly8gU2V0UHJvcGVydHkKKyAgICAgICAgbnVsbHB0ciwKKyAgICAgICAgbnVsbHB0cgorICAgIH0g
fTsKKyNwcmFnbWEgcGFjayhwb3ApCisKKyNpZiBkZWZpbmVkKFdFQlJUQ19BUkNIX1g4Nl82NCkK
KyAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcy5hbGln
bmVkQ2xhc3MudmVyc2lvbikgIT0gc2l6ZW9mKHZvaWQqKSwgIkNNQmFzZUNsYXNzIGZpeHVwIGlz
IHJlcXVpcmVkIG9uIFg4Nl82NCIpOworI2Vsc2UKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihX
ZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MudmVyc2lvbikgPT0gc2l6ZW9m
KHZvaWQqKSwgIkNNQmFzZUNsYXNzIGZpeHVwIG9ubHkgcmVxdWlyZWQgb24gWDg2XzY0Iik7Cisj
ZW5kaWYKKyAgICBzdGF0aWNfYXNzZXJ0KGFsaWdub2YoRGVjb2RlckNsYXNzKSA9PSA0LCAiQ01C
YXNlQ2xhc3MgbXVzdCBoYXZlIDQgYnl0ZSBhbGlnbm1lbnQiKTsKIAogc3RhdGljIE9TU3RhdHVz
IHN0YXJ0VlA4RGVjb2RlclNlc3Npb24oVlRWaWRlb0RlY29kZXJSZWYsIFZUVmlkZW9EZWNvZGVy
U2Vzc2lvbiwgQ01WaWRlb0Zvcm1hdERlc2NyaXB0aW9uUmVmKTsKIHN0YXRpYyBPU1N0YXR1cyBk
ZWNvZGVWUDhEZWNvZGVyRnJhbWUoVlRWaWRlb0RlY29kZXJSZWYsIFZUVmlkZW9EZWNvZGVyRnJh
bWUsIENNU2FtcGxlQnVmZmVyUmVmLCBWVERlY29kZUZyYW1lRmxhZ3MsIFZURGVjb2RlSW5mb0Zs
YWdzKik7CkBAIC04Miw3ICs5Nyw3IEBAIHN0YXRpYyBjb25zdCBWVFZpZGVvRGVjb2RlckNsYXNz
IFdlYktpdFZQOERlY29kZXJfVmlkZW9EZWNvZGVyQ2xhc3MgPQogCiBzdGF0aWMgY29uc3QgVlRW
aWRlb0RlY29kZXJWVGFibGUgV2ViS2l0VlA4RGVjb2RlclZUYWJsZSA9CiB7Ci0gICAgeyBudWxs
cHRyLCAmV2ViS2l0VlA4RGVjb2Rlcl9CYXNlQ2xhc3MgfSwKKyAgICB7IG51bGxwdHIsICZXZWJL
aXRWUDhEZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MgfSwKICAgICAmV2ViS2l0VlA4RGVj
b2Rlcl9WaWRlb0RlY29kZXJDbGFzcwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFy
dHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlEZWNvZGVyLmNw
cCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQv
V2ViS2l0VlA5RGVjb2Rlci5jcHAKaW5kZXggMTIzOTk1MjI2ZDhiNjg5YWIwN2I5MDFmMzMxZWI2
N2E4NzE3ZGJhOC4uZjM0MWY4NDQyZTg3ODdkNWRmZTUzZTJiNzE5M2Q4ZjIwOTcwYmM1ZCAxMDA2
NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dl
YktpdC9XZWJLaXRWUDlEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy
dGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOURlY29kZXIuY3BwCkBAIC0yNyw2
ICsyNyw3IEBACiAKICNpbmNsdWRlICJXZWJLaXREZWNvZGVyLmgiCiAjaW5jbHVkZSAiV2ViS2l0
RGVjb2RlclJlY2VpdmVyLmgiCisjaW5jbHVkZSAiYXJjaC5oIgogI2luY2x1ZGUgIm1vZHVsZXMv
dmlkZW9fY29kaW5nL2NvZGVjcy92cDkvbGlidnB4X3ZwOV9kZWNvZGVyLmgiCiAjaW5jbHVkZSAi
cnRjX2Jhc2UvbG9nZ2luZy5oIgogI2luY2x1ZGUgInN5c3RlbV93cmFwcGVycy9pbmNsdWRlL2Nw
dV9pbmZvLmgiCkBAIC00OCwxOSArNDksMzMgQEAgc3RhdGljIE9TU3RhdHVzIGludmFsaWRhdGVW
UDlEZWNvZGVyKENNQmFzZU9iamVjdFJlZik7CiBzdGF0aWMgdm9pZCBmaW5hbGl6ZVZQOURlY29k
ZXIoQ01CYXNlT2JqZWN0UmVmKTsKIHN0YXRpYyBDRlN0cmluZ1JlZiBjb3B5VlA5RGVjb2RlckRl
YnVnRGVzY3JpcHRpb24oQ01CYXNlT2JqZWN0UmVmKTsKIAotc3RhdGljIGNvbnN0IENNQmFzZUNs
YXNzIFdlYktpdFZQOURlY29kZXJfQmFzZUNsYXNzID0KLXsKLSAgICBrQ01CYXNlT2JqZWN0X0Ns
YXNzVmVyc2lvbl8xLAotICAgIHNpemVvZihXZWJLaXRWUDlEZWNvZGVyKSwKLSAgICBudWxscHRy
LCAvLyBDb21wYXJpc29uIGJ5IHBvaW50ZXIgZXF1YWxpdHkKLSAgICBpbnZhbGlkYXRlVlA5RGVj
b2RlciwKLSAgICBmaW5hbGl6ZVZQOURlY29kZXIsCi0gICAgY29weVZQOURlY29kZXJEZWJ1Z0Rl
c2NyaXB0aW9uLAotICAgIG51bGxwdHIsIC8vIENvcHlQcm9wZXJ0eQotICAgIG51bGxwdHIsIC8v
IFNldFByb3BlcnR5Ci0gICAgbnVsbHB0ciwKLSAgICBudWxscHRyCi19OworI2lmIGRlZmluZWQo
V0VCUlRDX0FSQ0hfWDg2XzY0KQorICAgIGNvbnN0ZXhwciBzaXplX3QgcGFkU2l6ZSA9IDQ7Cisj
ZWxzZQorICAgIGNvbnN0ZXhwciBzaXplX3QgcGFkU2l6ZSA9IDA7CisjZW5kaWYKKworI3ByYWdt
YSBwYWNrKHB1c2gsIDQpCisgICAgc3RydWN0IERlY29kZXJDbGFzcyB7IHVpbnQ4X3QgcGFkW3Bh
ZFNpemVdOyBDTUJhc2VDbGFzcyBhbGlnbmVkQ2xhc3M7IH0gV2ViS2l0VlA5RGVjb2Rlcl9CYXNl
Q2xhc3MgeyB7IH0sIHsKKyAgICAgICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwKKyAg
ICAgICAgc2l6ZW9mKFdlYktpdFZQOURlY29kZXIpLAorICAgICAgICBudWxscHRyLCAvLyBDb21w
YXJpc29uIGJ5IHBvaW50ZXIgZXF1YWxpdHkKKyAgICAgICAgaW52YWxpZGF0ZVZQOURlY29kZXIs
CisgICAgICAgIGZpbmFsaXplVlA5RGVjb2RlciwKKyAgICAgICAgY29weVZQOURlY29kZXJEZWJ1
Z0Rlc2NyaXB0aW9uLAorICAgICAgICBudWxscHRyLCAvLyBDb3B5UHJvcGVydHkKKyAgICAgICAg
bnVsbHB0ciwgLy8gU2V0UHJvcGVydHkKKyAgICAgICAgbnVsbHB0ciwKKyAgICAgICAgbnVsbHB0
cgorICAgIH0gfTsKKyNwcmFnbWEgcGFjayhwb3ApCisKKyNpZiBkZWZpbmVkKFdFQlJUQ19BUkNI
X1g4Nl82NCkKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihXZWJLaXRWUDlEZWNvZGVyX0Jhc2VD
bGFzcy5hbGlnbmVkQ2xhc3MudmVyc2lvbikgIT0gc2l6ZW9mKHZvaWQqKSwgIkNNQmFzZUNsYXNz
IGZpeHVwIGlzIHJlcXVpcmVkIG9uIFg4Nl82NCIpOworI2Vsc2UKKyAgICBzdGF0aWNfYXNzZXJ0
KHNpemVvZihXZWJLaXRWUDlEZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MudmVyc2lvbikg
PT0gc2l6ZW9mKHZvaWQqKSwgIkNNQmFzZUNsYXNzIGZpeHVwIG9ubHkgcmVxdWlyZWQgb24gWDg2
XzY0Iik7CisjZW5kaWYKKyAgICBzdGF0aWNfYXNzZXJ0KGFsaWdub2YoRGVjb2RlckNsYXNzKSA9
PSA0LCAiQ01CYXNlQ2xhc3MgbXVzdCBoYXZlIDQgYnl0ZSBhbGlnbm1lbnQiKTsKIAogc3RhdGlj
IE9TU3RhdHVzIHN0YXJ0VlA5RGVjb2RlclNlc3Npb24oVlRWaWRlb0RlY29kZXJSZWYsIFZUVmlk
ZW9EZWNvZGVyU2Vzc2lvbiwgQ01WaWRlb0Zvcm1hdERlc2NyaXB0aW9uUmVmKTsKIHN0YXRpYyBP
U1N0YXR1cyBkZWNvZGVWUDlEZWNvZGVyRnJhbWUoVlRWaWRlb0RlY29kZXJSZWYsIFZUVmlkZW9E
ZWNvZGVyRnJhbWUsIENNU2FtcGxlQnVmZmVyUmVmLCBWVERlY29kZUZyYW1lRmxhZ3MsIFZURGVj
b2RlSW5mb0ZsYWdzKik7CkBAIC04Miw3ICs5Nyw3IEBAIHN0YXRpYyBjb25zdCBWVFZpZGVvRGVj
b2RlckNsYXNzIFdlYktpdFZQOURlY29kZXJfVmlkZW9EZWNvZGVyQ2xhc3MgPQogCiBzdGF0aWMg
Y29uc3QgVlRWaWRlb0RlY29kZXJWVGFibGUgV2ViS2l0VlA5RGVjb2RlclZUYWJsZSA9CiB7Ci0g
ICAgeyBudWxscHRyLCAmV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MgfSwKKyAgICB7IG51bGxw
dHIsICZXZWJLaXRWUDlEZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MgfSwKICAgICAmV2Vi
S2l0VlA5RGVjb2Rlcl9WaWRlb0RlY29kZXJDbGFzcwogfTsKIAo=
</data>
<flag name="commit-queue"
          id="453551"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431711</attachid>
            <date>2021-06-17 13:04:53 -0700</date>
            <delta_ts>2021-06-19 16:17:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227137-20210617130453.patch</filename>
            <type>text/plain</type>
            <size>6202</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n
ZUxvZwppbmRleCBhZjM5ODMyMTM3ZDIyM2E3ZmJkNzc1M2UzNmFhNmVkZTY1MTZiOTEzLi5mZTA5
ODAwNjkxYjQ4MzdhYjBlMmRlYTUyOTdkNmFiNzYyZWM3NmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wNi0xNyAgRXJpYyBDYXJs
c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBsaWJ3ZWJydGMg
Q01CYXNlQ2xhc3Mgb2JqZWN0cyBuZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTM3CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICAqIFNvdXJjZS93ZWJydGMvc2RrL1dlYktp
dC9XZWJLaXRWUDhEZWNvZGVyLmNwcDoKKyAgICAgICAgKHdlYnJ0Yzo6Y3JlYXRlV2ViS2l0VlA4
RGVjb2Rlcik6IEFkZCBwYWRkaW5nIHRvIHRoZSBDTUJhc2VDbGFzcyBvYmplY3Qgb24geDg2XzY0
CisgICAgICAgIHNvIGZ1bmN0aW9uIHBvaW50ZXJzIGFyZSBuYXR1cmFsbHkgYWxpZ25lZC4gQWRk
IHN0YXRpY19hc3NlcnRzIHRvIGVuc3VyZSBhbGlnbm1lbnQKKyAgICAgICAgYW5kIHNpemVzIGFy
ZSBjb3JyZWN0LgorICAgICAgICAqIFNvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlE
ZWNvZGVyLmNwcDoKKyAgICAgICAgKHdlYnJ0Yzo6Y3JlYXRlV2ViS2l0VlA5RGVjb2Rlcik6IERp
dHRvLgorCiAyMDIxLTA2LTEwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4gYW5k
IFZpY3RvciBNLiBKYXF1ZXogTC4gPHZqYXF1ZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBVcGRh
dGUgbGlid2VicnRjIHRvIE05MgpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2Vi
cnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDhEZWNvZGVyLmNwcCBiL1NvdXJj
ZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA4
RGVjb2Rlci5jcHAKaW5kZXggMjA1ZDAyNTA3ZmQ4NzRkZGFhYmJlOWQ2ZWEyMjU1Y2NlZGIzNmY5
ZS4uZGMyYzQ2YjdhMDNlZmQxNzAwZTMyZTc2NTliNTIzYzM4ZTE2NjE1ZiAxMDA2NDQKLS0tIGEv
U291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJL
aXRWUDhEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNl
L3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOERlY29kZXIuY3BwCkBAIC00OCwxOSArNDgsMzMg
QEAgc3RhdGljIE9TU3RhdHVzIGludmFsaWRhdGVWUDhEZWNvZGVyKENNQmFzZU9iamVjdFJlZik7
CiBzdGF0aWMgdm9pZCBmaW5hbGl6ZVZQOERlY29kZXIoQ01CYXNlT2JqZWN0UmVmKTsKIHN0YXRp
YyBDRlN0cmluZ1JlZiBjb3B5VlA4RGVjb2RlckRlYnVnRGVzY3JpcHRpb24oQ01CYXNlT2JqZWN0
UmVmKTsKIAotc3RhdGljIGNvbnN0IENNQmFzZUNsYXNzIFdlYktpdFZQOERlY29kZXJfQmFzZUNs
YXNzID0KLXsKLSAgICBrQ01CYXNlT2JqZWN0X0NsYXNzVmVyc2lvbl8xLAotICAgIHNpemVvZihX
ZWJLaXRWUDhEZWNvZGVyKSwKLSAgICBudWxscHRyLCAvLyBDb21wYXJpc29uIGJ5IHBvaW50ZXIg
ZXF1YWxpdHkKLSAgICBpbnZhbGlkYXRlVlA4RGVjb2RlciwKLSAgICBmaW5hbGl6ZVZQOERlY29k
ZXIsCi0gICAgY29weVZQOERlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9uLAotICAgIG51bGxwdHIsIC8v
IENvcHlQcm9wZXJ0eQotICAgIG51bGxwdHIsIC8vIFNldFByb3BlcnR5Ci0gICAgbnVsbHB0ciwK
LSAgICBudWxscHRyCi19OworI2lmIGRlZmluZWQoX194ODZfNjRfXykgfHwgZGVmaW5lZChfTV9Y
NjQpCisgICAgY29uc3RleHByIHNpemVfdCBwYWRTaXplID0gNDsKKyNlbHNlCisgICAgY29uc3Rl
eHByIHNpemVfdCBwYWRTaXplID0gMDsKKyNlbmRpZgorCisjcHJhZ21hIHBhY2socHVzaCwgNCkK
KyAgICBzdHJ1Y3QgRGVjb2RlckNsYXNzIHsgdWludDhfdCBwYWRbcGFkU2l6ZV07IENNQmFzZUNs
YXNzIGFsaWduZWRDbGFzczsgfSBXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcyB7IHsgfSwgewor
ICAgICAgICBrQ01CYXNlT2JqZWN0X0NsYXNzVmVyc2lvbl8xLAorICAgICAgICBzaXplb2YoV2Vi
S2l0VlA4RGVjb2RlciksCisgICAgICAgIG51bGxwdHIsIC8vIENvbXBhcmlzb24gYnkgcG9pbnRl
ciBlcXVhbGl0eQorICAgICAgICBpbnZhbGlkYXRlVlA4RGVjb2RlciwKKyAgICAgICAgZmluYWxp
emVWUDhEZWNvZGVyLAorICAgICAgICBjb3B5VlA4RGVjb2RlckRlYnVnRGVzY3JpcHRpb24sCisg
ICAgICAgIG51bGxwdHIsIC8vIENvcHlQcm9wZXJ0eQorICAgICAgICBudWxscHRyLCAvLyBTZXRQ
cm9wZXJ0eQorICAgICAgICBudWxscHRyLAorICAgICAgICBudWxscHRyCisgICAgfSB9OworI3By
YWdtYSBwYWNrKHBvcCkKKworI2lmIGRlZmluZWQoX194ODZfNjRfXykgfHwgZGVmaW5lZChfTV9Y
NjQpCisgICAgc3RhdGljX2Fzc2VydChzaXplb2YoV2ViS2l0VlA4RGVjb2Rlcl9CYXNlQ2xhc3Mu
YWxpZ25lZENsYXNzLnZlcnNpb24pICE9IHNpemVvZih2b2lkKiksICJDTUJhc2VDbGFzcyBmaXh1
cCBpcyByZXF1aXJlZCBvbiBYODZfNjQiKTsKKyNlbHNlCisgICAgc3RhdGljX2Fzc2VydChzaXpl
b2YoV2ViS2l0VlA4RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25lZENsYXNzLnZlcnNpb24pID09IHNp
emVvZih2b2lkKiksICJDTUJhc2VDbGFzcyBmaXh1cCBvbmx5IHJlcXVpcmVkIG9uIFg4Nl82NCIp
OworI2VuZGlmCisgICAgc3RhdGljX2Fzc2VydChhbGlnbm9mKERlY29kZXJDbGFzcykgPT0gNCwg
IkNNQmFzZUNsYXNzIG11c3QgaGF2ZSA0IGJ5dGUgYWxpZ25tZW50Iik7CiAKIHN0YXRpYyBPU1N0
YXR1cyBzdGFydFZQOERlY29kZXJTZXNzaW9uKFZUVmlkZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVj
b2RlclNlc3Npb24sIENNVmlkZW9Gb3JtYXREZXNjcmlwdGlvblJlZik7CiBzdGF0aWMgT1NTdGF0
dXMgZGVjb2RlVlA4RGVjb2RlckZyYW1lKFZUVmlkZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2Rl
ckZyYW1lLCBDTVNhbXBsZUJ1ZmZlclJlZiwgVlREZWNvZGVGcmFtZUZsYWdzLCBWVERlY29kZUlu
Zm9GbGFncyopOwpAQCAtODIsNyArOTYsNyBAQCBzdGF0aWMgY29uc3QgVlRWaWRlb0RlY29kZXJD
bGFzcyBXZWJLaXRWUDhEZWNvZGVyX1ZpZGVvRGVjb2RlckNsYXNzID0KIAogc3RhdGljIGNvbnN0
IFZUVmlkZW9EZWNvZGVyVlRhYmxlIFdlYktpdFZQOERlY29kZXJWVGFibGUgPQogewotICAgIHsg
bnVsbHB0ciwgJldlYktpdFZQOERlY29kZXJfQmFzZUNsYXNzIH0sCisgICAgeyBudWxscHRyLCAm
V2ViS2l0VlA4RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25lZENsYXNzIH0sCiAgICAgJldlYktpdFZQ
OERlY29kZXJfVmlkZW9EZWNvZGVyQ2xhc3MKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGly
ZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVjb2Rl
ci5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2Vi
S2l0L1dlYktpdFZQOURlY29kZXIuY3BwCmluZGV4IDEyMzk5NTIyNmQ4YjY4OWFiMDdiOTAxZjMz
MWViNjdhODcxN2RiYTguLjMwMzBmZTlmNDgwN2ZjYjFkZDM5NTg0MGMyMjUwNWRkYjIzNTRmMjYg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nk
ay9XZWJLaXQvV2ViS2l0VlA5RGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGli
d2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlEZWNvZGVyLmNwcApAQCAt
NDgsMTkgKzQ4LDMzIEBAIHN0YXRpYyBPU1N0YXR1cyBpbnZhbGlkYXRlVlA5RGVjb2RlcihDTUJh
c2VPYmplY3RSZWYpOwogc3RhdGljIHZvaWQgZmluYWxpemVWUDlEZWNvZGVyKENNQmFzZU9iamVj
dFJlZik7CiBzdGF0aWMgQ0ZTdHJpbmdSZWYgY29weVZQOURlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9u
KENNQmFzZU9iamVjdFJlZik7CiAKLXN0YXRpYyBjb25zdCBDTUJhc2VDbGFzcyBXZWJLaXRWUDlE
ZWNvZGVyX0Jhc2VDbGFzcyA9Ci17Ci0gICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwK
LSAgICBzaXplb2YoV2ViS2l0VlA5RGVjb2RlciksCi0gICAgbnVsbHB0ciwgLy8gQ29tcGFyaXNv
biBieSBwb2ludGVyIGVxdWFsaXR5Ci0gICAgaW52YWxpZGF0ZVZQOURlY29kZXIsCi0gICAgZmlu
YWxpemVWUDlEZWNvZGVyLAotICAgIGNvcHlWUDlEZWNvZGVyRGVidWdEZXNjcmlwdGlvbiwKLSAg
ICBudWxscHRyLCAvLyBDb3B5UHJvcGVydHkKLSAgICBudWxscHRyLCAvLyBTZXRQcm9wZXJ0eQot
ICAgIG51bGxwdHIsCi0gICAgbnVsbHB0cgotfTsKKyNpZiBkZWZpbmVkKF9feDg2XzY0X18pIHx8
IGRlZmluZWQoX01fWDY0KQorICAgIGNvbnN0ZXhwciBzaXplX3QgcGFkU2l6ZSA9IDQ7CisjZWxz
ZQorICAgIGNvbnN0ZXhwciBzaXplX3QgcGFkU2l6ZSA9IDA7CisjZW5kaWYKKworI3ByYWdtYSBw
YWNrKHB1c2gsIDQpCisgICAgc3RydWN0IERlY29kZXJDbGFzcyB7IHVpbnQ4X3QgcGFkW3BhZFNp
emVdOyBDTUJhc2VDbGFzcyBhbGlnbmVkQ2xhc3M7IH0gV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xh
c3MgeyB7IH0sIHsKKyAgICAgICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwKKyAgICAg
ICAgc2l6ZW9mKFdlYktpdFZQOURlY29kZXIpLAorICAgICAgICBudWxscHRyLCAvLyBDb21wYXJp
c29uIGJ5IHBvaW50ZXIgZXF1YWxpdHkKKyAgICAgICAgaW52YWxpZGF0ZVZQOURlY29kZXIsCisg
ICAgICAgIGZpbmFsaXplVlA5RGVjb2RlciwKKyAgICAgICAgY29weVZQOURlY29kZXJEZWJ1Z0Rl
c2NyaXB0aW9uLAorICAgICAgICBudWxscHRyLCAvLyBDb3B5UHJvcGVydHkKKyAgICAgICAgbnVs
bHB0ciwgLy8gU2V0UHJvcGVydHkKKyAgICAgICAgbnVsbHB0ciwKKyAgICAgICAgbnVsbHB0cgor
ICAgIH0gfTsKKyNwcmFnbWEgcGFjayhwb3ApCisKKyNpZiBkZWZpbmVkKF9feDg2XzY0X18pIHx8
IGRlZmluZWQoX01fWDY0KQorICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKFdlYktpdFZQOURlY29k
ZXJfQmFzZUNsYXNzLmFsaWduZWRDbGFzcy52ZXJzaW9uKSAhPSBzaXplb2Yodm9pZCopLCAiQ01C
YXNlQ2xhc3MgZml4dXAgaXMgcmVxdWlyZWQgb24gWDg2XzY0Iik7CisjZWxzZQorICAgIHN0YXRp
Y19hc3NlcnQoc2l6ZW9mKFdlYktpdFZQOURlY29kZXJfQmFzZUNsYXNzLmFsaWduZWRDbGFzcy52
ZXJzaW9uKSA9PSBzaXplb2Yodm9pZCopLCAiQ01CYXNlQ2xhc3MgZml4dXAgb25seSByZXF1aXJl
ZCBvbiBYODZfNjQiKTsKKyNlbmRpZgorICAgIHN0YXRpY19hc3NlcnQoYWxpZ25vZihEZWNvZGVy
Q2xhc3MpID09IDQsICJDTUJhc2VDbGFzcyBtdXN0IGhhdmUgNCBieXRlIGFsaWdubWVudCIpOwog
CiBzdGF0aWMgT1NTdGF0dXMgc3RhcnRWUDlEZWNvZGVyU2Vzc2lvbihWVFZpZGVvRGVjb2RlclJl
ZiwgVlRWaWRlb0RlY29kZXJTZXNzaW9uLCBDTVZpZGVvRm9ybWF0RGVzY3JpcHRpb25SZWYpOwog
c3RhdGljIE9TU3RhdHVzIGRlY29kZVZQOURlY29kZXJGcmFtZShWVFZpZGVvRGVjb2RlclJlZiwg
VlRWaWRlb0RlY29kZXJGcmFtZSwgQ01TYW1wbGVCdWZmZXJSZWYsIFZURGVjb2RlRnJhbWVGbGFn
cywgVlREZWNvZGVJbmZvRmxhZ3MqKTsKQEAgLTgyLDcgKzk2LDcgQEAgc3RhdGljIGNvbnN0IFZU
VmlkZW9EZWNvZGVyQ2xhc3MgV2ViS2l0VlA5RGVjb2Rlcl9WaWRlb0RlY29kZXJDbGFzcyA9CiAK
IHN0YXRpYyBjb25zdCBWVFZpZGVvRGVjb2RlclZUYWJsZSBXZWJLaXRWUDlEZWNvZGVyVlRhYmxl
ID0KIHsKLSAgICB7IG51bGxwdHIsICZXZWJLaXRWUDlEZWNvZGVyX0Jhc2VDbGFzcyB9LAorICAg
IHsgbnVsbHB0ciwgJldlYktpdFZQOURlY29kZXJfQmFzZUNsYXNzLmFsaWduZWRDbGFzcyB9LAog
ICAgICZXZWJLaXRWUDlEZWNvZGVyX1ZpZGVvRGVjb2RlckNsYXNzCiB9OwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431808</attachid>
            <date>2021-06-19 16:17:56 -0700</date>
            <delta_ts>2021-06-21 11:13:39 -0700</delta_ts>
            <desc>Updated patch</desc>
            <filename>bug-227137-20210619161756.patch</filename>
            <type>text/plain</type>
            <size>6953</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n
ZUxvZwppbmRleCA4NGU5NzExY2FhMTRkNTk3ZWFiMmRjMDYwOWUyMTA3YjcxNDgyMWE0Li5kNTZm
MzViZmVjODQzNDMwZmE4NzQ3NmYyYTJjNzMwNWY1YzY2ZDU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wNi0xOCAgRXJpYyBDYXJs
c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBsaWJ3ZWJydGMg
Q01CYXNlQ2xhc3Mgb2JqZWN0cyBuZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTM3CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQ2NDEyND4KKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0Lgor
CisgICAgICAgICh3ZWJydGM6OmNyZWF0ZVdlYktpdFZQOERlY29kZXIpOiBBZGQgcGFkZGluZyB0
byB0aGUgQ01CYXNlQ2xhc3Mgb2JqZWN0IG9uIHg4Nl82NAorICAgICAgICBzbyBmdW5jdGlvbiBw
b2ludGVycyBhcmUgbmF0dXJhbGx5IGFsaWduZWQuCisgICAgICAgICogU291cmNlL3dlYnJ0Yy9z
ZGsvV2ViS2l0L1dlYktpdFZQOURlY29kZXIuY3BwOgorICAgICAgICAod2VicnRjOjpjcmVhdGVX
ZWJLaXRWUDlEZWNvZGVyKTogRGl0dG8uCisKIDIwMjEtMDYtMTcgIENvbW1pdCBRdWV1ZSAgPGNv
bW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyBy
Mjc5MDExLgpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93
ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDhEZWNvZGVyLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5
L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA4RGVjb2Rlci5jcHAK
aW5kZXggMjA1ZDAyNTA3ZmQ4NzRkZGFhYmJlOWQ2ZWEyMjU1Y2NlZGIzNmY5ZS4uNTY2ZTMzMTI0
ZWFmODVhMjg2M2VlN2YyZWRkMWNiYTZjZWE0ODc1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJk
UGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDhEZWNvZGVy
LmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsv
V2ViS2l0L1dlYktpdFZQOERlY29kZXIuY3BwCkBAIC00OCw4ICs0OCw5IEBAIHN0YXRpYyBPU1N0
YXR1cyBpbnZhbGlkYXRlVlA4RGVjb2RlcihDTUJhc2VPYmplY3RSZWYpOwogc3RhdGljIHZvaWQg
ZmluYWxpemVWUDhEZWNvZGVyKENNQmFzZU9iamVjdFJlZik7CiBzdGF0aWMgQ0ZTdHJpbmdSZWYg
Y29weVZQOERlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9uKENNQmFzZU9iamVjdFJlZik7CiAKLXN0YXRp
YyBjb25zdCBDTUJhc2VDbGFzcyBXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcyA9CitDTV9TVEFU
SUNfQ09OU1RfUE9JTlRFUl9BTElHTkVEX1BBQ0s0X0NMQVNTKENNQmFzZUNsYXNzKSBXZWJLaXRW
UDhEZWNvZGVyX0Jhc2VDbGFzcyA9CiB7CisgICAgQ01fQUxJR05FRF9DTEFTU19QQURESU5HCiAg
ICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwKICAgICBzaXplb2YoV2ViS2l0VlA4RGVj
b2RlciksCiAgICAgbnVsbHB0ciwgLy8gQ29tcGFyaXNvbiBieSBwb2ludGVyIGVxdWFsaXR5CkBA
IC02NSwyNSArNjYsMjcgQEAgc3RhdGljIGNvbnN0IENNQmFzZUNsYXNzIFdlYktpdFZQOERlY29k
ZXJfQmFzZUNsYXNzID0KIHN0YXRpYyBPU1N0YXR1cyBzdGFydFZQOERlY29kZXJTZXNzaW9uKFZU
VmlkZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlclNlc3Npb24sIENNVmlkZW9Gb3JtYXREZXNj
cmlwdGlvblJlZik7CiBzdGF0aWMgT1NTdGF0dXMgZGVjb2RlVlA4RGVjb2RlckZyYW1lKFZUVmlk
ZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlckZyYW1lLCBDTVNhbXBsZUJ1ZmZlclJlZiwgVlRE
ZWNvZGVGcmFtZUZsYWdzLCBWVERlY29kZUluZm9GbGFncyopOwogCi1zdGF0aWMgY29uc3QgVlRW
aWRlb0RlY29kZXJDbGFzcyBXZWJLaXRWUDhEZWNvZGVyX1ZpZGVvRGVjb2RlckNsYXNzID0KK0NN
X1NUQVRJQ19DT05TVF9QT0lOVEVSX0FMSUdORURfUEFDSzRfQ0xBU1MoVlRWaWRlb0RlY29kZXJD
bGFzcykgV2ViS2l0VlA4RGVjb2Rlcl9WaWRlb0RlY29kZXJDbGFzcyA9CiB7Ci0gICAga1ZUVmlk
ZW9EZWNvZGVyX0NsYXNzVmVyc2lvbl8xLAotICAgIHN0YXJ0VlA4RGVjb2RlclNlc3Npb24sCi0g
ICAgZGVjb2RlVlA4RGVjb2RlckZyYW1lLAotICAgIG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVy
RnVuY3Rpb25fQ29weVN1cHBvcnRlZFByb3BlcnR5RGljdGlvbmFyeSwKLSAgICBudWxscHRyLCAv
LyBWVFZpZGVvRGVjb2RlckZ1bmN0aW9uX1NldFByb3BlcnRpZXMKLSAgICBudWxscHRyLCAvLyBW
VFZpZGVvRGVjb2RlckZ1bmN0aW9uX0NvcHlTZXJpYWxpemFibGVQcm9wZXJ0aWVzCi0gICAgbnVs
bHB0ciwgLy8gVlRWaWRlb0RlY29kZXJGdW5jdGlvbl9DYW5BY2NlcHRGb3JtYXREZXNjcmlwdGlv
bgotICAgIG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rpb25fRmluaXNoRGVsYXllZEZy
YW1lcwotICAgIG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rpb25fU3RhcnRUaWxlU2Vz
c2lvbgotICAgIG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rpb25fRGVjb2RlVGlsZQot
ICAgIG51bGxwdHIgLy8gVlRWaWRlb0RlY29kZXJGdW5jdGlvbl9GaW5pc2hEZWxheWVkVGlsZXMK
KyAgICBDTV9BTElHTkVEX0NMQVNTX1BBRERJTkcgeworICAgICAgICBrVlRWaWRlb0RlY29kZXJf
Q2xhc3NWZXJzaW9uXzEsCisgICAgICAgIHN0YXJ0VlA4RGVjb2RlclNlc3Npb24sCisgICAgICAg
IGRlY29kZVZQOERlY29kZXJGcmFtZSwKKyAgICAgICAgbnVsbHB0ciwgLy8gVlRWaWRlb0RlY29k
ZXJGdW5jdGlvbl9Db3B5U3VwcG9ydGVkUHJvcGVydHlEaWN0aW9uYXJ5LAorICAgICAgICBudWxs
cHRyLCAvLyBWVFZpZGVvRGVjb2RlckZ1bmN0aW9uX1NldFByb3BlcnRpZXMKKyAgICAgICAgbnVs
bHB0ciwgLy8gVlRWaWRlb0RlY29kZXJGdW5jdGlvbl9Db3B5U2VyaWFsaXphYmxlUHJvcGVydGll
cworICAgICAgICBudWxscHRyLCAvLyBWVFZpZGVvRGVjb2RlckZ1bmN0aW9uX0NhbkFjY2VwdEZv
cm1hdERlc2NyaXB0aW9uCisgICAgICAgIG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rp
b25fRmluaXNoRGVsYXllZEZyYW1lcworICAgICAgICBudWxscHRyLCAvLyBWVFZpZGVvRGVjb2Rl
ckZ1bmN0aW9uX1N0YXJ0VGlsZVNlc3Npb24KKyAgICAgICAgbnVsbHB0ciwgLy8gVlRWaWRlb0Rl
Y29kZXJGdW5jdGlvbl9EZWNvZGVUaWxlCisgICAgICAgIG51bGxwdHIgLy8gVlRWaWRlb0RlY29k
ZXJGdW5jdGlvbl9GaW5pc2hEZWxheWVkVGlsZXMKKyAgICB9CiB9OwogCiBzdGF0aWMgY29uc3Qg
VlRWaWRlb0RlY29kZXJWVGFibGUgV2ViS2l0VlA4RGVjb2RlclZUYWJsZSA9CiB7Ci0gICAgeyBu
dWxscHRyLCAmV2ViS2l0VlA4RGVjb2Rlcl9CYXNlQ2xhc3MgfSwKLSAgICAmV2ViS2l0VlA4RGVj
b2Rlcl9WaWRlb0RlY29kZXJDbGFzcworICAgIHsgbnVsbHB0ciwgJldlYktpdFZQOERlY29kZXJf
QmFzZUNsYXNzLmFsaWduZWRDbGFzcyB9LAorICAgICZXZWJLaXRWUDhEZWNvZGVyX1ZpZGVvRGVj
b2RlckNsYXNzLmFsaWduZWRDbGFzcwogfTsKIAogT1NTdGF0dXMgY3JlYXRlV2ViS2l0VlA4RGVj
b2RlcihGaWdWaWRlb0NvZGVjVHlwZSwgQ0ZBbGxvY2F0b3JSZWYgYWxsb2NhdG9yLCBWVFZpZGVv
RGVjb2RlclJlZiogZGVjb2Rlck91dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVjb2Rlci5jcHAgYi9T
b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktp
dFZQOURlY29kZXIuY3BwCmluZGV4IDEyMzk5NTIyNmQ4YjY4OWFiMDdiOTAxZjMzMWViNjdhODcx
N2RiYTguLjU0YTk4MTllMGU5YWEyOGM3MTFlNzA5NzhhNTg4MjFjYTk4YTE5ZWMgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQv
V2ViS2l0VlA5RGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1Nv
dXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlEZWNvZGVyLmNwcApAQCAtNDgsOCArNDgs
OSBAQCBzdGF0aWMgT1NTdGF0dXMgaW52YWxpZGF0ZVZQOURlY29kZXIoQ01CYXNlT2JqZWN0UmVm
KTsKIHN0YXRpYyB2b2lkIGZpbmFsaXplVlA5RGVjb2RlcihDTUJhc2VPYmplY3RSZWYpOwogc3Rh
dGljIENGU3RyaW5nUmVmIGNvcHlWUDlEZWNvZGVyRGVidWdEZXNjcmlwdGlvbihDTUJhc2VPYmpl
Y3RSZWYpOwogCi1zdGF0aWMgY29uc3QgQ01CYXNlQ2xhc3MgV2ViS2l0VlA5RGVjb2Rlcl9CYXNl
Q2xhc3MgPQorQ01fU1RBVElDX0NPTlNUX1BPSU5URVJfQUxJR05FRF9QQUNLNF9DTEFTUyhDTUJh
c2VDbGFzcykgV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MgPQogeworICAgIENNX0FMSUdORURf
Q0xBU1NfUEFERElORwogICAgIGtDTUJhc2VPYmplY3RfQ2xhc3NWZXJzaW9uXzEsCiAgICAgc2l6
ZW9mKFdlYktpdFZQOURlY29kZXIpLAogICAgIG51bGxwdHIsIC8vIENvbXBhcmlzb24gYnkgcG9p
bnRlciBlcXVhbGl0eQpAQCAtNjUsMjUgKzY2LDI3IEBAIHN0YXRpYyBjb25zdCBDTUJhc2VDbGFz
cyBXZWJLaXRWUDlEZWNvZGVyX0Jhc2VDbGFzcyA9CiBzdGF0aWMgT1NTdGF0dXMgc3RhcnRWUDlE
ZWNvZGVyU2Vzc2lvbihWVFZpZGVvRGVjb2RlclJlZiwgVlRWaWRlb0RlY29kZXJTZXNzaW9uLCBD
TVZpZGVvRm9ybWF0RGVzY3JpcHRpb25SZWYpOwogc3RhdGljIE9TU3RhdHVzIGRlY29kZVZQOURl
Y29kZXJGcmFtZShWVFZpZGVvRGVjb2RlclJlZiwgVlRWaWRlb0RlY29kZXJGcmFtZSwgQ01TYW1w
bGVCdWZmZXJSZWYsIFZURGVjb2RlRnJhbWVGbGFncywgVlREZWNvZGVJbmZvRmxhZ3MqKTsKIAot
c3RhdGljIGNvbnN0IFZUVmlkZW9EZWNvZGVyQ2xhc3MgV2ViS2l0VlA5RGVjb2Rlcl9WaWRlb0Rl
Y29kZXJDbGFzcyA9CitDTV9TVEFUSUNfQ09OU1RfUE9JTlRFUl9BTElHTkVEX1BBQ0s0X0NMQVNT
KFZUVmlkZW9EZWNvZGVyQ2xhc3MpIFdlYktpdFZQOURlY29kZXJfVmlkZW9EZWNvZGVyQ2xhc3Mg
PQogeworICAgIENNX0FMSUdORURfQ0xBU1NfUEFERElORyB7CiAgICAga1ZUVmlkZW9EZWNvZGVy
X0NsYXNzVmVyc2lvbl8xLAotICAgIHN0YXJ0VlA5RGVjb2RlclNlc3Npb24sCi0gICAgZGVjb2Rl
VlA5RGVjb2RlckZyYW1lLAotICAgIG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rpb25f
Q29weVN1cHBvcnRlZFByb3BlcnR5RGljdGlvbmFyeSwKLSAgICBudWxscHRyLCAvLyBWVFZpZGVv
RGVjb2RlckZ1bmN0aW9uX1NldFByb3BlcnRpZXMKLSAgICBudWxscHRyLCAvLyBWVFZpZGVvRGVj
b2RlckZ1bmN0aW9uX0NvcHlTZXJpYWxpemFibGVQcm9wZXJ0aWVzCi0gICAgbnVsbHB0ciwgLy8g
VlRWaWRlb0RlY29kZXJGdW5jdGlvbl9DYW5BY2NlcHRGb3JtYXREZXNjcmlwdGlvbgotICAgIG51
bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rpb25fRmluaXNoRGVsYXllZEZyYW1lcwotICAg
IG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rpb25fU3RhcnRUaWxlU2Vzc2lvbgotICAg
IG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rpb25fRGVjb2RlVGlsZQotICAgIG51bGxw
dHIgLy8gVlRWaWRlb0RlY29kZXJGdW5jdGlvbl9GaW5pc2hEZWxheWVkVGlsZXMKKyAgICAgICAg
c3RhcnRWUDlEZWNvZGVyU2Vzc2lvbiwKKyAgICAgICAgZGVjb2RlVlA5RGVjb2RlckZyYW1lLAor
ICAgICAgICBudWxscHRyLCAvLyBWVFZpZGVvRGVjb2RlckZ1bmN0aW9uX0NvcHlTdXBwb3J0ZWRQ
cm9wZXJ0eURpY3Rpb25hcnksCisgICAgICAgIG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVu
Y3Rpb25fU2V0UHJvcGVydGllcworICAgICAgICBudWxscHRyLCAvLyBWVFZpZGVvRGVjb2RlckZ1
bmN0aW9uX0NvcHlTZXJpYWxpemFibGVQcm9wZXJ0aWVzCisgICAgICAgIG51bGxwdHIsIC8vIFZU
VmlkZW9EZWNvZGVyRnVuY3Rpb25fQ2FuQWNjZXB0Rm9ybWF0RGVzY3JpcHRpb24KKyAgICAgICAg
bnVsbHB0ciwgLy8gVlRWaWRlb0RlY29kZXJGdW5jdGlvbl9GaW5pc2hEZWxheWVkRnJhbWVzCisg
ICAgICAgIG51bGxwdHIsIC8vIFZUVmlkZW9EZWNvZGVyRnVuY3Rpb25fU3RhcnRUaWxlU2Vzc2lv
bgorICAgICAgICBudWxscHRyLCAvLyBWVFZpZGVvRGVjb2RlckZ1bmN0aW9uX0RlY29kZVRpbGUK
KyAgICAgICAgbnVsbHB0ciAvLyBWVFZpZGVvRGVjb2RlckZ1bmN0aW9uX0ZpbmlzaERlbGF5ZWRU
aWxlcworICAgIH0KIH07CiAKIHN0YXRpYyBjb25zdCBWVFZpZGVvRGVjb2RlclZUYWJsZSBXZWJL
aXRWUDlEZWNvZGVyVlRhYmxlID0KIHsKLSAgICB7IG51bGxwdHIsICZXZWJLaXRWUDlEZWNvZGVy
X0Jhc2VDbGFzcyB9LAotICAgICZXZWJLaXRWUDlEZWNvZGVyX1ZpZGVvRGVjb2RlckNsYXNzCisg
ICAgeyBudWxscHRyLCAmV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25lZENsYXNzIH0s
CisgICAgJldlYktpdFZQOURlY29kZXJfVmlkZW9EZWNvZGVyQ2xhc3MuYWxpZ25lZENsYXNzCiB9
OwogCiBPU1N0YXR1cyBjcmVhdGVXZWJLaXRWUDlEZWNvZGVyKEZpZ1ZpZGVvQ29kZWNUeXBlLCBD
RkFsbG9jYXRvclJlZiBhbGxvY2F0b3IsIFZUVmlkZW9EZWNvZGVyUmVmKiBkZWNvZGVyT3V0KQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431881</attachid>
            <date>2021-06-21 11:13:40 -0700</date>
            <delta_ts>2021-06-21 14:17:32 -0700</delta_ts>
            <desc>Updated patch</desc>
            <filename>bug-227137-20210621111340.patch</filename>
            <type>text/plain</type>
            <size>6730</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n
ZUxvZwppbmRleCA4NGU5NzExY2FhMTRkNTk3ZWFiMmRjMDYwOWUyMTA3YjcxNDgyMWE0Li5kNTUz
NGY3ODZiZWVkYjJkNWQ4ZmNmZDIzNzhhMDIwZjExYzE0OWVlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMS0wNi0xOCAgRXJpYyBDYXJs
c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBsaWJ3ZWJydGMg
Q01CYXNlQ2xhc3Mgb2JqZWN0cyBuZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTM3CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQ2NDEyND4KKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0Lgor
CisgICAgICAgICogU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdERlY29kZXIuaDogRGVm
aW5lIENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5ULgorCisgICAgICAgICogU291cmNlL3dl
YnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOERlY29kZXIuY3BwOgorICAgICAgICAod2VicnRjOjpj
cmVhdGVXZWJLaXRWUDhEZWNvZGVyKTogQWRkIHBhZGRpbmcgdG8gdGhlIENNQmFzZUNsYXNzIG9i
amVjdCBvbiBNYWMgYW5kCisgICAgICAgIE1hYyBDYXRhbHlzdCB3aGVuIGJ1aWxkaW5nIGZvciB4
ODZfNjQgc28gZnVuY3Rpb24gcG9pbnRlcnMgYXJlIG5hdHVyYWxseSBhbGlnbmVkLgorICAgICAg
ICBBZGQgc3RhdGljX2Fzc2VydHMgdG8gZW5zdXJlIGFsaWdubWVudCBhbmQgc2l6ZXMgYXJlIGNv
cnJlY3QuCisKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVj
b2Rlci5jcHA6CisgICAgICAgICh3ZWJydGM6OmNyZWF0ZVdlYktpdFZQOURlY29kZXIpOiBEaXR0
by4KKwogMjAyMS0wNi0xNyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+
CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzkwMTEuCmRpZmYgLS1naXQgYS9T
b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktp
dERlY29kZXIuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nk
ay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCmluZGV4IDVkNjJlYTQwNWIzZjNlZGMwNWU2ZWU1YjAw
YWU2MWExNzdjYWJlNjguLjk3YTI1YmY0ZWE5MjUxOGI1MzJhMTM3MTA5M2FlOGNkNDM1YTY0OTcg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nk
ay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0
Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCkBAIC0zNCw2ICszNCwx
MiBAQCB0eXBlZGVmIHN0cnVjdCBfX0NWQnVmZmVyKiBDVlBpeGVsQnVmZmVyUmVmOwogCiBuYW1l
c3BhY2Ugd2VicnRjIHsKIAorI2lmIChkZWZpbmVkKFdFQlJUQ19NQUMpIHx8IGRlZmluZWQoV0VC
UlRDX01BQ19DQVRBTFlTVCkpICYmIGRlZmluZWQoX194ODZfNjRfXykKKyAgICAjZGVmaW5lIENN
QkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5UIDEKKyNlbHNlCisgICAgI2RlZmluZSBDTUJBU0Vf
T0JKRUNUX05FRURTX0FMSUdOTUVOVCAwCisjZW5kaWYKKwogc3RydWN0IFNkcFZpZGVvRm9ybWF0
OwogY2xhc3MgVmlkZW9EZWNvZGVyRmFjdG9yeTsKIApAQCAtNDgsNyArNTQsNiBAQCB2b2lkIHNl
dFZpZGVvRGVjb2RlckNhbGxiYWNrcyhWaWRlb0RlY29kZXJDcmVhdGVDYWxsYmFjaywgVmlkZW9E
ZWNvZGVyUmVsZWFzZUNhbAogc3RkOjp1bmlxdWVfcHRyPHdlYnJ0Yzo6VmlkZW9EZWNvZGVyRmFj
dG9yeT4gY3JlYXRlV2ViS2l0RGVjb2RlckZhY3RvcnkoV2ViS2l0SDI2NSwgV2ViS2l0VlA5LCBX
ZWJLaXRWUDlWVEIpOwogdm9pZCB2aWRlb0RlY29kZXJUYXNrQ29tcGxldGUodm9pZCogY2FsbGJh
Y2ssIHVpbnQzMl90IHRpbWVTdGFtcCwgQ1ZQaXhlbEJ1ZmZlclJlZiwgdWludDMyX3QgdGltZVN0
YW1wUlRQKTsKIAotCiB1c2luZyBMb2NhbERlY29kZXIgPSB2b2lkKjsKIHVzaW5nIExvY2FsRGVj
b2RlckNhbGxiYWNrID0gdm9pZCAoXikoQ1ZQaXhlbEJ1ZmZlclJlZiwgdWludDMyX3QgdGltZVN0
YW1wLCB1aW50MzJfdCB0aW1lU3RhbXBOcyk7CiB2b2lkKiBjcmVhdGVMb2NhbEgyNjREZWNvZGVy
KExvY2FsRGVjb2RlckNhbGxiYWNrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA4RGVjb2Rlci5jcHAgYi9T
b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktp
dFZQOERlY29kZXIuY3BwCmluZGV4IDIwNWQwMjUwN2ZkODc0ZGRhYWJiZTlkNmVhMjI1NWNjZWRi
MzZmOWUuLjA4YjkzZjE0ZjIzYmEyNDgzMjExZGRlZjFhMjJiMWU0OTA5YWEzYzQgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQv
V2ViS2l0VlA4RGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1Nv
dXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDhEZWNvZGVyLmNwcApAQCAtNDgsOCArNDgs
MTQgQEAgc3RhdGljIE9TU3RhdHVzIGludmFsaWRhdGVWUDhEZWNvZGVyKENNQmFzZU9iamVjdFJl
Zik7CiBzdGF0aWMgdm9pZCBmaW5hbGl6ZVZQOERlY29kZXIoQ01CYXNlT2JqZWN0UmVmKTsKIHN0
YXRpYyBDRlN0cmluZ1JlZiBjb3B5VlA4RGVjb2RlckRlYnVnRGVzY3JpcHRpb24oQ01CYXNlT2Jq
ZWN0UmVmKTsKIAotc3RhdGljIGNvbnN0IENNQmFzZUNsYXNzIFdlYktpdFZQOERlY29kZXJfQmFz
ZUNsYXNzID0KLXsKKyNpZiBDTUJBU0VfT0JKRUNUX05FRURTX0FMSUdOTUVOVAorICAgIGNvbnN0
ZXhwciBzaXplX3QgcGFkU2l6ZSA9IDQ7CisjZWxzZQorICAgIGNvbnN0ZXhwciBzaXplX3QgcGFk
U2l6ZSA9IDA7CisjZW5kaWYKKworI3ByYWdtYSBwYWNrKHB1c2gsIDQpCitzdHJ1Y3QgRGVjb2Rl
ckNsYXNzIHsgdWludDhfdCBwYWRbcGFkU2l6ZV07IENNQmFzZUNsYXNzIGFsaWduZWRDbGFzczsg
fSBXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcyB7IHsgfSwgewogICAgIGtDTUJhc2VPYmplY3Rf
Q2xhc3NWZXJzaW9uXzEsCiAgICAgc2l6ZW9mKFdlYktpdFZQOERlY29kZXIpLAogICAgIG51bGxw
dHIsIC8vIENvbXBhcmlzb24gYnkgcG9pbnRlciBlcXVhbGl0eQpAQCAtNjAsNyArNjYsMTUgQEAg
c3RhdGljIGNvbnN0IENNQmFzZUNsYXNzIFdlYktpdFZQOERlY29kZXJfQmFzZUNsYXNzID0KICAg
ICBudWxscHRyLCAvLyBTZXRQcm9wZXJ0eQogICAgIG51bGxwdHIsCiAgICAgbnVsbHB0cgotfTsK
K30gfTsKKyNwcmFnbWEgcGFjayhwb3ApCisKKyNpZiBDTUJBU0VfT0JKRUNUX05FRURTX0FMSUdO
TUVOVAorICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKFdlYktpdFZQOERlY29kZXJfQmFzZUNsYXNz
LmFsaWduZWRDbGFzcy52ZXJzaW9uKSAhPSBzaXplb2Yodm9pZCopLCAiQ01CYXNlQ2xhc3MgZml4
dXAgaXMgcmVxdWlyZWQhIik7CisjZWxzZQorICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKFdlYktp
dFZQOERlY29kZXJfQmFzZUNsYXNzLmFsaWduZWRDbGFzcy52ZXJzaW9uKSA9PSBzaXplb2Yodm9p
ZCopLCAiQ01CYXNlQ2xhc3MgZml4dXAgaXMgbm90IHJlcXVpcmVkISIpOworI2VuZGlmCitzdGF0
aWNfYXNzZXJ0KGFsaWdub2YoRGVjb2RlckNsYXNzKSA9PSA0LCAiQ01CYXNlQ2xhc3MgbXVzdCBo
YXZlIDQgYnl0ZSBhbGlnbm1lbnQiKTsKIAogc3RhdGljIE9TU3RhdHVzIHN0YXJ0VlA4RGVjb2Rl
clNlc3Npb24oVlRWaWRlb0RlY29kZXJSZWYsIFZUVmlkZW9EZWNvZGVyU2Vzc2lvbiwgQ01WaWRl
b0Zvcm1hdERlc2NyaXB0aW9uUmVmKTsKIHN0YXRpYyBPU1N0YXR1cyBkZWNvZGVWUDhEZWNvZGVy
RnJhbWUoVlRWaWRlb0RlY29kZXJSZWYsIFZUVmlkZW9EZWNvZGVyRnJhbWUsIENNU2FtcGxlQnVm
ZmVyUmVmLCBWVERlY29kZUZyYW1lRmxhZ3MsIFZURGVjb2RlSW5mb0ZsYWdzKik7CkBAIC04Miw3
ICs5Niw3IEBAIHN0YXRpYyBjb25zdCBWVFZpZGVvRGVjb2RlckNsYXNzIFdlYktpdFZQOERlY29k
ZXJfVmlkZW9EZWNvZGVyQ2xhc3MgPQogCiBzdGF0aWMgY29uc3QgVlRWaWRlb0RlY29kZXJWVGFi
bGUgV2ViS2l0VlA4RGVjb2RlclZUYWJsZSA9CiB7Ci0gICAgeyBudWxscHRyLCAmV2ViS2l0VlA4
RGVjb2Rlcl9CYXNlQ2xhc3MgfSwKKyAgICB7IG51bGxwdHIsICZXZWJLaXRWUDhEZWNvZGVyX0Jh
c2VDbGFzcy5hbGlnbmVkQ2xhc3MgfSwKICAgICAmV2ViS2l0VlA4RGVjb2Rlcl9WaWRlb0RlY29k
ZXJDbGFzcwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1Nv
dXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlEZWNvZGVyLmNwcCBiL1NvdXJjZS9UaGly
ZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVjb2Rl
ci5jcHAKaW5kZXggMTIzOTk1MjI2ZDhiNjg5YWIwN2I5MDFmMzMxZWI2N2E4NzE3ZGJhOC4uNDI5
NTY4YTNlNDEyMjYzNzI1MmNkY2UxMDg5NDE1ODJlNWUxNmU1YSAxMDA2NDQKLS0tIGEvU291cmNl
L1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlE
ZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0
Yy9zZGsvV2ViS2l0L1dlYktpdFZQOURlY29kZXIuY3BwCkBAIC00OCw4ICs0OCwxNCBAQCBzdGF0
aWMgT1NTdGF0dXMgaW52YWxpZGF0ZVZQOURlY29kZXIoQ01CYXNlT2JqZWN0UmVmKTsKIHN0YXRp
YyB2b2lkIGZpbmFsaXplVlA5RGVjb2RlcihDTUJhc2VPYmplY3RSZWYpOwogc3RhdGljIENGU3Ry
aW5nUmVmIGNvcHlWUDlEZWNvZGVyRGVidWdEZXNjcmlwdGlvbihDTUJhc2VPYmplY3RSZWYpOwog
Ci1zdGF0aWMgY29uc3QgQ01CYXNlQ2xhc3MgV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MgPQot
eworI2lmIENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5UCisgICAgY29uc3RleHByIHNpemVf
dCBwYWRTaXplID0gNDsKKyNlbHNlCisgICAgY29uc3RleHByIHNpemVfdCBwYWRTaXplID0gMDsK
KyNlbmRpZgorCisjcHJhZ21hIHBhY2socHVzaCwgNCkKK3N0cnVjdCBEZWNvZGVyQ2xhc3MgeyB1
aW50OF90IHBhZFtwYWRTaXplXTsgQ01CYXNlQ2xhc3MgYWxpZ25lZENsYXNzOyB9IFdlYktpdFZQ
OURlY29kZXJfQmFzZUNsYXNzIHsgeyB9LCB7CiAgICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNp
b25fMSwKICAgICBzaXplb2YoV2ViS2l0VlA5RGVjb2RlciksCiAgICAgbnVsbHB0ciwgLy8gQ29t
cGFyaXNvbiBieSBwb2ludGVyIGVxdWFsaXR5CkBAIC02MCw3ICs2NiwxNSBAQCBzdGF0aWMgY29u
c3QgQ01CYXNlQ2xhc3MgV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MgPQogICAgIG51bGxwdHIs
IC8vIFNldFByb3BlcnR5CiAgICAgbnVsbHB0ciwKICAgICBudWxscHRyCi19OworfSB9OworI3By
YWdtYSBwYWNrKHBvcCkKKworI2lmIENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5UCisgICAg
c3RhdGljX2Fzc2VydChzaXplb2YoV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25lZENs
YXNzLnZlcnNpb24pICE9IHNpemVvZih2b2lkKiksICJDTUJhc2VDbGFzcyBmaXh1cCBpcyByZXF1
aXJlZCEiKTsKKyNlbHNlCisgICAgc3RhdGljX2Fzc2VydChzaXplb2YoV2ViS2l0VlA5RGVjb2Rl
cl9CYXNlQ2xhc3MuYWxpZ25lZENsYXNzLnZlcnNpb24pID09IHNpemVvZih2b2lkKiksICJDTUJh
c2VDbGFzcyBmaXh1cCBpcyBub3QgcmVxdWlyZWQhIik7CisjZW5kaWYKK3N0YXRpY19hc3NlcnQo
YWxpZ25vZihEZWNvZGVyQ2xhc3MpID09IDQsICJDTUJhc2VDbGFzcyBtdXN0IGhhdmUgNCBieXRl
IGFsaWdubWVudCIpOwogCiBzdGF0aWMgT1NTdGF0dXMgc3RhcnRWUDlEZWNvZGVyU2Vzc2lvbihW
VFZpZGVvRGVjb2RlclJlZiwgVlRWaWRlb0RlY29kZXJTZXNzaW9uLCBDTVZpZGVvRm9ybWF0RGVz
Y3JpcHRpb25SZWYpOwogc3RhdGljIE9TU3RhdHVzIGRlY29kZVZQOURlY29kZXJGcmFtZShWVFZp
ZGVvRGVjb2RlclJlZiwgVlRWaWRlb0RlY29kZXJGcmFtZSwgQ01TYW1wbGVCdWZmZXJSZWYsIFZU
RGVjb2RlRnJhbWVGbGFncywgVlREZWNvZGVJbmZvRmxhZ3MqKTsKQEAgLTgyLDcgKzk2LDcgQEAg
c3RhdGljIGNvbnN0IFZUVmlkZW9EZWNvZGVyQ2xhc3MgV2ViS2l0VlA5RGVjb2Rlcl9WaWRlb0Rl
Y29kZXJDbGFzcyA9CiAKIHN0YXRpYyBjb25zdCBWVFZpZGVvRGVjb2RlclZUYWJsZSBXZWJLaXRW
UDlEZWNvZGVyVlRhYmxlID0KIHsKLSAgICB7IG51bGxwdHIsICZXZWJLaXRWUDlEZWNvZGVyX0Jh
c2VDbGFzcyB9LAorICAgIHsgbnVsbHB0ciwgJldlYktpdFZQOURlY29kZXJfQmFzZUNsYXNzLmFs
aWduZWRDbGFzcyB9LAogICAgICZXZWJLaXRWUDlEZWNvZGVyX1ZpZGVvRGVjb2RlckNsYXNzCiB9
OwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431909</attachid>
            <date>2021-06-21 14:17:34 -0700</date>
            <delta_ts>2021-06-21 16:05:05 -0700</delta_ts>
            <desc>Updated patch</desc>
            <filename>bug-227137-20210621141733.patch</filename>
            <type>text/plain</type>
            <size>8007</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n
ZUxvZwppbmRleCA4NGU5NzExY2FhMTRkNTk3ZWFiMmRjMDYwOWUyMTA3YjcxNDgyMWE0Li5kNTUz
NGY3ODZiZWVkYjJkNWQ4ZmNmZDIzNzhhMDIwZjExYzE0OWVlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMS0wNi0xOCAgRXJpYyBDYXJs
c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBsaWJ3ZWJydGMg
Q01CYXNlQ2xhc3Mgb2JqZWN0cyBuZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTM3CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQ2NDEyND4KKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0Lgor
CisgICAgICAgICogU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdERlY29kZXIuaDogRGVm
aW5lIENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5ULgorCisgICAgICAgICogU291cmNlL3dl
YnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOERlY29kZXIuY3BwOgorICAgICAgICAod2VicnRjOjpj
cmVhdGVXZWJLaXRWUDhEZWNvZGVyKTogQWRkIHBhZGRpbmcgdG8gdGhlIENNQmFzZUNsYXNzIG9i
amVjdCBvbiBNYWMgYW5kCisgICAgICAgIE1hYyBDYXRhbHlzdCB3aGVuIGJ1aWxkaW5nIGZvciB4
ODZfNjQgc28gZnVuY3Rpb24gcG9pbnRlcnMgYXJlIG5hdHVyYWxseSBhbGlnbmVkLgorICAgICAg
ICBBZGQgc3RhdGljX2Fzc2VydHMgdG8gZW5zdXJlIGFsaWdubWVudCBhbmQgc2l6ZXMgYXJlIGNv
cnJlY3QuCisKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVj
b2Rlci5jcHA6CisgICAgICAgICh3ZWJydGM6OmNyZWF0ZVdlYktpdFZQOURlY29kZXIpOiBEaXR0
by4KKwogMjAyMS0wNi0xNyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+
CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzkwMTEuCmRpZmYgLS1naXQgYS9T
b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktp
dERlY29kZXIuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nk
ay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCmluZGV4IDVkNjJlYTQwNWIzZjNlZGMwNWU2ZWU1YjAw
YWU2MWExNzdjYWJlNjguLjIzYjJiMGY4OTdlNTlmYzQxMmEzZTM1ZDQ2YjNiYzJhNjQ0ZThiNzQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nk
ay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0
Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCkBAIC0zNCw2ICszNCwx
MiBAQCB0eXBlZGVmIHN0cnVjdCBfX0NWQnVmZmVyKiBDVlBpeGVsQnVmZmVyUmVmOwogCiBuYW1l
c3BhY2Ugd2VicnRjIHsKIAorI2lmIGRlZmluZWQoX194ODZfNjRfXykgJiYgKGRlZmluZWQoV0VC
UlRDX01BQykgfHwgZGVmaW5lZChXRUJSVENfTUFDX0NBVEFMWVNUKSkKKyAgICAjZGVmaW5lIENN
QkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5UIDEKKyNlbHNlCisgICAgI2RlZmluZSBDTUJBU0Vf
T0JKRUNUX05FRURTX0FMSUdOTUVOVCAwCisjZW5kaWYKKwogc3RydWN0IFNkcFZpZGVvRm9ybWF0
OwogY2xhc3MgVmlkZW9EZWNvZGVyRmFjdG9yeTsKIApAQCAtNDgsNyArNTQsNiBAQCB2b2lkIHNl
dFZpZGVvRGVjb2RlckNhbGxiYWNrcyhWaWRlb0RlY29kZXJDcmVhdGVDYWxsYmFjaywgVmlkZW9E
ZWNvZGVyUmVsZWFzZUNhbAogc3RkOjp1bmlxdWVfcHRyPHdlYnJ0Yzo6VmlkZW9EZWNvZGVyRmFj
dG9yeT4gY3JlYXRlV2ViS2l0RGVjb2RlckZhY3RvcnkoV2ViS2l0SDI2NSwgV2ViS2l0VlA5LCBX
ZWJLaXRWUDlWVEIpOwogdm9pZCB2aWRlb0RlY29kZXJUYXNrQ29tcGxldGUodm9pZCogY2FsbGJh
Y2ssIHVpbnQzMl90IHRpbWVTdGFtcCwgQ1ZQaXhlbEJ1ZmZlclJlZiwgdWludDMyX3QgdGltZVN0
YW1wUlRQKTsKIAotCiB1c2luZyBMb2NhbERlY29kZXIgPSB2b2lkKjsKIHVzaW5nIExvY2FsRGVj
b2RlckNhbGxiYWNrID0gdm9pZCAoXikoQ1ZQaXhlbEJ1ZmZlclJlZiwgdWludDMyX3QgdGltZVN0
YW1wLCB1aW50MzJfdCB0aW1lU3RhbXBOcyk7CiB2b2lkKiBjcmVhdGVMb2NhbEgyNjREZWNvZGVy
KExvY2FsRGVjb2RlckNhbGxiYWNrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA4RGVjb2Rlci5jcHAgYi9T
b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktp
dFZQOERlY29kZXIuY3BwCmluZGV4IDIwNWQwMjUwN2ZkODc0ZGRhYWJiZTlkNmVhMjI1NWNjZWRi
MzZmOWUuLmU3NzY3ZGNiMjI5M2FiODhlMTFkZWI0YjM5MDE5MmI1NzAyZGMyMGEgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQv
V2ViS2l0VlA4RGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1Nv
dXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDhEZWNvZGVyLmNwcApAQCAtNDgsMjAgKzQ4
LDQ0IEBAIHN0YXRpYyBPU1N0YXR1cyBpbnZhbGlkYXRlVlA4RGVjb2RlcihDTUJhc2VPYmplY3RS
ZWYpOwogc3RhdGljIHZvaWQgZmluYWxpemVWUDhEZWNvZGVyKENNQmFzZU9iamVjdFJlZik7CiBz
dGF0aWMgQ0ZTdHJpbmdSZWYgY29weVZQOERlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9uKENNQmFzZU9i
amVjdFJlZik7CiAKLXN0YXRpYyBjb25zdCBDTUJhc2VDbGFzcyBXZWJLaXRWUDhEZWNvZGVyX0Jh
c2VDbGFzcyA9Ci17Ci0gICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwKLSAgICBzaXpl
b2YoV2ViS2l0VlA4RGVjb2RlciksCi0gICAgbnVsbHB0ciwgLy8gQ29tcGFyaXNvbiBieSBwb2lu
dGVyIGVxdWFsaXR5Ci0gICAgaW52YWxpZGF0ZVZQOERlY29kZXIsCi0gICAgZmluYWxpemVWUDhE
ZWNvZGVyLAotICAgIGNvcHlWUDhEZWNvZGVyRGVidWdEZXNjcmlwdGlvbiwKLSAgICBudWxscHRy
LCAvLyBDb3B5UHJvcGVydHkKLSAgICBudWxscHRyLCAvLyBTZXRQcm9wZXJ0eQotICAgIG51bGxw
dHIsCi0gICAgbnVsbHB0cgorI2lmIGRlZmluZWQoQ01CQVNFX09CSkVDVF9ORUVEU19BTElHTk1F
TlQpICYmIENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5UCisgICAgY29uc3RleHByIHNpemVf
dCBwYWRTaXplID0gNDsKKyNlbHNlCisgICAgY29uc3RleHByIHNpemVfdCBwYWRTaXplID0gMDsK
KyNlbmRpZgorCisvLyBXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcworI3ByYWdtYSBwYWNrKHB1
c2gsIDQpCitzdHJ1Y3QgRGVjb2RlckNsYXNzIHsKKyAgICB1aW50OF90IHBhZFtwYWRTaXplXTsK
KyAgICBDTUJhc2VDbGFzcyBhbGlnbmVkQ2xhc3M7CiB9OwogCitzdGF0aWMgY29uc3QgRGVjb2Rl
ckNsYXNzIFdlYktpdFZQOERlY29kZXJfQmFzZUNsYXNzIHsKKyAgICB7IH0sCisgICAgeworICAg
ICAgICBrQ01CYXNlT2JqZWN0X0NsYXNzVmVyc2lvbl8xLAorICAgICAgICBzaXplb2YoV2ViS2l0
VlA4RGVjb2RlciksCisgICAgICAgIG51bGxwdHIsIC8vIENvbXBhcmlzb24gYnkgcG9pbnRlciBl
cXVhbGl0eQorICAgICAgICBpbnZhbGlkYXRlVlA4RGVjb2RlciwKKyAgICAgICAgZmluYWxpemVW
UDhEZWNvZGVyLAorICAgICAgICBjb3B5VlA4RGVjb2RlckRlYnVnRGVzY3JpcHRpb24sCisgICAg
ICAgIG51bGxwdHIsIC8vIENvcHlQcm9wZXJ0eQorICAgICAgICBudWxscHRyLCAvLyBTZXRQcm9w
ZXJ0eQorICAgICAgICBudWxscHRyLAorICAgICAgICBudWxscHRyCisgICAgfQorfTsKKyNwcmFn
bWEgcGFjayhwb3ApCisKKyNpZiBkZWZpbmVkKENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5U
KSAmJiBDTUJBU0VfT0JKRUNUX05FRURTX0FMSUdOTUVOVAorICAgIHN0YXRpY19hc3NlcnQoc2l6
ZW9mKFdlYktpdFZQOERlY29kZXJfQmFzZUNsYXNzLmFsaWduZWRDbGFzcy52ZXJzaW9uKSA9PSBz
aXplb2YodWludDMyX3QpLCAiQ01CYXNlQ2xhc3MgZml4dXAgaXMgcmVxdWlyZWQhIik7CisjZWxz
ZQorICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKFdlYktpdFZQOERlY29kZXJfQmFzZUNsYXNzLmFs
aWduZWRDbGFzcy52ZXJzaW9uKSA9PSBzaXplb2YodWludHB0cl90KSwgIkNNQmFzZUNsYXNzIGZp
eHVwIGlzIG5vdCByZXF1aXJlZCEiKTsKKyNlbmRpZgorc3RhdGljX2Fzc2VydChvZmZzZXRvZihE
ZWNvZGVyQ2xhc3MsIGFsaWduZWRDbGFzcykgPT0gcGFkU2l6ZSwgIkNNQmFzZUNsYXNzIG9mZnNl
dCBpcyBpbmNvcnJlY3QhIik7CitzdGF0aWNfYXNzZXJ0KGFsaWdub2YoRGVjb2RlckNsYXNzKSA9
PSA0LCAiQ01CYXNlQ2xhc3MgbXVzdCBoYXZlIDQgYnl0ZSBhbGlnbm1lbnQiKTsKKwogc3RhdGlj
IE9TU3RhdHVzIHN0YXJ0VlA4RGVjb2RlclNlc3Npb24oVlRWaWRlb0RlY29kZXJSZWYsIFZUVmlk
ZW9EZWNvZGVyU2Vzc2lvbiwgQ01WaWRlb0Zvcm1hdERlc2NyaXB0aW9uUmVmKTsKIHN0YXRpYyBP
U1N0YXR1cyBkZWNvZGVWUDhEZWNvZGVyRnJhbWUoVlRWaWRlb0RlY29kZXJSZWYsIFZUVmlkZW9E
ZWNvZGVyRnJhbWUsIENNU2FtcGxlQnVmZmVyUmVmLCBWVERlY29kZUZyYW1lRmxhZ3MsIFZURGVj
b2RlSW5mb0ZsYWdzKik7CiAKQEAgLTgyLDcgKzEwNiw3IEBAIHN0YXRpYyBjb25zdCBWVFZpZGVv
RGVjb2RlckNsYXNzIFdlYktpdFZQOERlY29kZXJfVmlkZW9EZWNvZGVyQ2xhc3MgPQogCiBzdGF0
aWMgY29uc3QgVlRWaWRlb0RlY29kZXJWVGFibGUgV2ViS2l0VlA4RGVjb2RlclZUYWJsZSA9CiB7
Ci0gICAgeyBudWxscHRyLCAmV2ViS2l0VlA4RGVjb2Rlcl9CYXNlQ2xhc3MgfSwKKyAgICB7IG51
bGxwdHIsICZXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MgfSwKICAgICAm
V2ViS2l0VlA4RGVjb2Rlcl9WaWRlb0RlY29kZXJDbGFzcwogfTsKIApkaWZmIC0tZ2l0IGEvU291
cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRW
UDlEZWNvZGVyLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRj
L3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVjb2Rlci5jcHAKaW5kZXggMTIzOTk1MjI2ZDhiNjg5YWIw
N2I5MDFmMzMxZWI2N2E4NzE3ZGJhOC4uMjM5YTdjMGI2YjkyZTYxMDJjMzhjYzIxNzBlNmM2OTE5
N2QzNWI1MSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93
ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQ
YXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOURlY29kZXIu
Y3BwCkBAIC00OCwyMCArNDgsNDMgQEAgc3RhdGljIE9TU3RhdHVzIGludmFsaWRhdGVWUDlEZWNv
ZGVyKENNQmFzZU9iamVjdFJlZik7CiBzdGF0aWMgdm9pZCBmaW5hbGl6ZVZQOURlY29kZXIoQ01C
YXNlT2JqZWN0UmVmKTsKIHN0YXRpYyBDRlN0cmluZ1JlZiBjb3B5VlA5RGVjb2RlckRlYnVnRGVz
Y3JpcHRpb24oQ01CYXNlT2JqZWN0UmVmKTsKIAotc3RhdGljIGNvbnN0IENNQmFzZUNsYXNzIFdl
YktpdFZQOURlY29kZXJfQmFzZUNsYXNzID0KLXsKLSAgICBrQ01CYXNlT2JqZWN0X0NsYXNzVmVy
c2lvbl8xLAotICAgIHNpemVvZihXZWJLaXRWUDlEZWNvZGVyKSwKLSAgICBudWxscHRyLCAvLyBD
b21wYXJpc29uIGJ5IHBvaW50ZXIgZXF1YWxpdHkKLSAgICBpbnZhbGlkYXRlVlA5RGVjb2RlciwK
LSAgICBmaW5hbGl6ZVZQOURlY29kZXIsCi0gICAgY29weVZQOURlY29kZXJEZWJ1Z0Rlc2NyaXB0
aW9uLAotICAgIG51bGxwdHIsIC8vIENvcHlQcm9wZXJ0eQotICAgIG51bGxwdHIsIC8vIFNldFBy
b3BlcnR5Ci0gICAgbnVsbHB0ciwKLSAgICBudWxscHRyCisjaWYgZGVmaW5lZChDTUJBU0VfT0JK
RUNUX05FRURTX0FMSUdOTUVOVCkgJiYgQ01CQVNFX09CSkVDVF9ORUVEU19BTElHTk1FTlQKKyAg
ICBjb25zdGV4cHIgc2l6ZV90IHBhZFNpemUgPSA0OworI2Vsc2UKKyAgICBjb25zdGV4cHIgc2l6
ZV90IHBhZFNpemUgPSAwOworI2VuZGlmCisKKyNwcmFnbWEgcGFjayhwdXNoLCA0KQorc3RydWN0
IERlY29kZXJDbGFzcyB7CisgICAgdWludDhfdCBwYWRbcGFkU2l6ZV07CisgICAgQ01CYXNlQ2xh
c3MgYWxpZ25lZENsYXNzOwogfTsKIAorc3RhdGljIGNvbnN0IERlY29kZXJDbGFzcyBXZWJLaXRW
UDlEZWNvZGVyX0Jhc2VDbGFzcyB7CisgICAgeyB9LAorICAgIHsKKyAgICAgICAga0NNQmFzZU9i
amVjdF9DbGFzc1ZlcnNpb25fMSwKKyAgICAgICAgc2l6ZW9mKFdlYktpdFZQOURlY29kZXIpLAor
ICAgICAgICBudWxscHRyLCAvLyBDb21wYXJpc29uIGJ5IHBvaW50ZXIgZXF1YWxpdHkKKyAgICAg
ICAgaW52YWxpZGF0ZVZQOURlY29kZXIsCisgICAgICAgIGZpbmFsaXplVlA5RGVjb2RlciwKKyAg
ICAgICAgY29weVZQOURlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9uLAorICAgICAgICBudWxscHRyLCAv
LyBDb3B5UHJvcGVydHkKKyAgICAgICAgbnVsbHB0ciwgLy8gU2V0UHJvcGVydHkKKyAgICAgICAg
bnVsbHB0ciwKKyAgICAgICAgbnVsbHB0cgorICAgIH0KK307CisjcHJhZ21hIHBhY2socG9wKQor
CisjaWYgZGVmaW5lZChDTUJBU0VfT0JKRUNUX05FRURTX0FMSUdOTUVOVCkgJiYgQ01CQVNFX09C
SkVDVF9ORUVEU19BTElHTk1FTlQKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihXZWJLaXRWUDlE
ZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MudmVyc2lvbikgPT0gc2l6ZW9mKHVpbnQzMl90
KSwgIkNNQmFzZUNsYXNzIGZpeHVwIGlzIHJlcXVpcmVkISIpOworI2Vsc2UKKyAgICBzdGF0aWNf
YXNzZXJ0KHNpemVvZihXZWJLaXRWUDlEZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MudmVy
c2lvbikgPT0gc2l6ZW9mKHVpbnRwdHJfdCksICJDTUJhc2VDbGFzcyBmaXh1cCBpcyBub3QgcmVx
dWlyZWQhIik7CisjZW5kaWYKK3N0YXRpY19hc3NlcnQob2Zmc2V0b2YoRGVjb2RlckNsYXNzLCBh
bGlnbmVkQ2xhc3MpID09IHBhZFNpemUsICJDTUJhc2VDbGFzcyBvZmZzZXQgaXMgaW5jb3JyZWN0
ISIpOworc3RhdGljX2Fzc2VydChhbGlnbm9mKERlY29kZXJDbGFzcykgPT0gNCwgIkNNQmFzZUNs
YXNzIG11c3QgaGF2ZSA0IGJ5dGUgYWxpZ25tZW50Iik7CisKIHN0YXRpYyBPU1N0YXR1cyBzdGFy
dFZQOURlY29kZXJTZXNzaW9uKFZUVmlkZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlclNlc3Np
b24sIENNVmlkZW9Gb3JtYXREZXNjcmlwdGlvblJlZik7CiBzdGF0aWMgT1NTdGF0dXMgZGVjb2Rl
VlA5RGVjb2RlckZyYW1lKFZUVmlkZW9EZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlckZyYW1lLCBD
TVNhbXBsZUJ1ZmZlclJlZiwgVlREZWNvZGVGcmFtZUZsYWdzLCBWVERlY29kZUluZm9GbGFncyop
OwogCkBAIC04Miw3ICsxMDUsNyBAQCBzdGF0aWMgY29uc3QgVlRWaWRlb0RlY29kZXJDbGFzcyBX
ZWJLaXRWUDlEZWNvZGVyX1ZpZGVvRGVjb2RlckNsYXNzID0KIAogc3RhdGljIGNvbnN0IFZUVmlk
ZW9EZWNvZGVyVlRhYmxlIFdlYktpdFZQOURlY29kZXJWVGFibGUgPQogewotICAgIHsgbnVsbHB0
ciwgJldlYktpdFZQOURlY29kZXJfQmFzZUNsYXNzIH0sCisgICAgeyBudWxscHRyLCAmV2ViS2l0
VlA5RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25lZENsYXNzIH0sCiAgICAgJldlYktpdFZQOURlY29k
ZXJfVmlkZW9EZWNvZGVyQ2xhc3MKIH07CiAK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431921</attachid>
            <date>2021-06-21 16:05:07 -0700</date>
            <delta_ts>2021-06-21 19:15:59 -0700</delta_ts>
            <desc>Updated patch</desc>
            <filename>bug-227137-20210621160506.patch</filename>
            <type>text/plain</type>
            <size>8984</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0
eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n
ZUxvZwppbmRleCA4NGU5NzExY2FhMTRkNTk3ZWFiMmRjMDYwOWUyMTA3YjcxNDgyMWE0Li5kNTUz
NGY3ODZiZWVkYjJkNWQ4ZmNmZDIzNzhhMDIwZjExYzE0OWVlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp
YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMS0wNi0xOCAgRXJpYyBDYXJs
c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBsaWJ3ZWJydGMg
Q01CYXNlQ2xhc3Mgb2JqZWN0cyBuZWVkIGFsaWdubWVudCBmaXh1cAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTM3CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQ2NDEyND4KKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0Lgor
CisgICAgICAgICogU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdERlY29kZXIuaDogRGVm
aW5lIENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5ULgorCisgICAgICAgICogU291cmNlL3dl
YnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOERlY29kZXIuY3BwOgorICAgICAgICAod2VicnRjOjpj
cmVhdGVXZWJLaXRWUDhEZWNvZGVyKTogQWRkIHBhZGRpbmcgdG8gdGhlIENNQmFzZUNsYXNzIG9i
amVjdCBvbiBNYWMgYW5kCisgICAgICAgIE1hYyBDYXRhbHlzdCB3aGVuIGJ1aWxkaW5nIGZvciB4
ODZfNjQgc28gZnVuY3Rpb24gcG9pbnRlcnMgYXJlIG5hdHVyYWxseSBhbGlnbmVkLgorICAgICAg
ICBBZGQgc3RhdGljX2Fzc2VydHMgdG8gZW5zdXJlIGFsaWdubWVudCBhbmQgc2l6ZXMgYXJlIGNv
cnJlY3QuCisKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA5RGVj
b2Rlci5jcHA6CisgICAgICAgICh3ZWJydGM6OmNyZWF0ZVdlYktpdFZQOURlY29kZXIpOiBEaXR0
by4KKwogMjAyMS0wNi0xNyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+
CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzkwMTEuCmRpZmYgLS1naXQgYS9T
b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktp
dERlY29kZXIuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nk
ay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCmluZGV4IDVkNjJlYTQwNWIzZjNlZGMwNWU2ZWU1YjAw
YWU2MWExNzdjYWJlNjguLmY1NDY5NjBmNDVjMDdhY2NjN2I5OTRiN2Q3NmY3ZTI0OTI3OTNjYmQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nk
ay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0
Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0RGVjb2Rlci5oCkBAIC0xLDUgKzEsNSBA
QAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2
ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMjAtMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz
ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy
eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg
cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI1LDYgKzI1LDcgQEAK
IAogI3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlIDxBdmFpbGFiaWxpdHkuaD4KICNpbmNsdWRlICJX
ZWJLaXRVdGlsaXRpZXMuaCIKICNpbmNsdWRlICJhcGkvdmlkZW8vZW5jb2RlZF9pbWFnZS5oIgog
I2luY2x1ZGUgImFwaS92aWRlb19jb2RlY3MvdmlkZW9fZGVjb2Rlcl9mYWN0b3J5LmgiCkBAIC0z
NCw2ICszNSwxMiBAQCB0eXBlZGVmIHN0cnVjdCBfX0NWQnVmZmVyKiBDVlBpeGVsQnVmZmVyUmVm
OwogCiBuYW1lc3BhY2Ugd2VicnRjIHsKIAorI2lmIChUQVJHRVRfT1NfT1NYIHx8IFRBUkdFVF9P
U19NQUNDQVRBTFlTVCkgJiYgVEFSR0VUX0NQVV9YODZfNjQKKyAgICAjZGVmaW5lIENNQkFTRV9P
QkpFQ1RfTkVFRFNfQUxJR05NRU5UIDEKKyNlbHNlCisgICAgI2RlZmluZSBDTUJBU0VfT0JKRUNU
X05FRURTX0FMSUdOTUVOVCAwCisjZW5kaWYKKwogc3RydWN0IFNkcFZpZGVvRm9ybWF0OwogY2xh
c3MgVmlkZW9EZWNvZGVyRmFjdG9yeTsKIApAQCAtNDgsNyArNTUsNiBAQCB2b2lkIHNldFZpZGVv
RGVjb2RlckNhbGxiYWNrcyhWaWRlb0RlY29kZXJDcmVhdGVDYWxsYmFjaywgVmlkZW9EZWNvZGVy
UmVsZWFzZUNhbAogc3RkOjp1bmlxdWVfcHRyPHdlYnJ0Yzo6VmlkZW9EZWNvZGVyRmFjdG9yeT4g
Y3JlYXRlV2ViS2l0RGVjb2RlckZhY3RvcnkoV2ViS2l0SDI2NSwgV2ViS2l0VlA5LCBXZWJLaXRW
UDlWVEIpOwogdm9pZCB2aWRlb0RlY29kZXJUYXNrQ29tcGxldGUodm9pZCogY2FsbGJhY2ssIHVp
bnQzMl90IHRpbWVTdGFtcCwgQ1ZQaXhlbEJ1ZmZlclJlZiwgdWludDMyX3QgdGltZVN0YW1wUlRQ
KTsKIAotCiB1c2luZyBMb2NhbERlY29kZXIgPSB2b2lkKjsKIHVzaW5nIExvY2FsRGVjb2RlckNh
bGxiYWNrID0gdm9pZCAoXikoQ1ZQaXhlbEJ1ZmZlclJlZiwgdWludDMyX3QgdGltZVN0YW1wLCB1
aW50MzJfdCB0aW1lU3RhbXBOcyk7CiB2b2lkKiBjcmVhdGVMb2NhbEgyNjREZWNvZGVyKExvY2Fs
RGVjb2RlckNhbGxiYWNrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0
Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0VlA4RGVjb2Rlci5jcHAgYi9Tb3VyY2Uv
VGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOERl
Y29kZXIuY3BwCmluZGV4IDIwNWQwMjUwN2ZkODc0ZGRhYWJiZTlkNmVhMjI1NWNjZWRiMzZmOWUu
LmQzMTFiMGFkNTAwNjcyODhhM2M0YWZjYjUxYWRkZWIxYWI5NmI4YmYgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2ViS2l0
VlA4RGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93
ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDhEZWNvZGVyLmNwcApAQCAtMSw1ICsxLDUgQEAKIC8q
Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor
ICogQ29weXJpZ2h0IChDKSAyMDIwLTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk
LgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y
bXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp
ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00OCwxOSArNDgsNDIgQEAgc3Rh
dGljIE9TU3RhdHVzIGludmFsaWRhdGVWUDhEZWNvZGVyKENNQmFzZU9iamVjdFJlZik7CiBzdGF0
aWMgdm9pZCBmaW5hbGl6ZVZQOERlY29kZXIoQ01CYXNlT2JqZWN0UmVmKTsKIHN0YXRpYyBDRlN0
cmluZ1JlZiBjb3B5VlA4RGVjb2RlckRlYnVnRGVzY3JpcHRpb24oQ01CYXNlT2JqZWN0UmVmKTsK
IAotc3RhdGljIGNvbnN0IENNQmFzZUNsYXNzIFdlYktpdFZQOERlY29kZXJfQmFzZUNsYXNzID0K
LXsKLSAgICBrQ01CYXNlT2JqZWN0X0NsYXNzVmVyc2lvbl8xLAotICAgIHNpemVvZihXZWJLaXRW
UDhEZWNvZGVyKSwKLSAgICBudWxscHRyLCAvLyBDb21wYXJpc29uIGJ5IHBvaW50ZXIgZXF1YWxp
dHkKLSAgICBpbnZhbGlkYXRlVlA4RGVjb2RlciwKLSAgICBmaW5hbGl6ZVZQOERlY29kZXIsCi0g
ICAgY29weVZQOERlY29kZXJEZWJ1Z0Rlc2NyaXB0aW9uLAotICAgIG51bGxwdHIsIC8vIENvcHlQ
cm9wZXJ0eQotICAgIG51bGxwdHIsIC8vIFNldFByb3BlcnR5Ci0gICAgbnVsbHB0ciwKLSAgICBu
dWxscHRyCisjaWYgZGVmaW5lZChDTUJBU0VfT0JKRUNUX05FRURTX0FMSUdOTUVOVCkgJiYgQ01C
QVNFX09CSkVDVF9ORUVEU19BTElHTk1FTlQKKyAgICBjb25zdGV4cHIgc2l6ZV90IHBhZFNpemUg
PSA0OworI2Vsc2UKKyAgICBjb25zdGV4cHIgc2l6ZV90IHBhZFNpemUgPSAwOworI2VuZGlmCisK
KyNwcmFnbWEgcGFjayhwdXNoLCA0KQorc3RydWN0IERlY29kZXJDbGFzcyB7CisgICAgdWludDhf
dCBwYWRbcGFkU2l6ZV07CisgICAgQ01CYXNlQ2xhc3MgYWxpZ25lZENsYXNzOworfTsKKworc3Rh
dGljIGNvbnN0IERlY29kZXJDbGFzcyBXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcyB7CisgICAg
eyB9LAorICAgIHsKKyAgICAgICAga0NNQmFzZU9iamVjdF9DbGFzc1ZlcnNpb25fMSwKKyAgICAg
ICAgc2l6ZW9mKFdlYktpdFZQOERlY29kZXIpLAorICAgICAgICBudWxscHRyLCAvLyBDb21wYXJp
c29uIGJ5IHBvaW50ZXIgZXF1YWxpdHkKKyAgICAgICAgaW52YWxpZGF0ZVZQOERlY29kZXIsCisg
ICAgICAgIGZpbmFsaXplVlA4RGVjb2RlciwKKyAgICAgICAgY29weVZQOERlY29kZXJEZWJ1Z0Rl
c2NyaXB0aW9uLAorICAgICAgICBudWxscHRyLCAvLyBDb3B5UHJvcGVydHkKKyAgICAgICAgbnVs
bHB0ciwgLy8gU2V0UHJvcGVydHkKKyAgICAgICAgbnVsbHB0ciwKKyAgICAgICAgbnVsbHB0cgor
ICAgIH0KIH07CisjcHJhZ21hIHBhY2socG9wKQorCisjaWYgZGVmaW5lZChDTUJBU0VfT0JKRUNU
X05FRURTX0FMSUdOTUVOVCkgJiYgQ01CQVNFX09CSkVDVF9ORUVEU19BTElHTk1FTlQKKyAgICBz
dGF0aWNfYXNzZXJ0KHNpemVvZihXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xh
c3MudmVyc2lvbikgPT0gc2l6ZW9mKHVpbnQzMl90KSwgIkNNQmFzZUNsYXNzIGZpeHVwIGlzIHJl
cXVpcmVkISIpOworI2Vsc2UKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihXZWJLaXRWUDhEZWNv
ZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MudmVyc2lvbikgPT0gc2l6ZW9mKHVpbnRwdHJfdCks
ICJDTUJhc2VDbGFzcyBmaXh1cCBpcyBub3QgcmVxdWlyZWQhIik7CisjZW5kaWYKK3N0YXRpY19h
c3NlcnQob2Zmc2V0b2YoRGVjb2RlckNsYXNzLCBhbGlnbmVkQ2xhc3MpID09IHBhZFNpemUsICJD
TUJhc2VDbGFzcyBvZmZzZXQgaXMgaW5jb3JyZWN0ISIpOworc3RhdGljX2Fzc2VydChhbGlnbm9m
KERlY29kZXJDbGFzcykgPT0gNCwgIkNNQmFzZUNsYXNzIG11c3QgaGF2ZSA0IGJ5dGUgYWxpZ25t
ZW50Iik7CiAKIHN0YXRpYyBPU1N0YXR1cyBzdGFydFZQOERlY29kZXJTZXNzaW9uKFZUVmlkZW9E
ZWNvZGVyUmVmLCBWVFZpZGVvRGVjb2RlclNlc3Npb24sIENNVmlkZW9Gb3JtYXREZXNjcmlwdGlv
blJlZik7CiBzdGF0aWMgT1NTdGF0dXMgZGVjb2RlVlA4RGVjb2RlckZyYW1lKFZUVmlkZW9EZWNv
ZGVyUmVmLCBWVFZpZGVvRGVjb2RlckZyYW1lLCBDTVNhbXBsZUJ1ZmZlclJlZiwgVlREZWNvZGVG
cmFtZUZsYWdzLCBWVERlY29kZUluZm9GbGFncyopOwpAQCAtODIsNyArMTA1LDcgQEAgc3RhdGlj
IGNvbnN0IFZUVmlkZW9EZWNvZGVyQ2xhc3MgV2ViS2l0VlA4RGVjb2Rlcl9WaWRlb0RlY29kZXJD
bGFzcyA9CiAKIHN0YXRpYyBjb25zdCBWVFZpZGVvRGVjb2RlclZUYWJsZSBXZWJLaXRWUDhEZWNv
ZGVyVlRhYmxlID0KIHsKLSAgICB7IG51bGxwdHIsICZXZWJLaXRWUDhEZWNvZGVyX0Jhc2VDbGFz
cyB9LAorICAgIHsgbnVsbHB0ciwgJldlYktpdFZQOERlY29kZXJfQmFzZUNsYXNzLmFsaWduZWRD
bGFzcyB9LAogICAgICZXZWJLaXRWUDhEZWNvZGVyX1ZpZGVvRGVjb2RlckNsYXNzCiB9OwogCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsv
V2ViS2l0L1dlYktpdFZQOURlY29kZXIuY3BwIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRj
L1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9XZWJLaXRWUDlEZWNvZGVyLmNwcAppbmRleCAxMjM5
OTUyMjZkOGI2ODlhYjA3YjkwMWYzMzFlYjY3YTg3MTdkYmE4Li42OTBmZjhmNGU0OGJiZjI2NGYw
OWJmZjQ4MDg3MmE4Y2ZlOWQ4OTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3
ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdFZQOURlY29kZXIuY3BwCisrKyBi
L1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvV2Vi
S2l0VlA5RGVjb2Rlci5jcHAKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAy
MDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAy
MC0yMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1
dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK
ICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp
bmcgY29uZGl0aW9ucwpAQCAtNDgsMTkgKzQ4LDQyIEBAIHN0YXRpYyBPU1N0YXR1cyBpbnZhbGlk
YXRlVlA5RGVjb2RlcihDTUJhc2VPYmplY3RSZWYpOwogc3RhdGljIHZvaWQgZmluYWxpemVWUDlE
ZWNvZGVyKENNQmFzZU9iamVjdFJlZik7CiBzdGF0aWMgQ0ZTdHJpbmdSZWYgY29weVZQOURlY29k
ZXJEZWJ1Z0Rlc2NyaXB0aW9uKENNQmFzZU9iamVjdFJlZik7CiAKLXN0YXRpYyBjb25zdCBDTUJh
c2VDbGFzcyBXZWJLaXRWUDlEZWNvZGVyX0Jhc2VDbGFzcyA9Ci17Ci0gICAga0NNQmFzZU9iamVj
dF9DbGFzc1ZlcnNpb25fMSwKLSAgICBzaXplb2YoV2ViS2l0VlA5RGVjb2RlciksCi0gICAgbnVs
bHB0ciwgLy8gQ29tcGFyaXNvbiBieSBwb2ludGVyIGVxdWFsaXR5Ci0gICAgaW52YWxpZGF0ZVZQ
OURlY29kZXIsCi0gICAgZmluYWxpemVWUDlEZWNvZGVyLAotICAgIGNvcHlWUDlEZWNvZGVyRGVi
dWdEZXNjcmlwdGlvbiwKLSAgICBudWxscHRyLCAvLyBDb3B5UHJvcGVydHkKLSAgICBudWxscHRy
LCAvLyBTZXRQcm9wZXJ0eQotICAgIG51bGxwdHIsCi0gICAgbnVsbHB0cgorI2lmIGRlZmluZWQo
Q01CQVNFX09CSkVDVF9ORUVEU19BTElHTk1FTlQpICYmIENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJ
R05NRU5UCisgICAgY29uc3RleHByIHNpemVfdCBwYWRTaXplID0gNDsKKyNlbHNlCisgICAgY29u
c3RleHByIHNpemVfdCBwYWRTaXplID0gMDsKKyNlbmRpZgorCisjcHJhZ21hIHBhY2socHVzaCwg
NCkKK3N0cnVjdCBEZWNvZGVyQ2xhc3MgeworICAgIHVpbnQ4X3QgcGFkW3BhZFNpemVdOworICAg
IENNQmFzZUNsYXNzIGFsaWduZWRDbGFzczsKK307CisKK3N0YXRpYyBjb25zdCBEZWNvZGVyQ2xh
c3MgV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MgeworICAgIHsgfSwKKyAgICB7CisgICAgICAg
IGtDTUJhc2VPYmplY3RfQ2xhc3NWZXJzaW9uXzEsCisgICAgICAgIHNpemVvZihXZWJLaXRWUDlE
ZWNvZGVyKSwKKyAgICAgICAgbnVsbHB0ciwgLy8gQ29tcGFyaXNvbiBieSBwb2ludGVyIGVxdWFs
aXR5CisgICAgICAgIGludmFsaWRhdGVWUDlEZWNvZGVyLAorICAgICAgICBmaW5hbGl6ZVZQOURl
Y29kZXIsCisgICAgICAgIGNvcHlWUDlEZWNvZGVyRGVidWdEZXNjcmlwdGlvbiwKKyAgICAgICAg
bnVsbHB0ciwgLy8gQ29weVByb3BlcnR5CisgICAgICAgIG51bGxwdHIsIC8vIFNldFByb3BlcnR5
CisgICAgICAgIG51bGxwdHIsCisgICAgICAgIG51bGxwdHIKKyAgICB9CiB9OworI3ByYWdtYSBw
YWNrKHBvcCkKKworI2lmIGRlZmluZWQoQ01CQVNFX09CSkVDVF9ORUVEU19BTElHTk1FTlQpICYm
IENNQkFTRV9PQkpFQ1RfTkVFRFNfQUxJR05NRU5UCisgICAgc3RhdGljX2Fzc2VydChzaXplb2Yo
V2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25lZENsYXNzLnZlcnNpb24pID09IHNpemVv
Zih1aW50MzJfdCksICJDTUJhc2VDbGFzcyBmaXh1cCBpcyByZXF1aXJlZCEiKTsKKyNlbHNlCisg
ICAgc3RhdGljX2Fzc2VydChzaXplb2YoV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MuYWxpZ25l
ZENsYXNzLnZlcnNpb24pID09IHNpemVvZih1aW50cHRyX3QpLCAiQ01CYXNlQ2xhc3MgZml4dXAg
aXMgbm90IHJlcXVpcmVkISIpOworI2VuZGlmCitzdGF0aWNfYXNzZXJ0KG9mZnNldG9mKERlY29k
ZXJDbGFzcywgYWxpZ25lZENsYXNzKSA9PSBwYWRTaXplLCAiQ01CYXNlQ2xhc3Mgb2Zmc2V0IGlz
IGluY29ycmVjdCEiKTsKK3N0YXRpY19hc3NlcnQoYWxpZ25vZihEZWNvZGVyQ2xhc3MpID09IDQs
ICJDTUJhc2VDbGFzcyBtdXN0IGhhdmUgNCBieXRlIGFsaWdubWVudCIpOwogCiBzdGF0aWMgT1NT
dGF0dXMgc3RhcnRWUDlEZWNvZGVyU2Vzc2lvbihWVFZpZGVvRGVjb2RlclJlZiwgVlRWaWRlb0Rl
Y29kZXJTZXNzaW9uLCBDTVZpZGVvRm9ybWF0RGVzY3JpcHRpb25SZWYpOwogc3RhdGljIE9TU3Rh
dHVzIGRlY29kZVZQOURlY29kZXJGcmFtZShWVFZpZGVvRGVjb2RlclJlZiwgVlRWaWRlb0RlY29k
ZXJGcmFtZSwgQ01TYW1wbGVCdWZmZXJSZWYsIFZURGVjb2RlRnJhbWVGbGFncywgVlREZWNvZGVJ
bmZvRmxhZ3MqKTsKQEAgLTgyLDcgKzEwNSw3IEBAIHN0YXRpYyBjb25zdCBWVFZpZGVvRGVjb2Rl
ckNsYXNzIFdlYktpdFZQOURlY29kZXJfVmlkZW9EZWNvZGVyQ2xhc3MgPQogCiBzdGF0aWMgY29u
c3QgVlRWaWRlb0RlY29kZXJWVGFibGUgV2ViS2l0VlA5RGVjb2RlclZUYWJsZSA9CiB7Ci0gICAg
eyBudWxscHRyLCAmV2ViS2l0VlA5RGVjb2Rlcl9CYXNlQ2xhc3MgfSwKKyAgICB7IG51bGxwdHIs
ICZXZWJLaXRWUDlEZWNvZGVyX0Jhc2VDbGFzcy5hbGlnbmVkQ2xhc3MgfSwKICAgICAmV2ViS2l0
VlA5RGVjb2Rlcl9WaWRlb0RlY29kZXJDbGFzcwogfTsKIAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>