<?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>231794</bug_id>
          
          <creation_ts>2021-10-14 21:40:02 -0700</creation_ts>
          <short_desc>Avoid null pointer dereference when creating ImageBitmap from a null image</short_desc>
          <delta_ts>2022-02-18 14:51:38 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="John Cunningham">johncunningham</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>heycam</cc>
    
    <cc>ryan.hamley</cc>
    
    <cc>sabouhallawa</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1804688</commentid>
    <comment_count>0</comment_count>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-10-14 21:40:02 -0700</bug_when>
    <thetext>Reject createImageBitmap request earlier if the image is null. Also, check that the native image is nonnull when requesting the colorspace, otherwise, return a default of SRGB.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1804691</commentid>
    <comment_count>1</comment_count>
      <attachid>441331</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-10-14 21:43:50 -0700</bug_when>
    <thetext>Created attachment 441331
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1804692</commentid>
    <comment_count>2</comment_count>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-10-14 21:43:53 -0700</bug_when>
    <thetext>&lt;rdar://problem/83829802&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1804694</commentid>
    <comment_count>3</comment_count>
      <attachid>441331</attachid>
    <who name="Cameron McCormack (:heycam)">heycam</who>
    <bug_when>2021-10-14 21:51:42 -0700</bug_when>
    <thetext>Comment on attachment 441331
Patch

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

Non-reviewer r=me.

&gt; Source/WebCore/ChangeLog:3
&gt; +        Reject createImageBitmap request earlier if the image is null. Also, fix a null ptr deref by checking that the native image is nonnull when requesting the colorspace, otherwise, return a default of SRGB.

Nit: Two sentences is a bit long for this line. :-) I would mention the more important fix here like &quot;Avoid null pointer dereference when creating ImageBitmap from a null image&quot;, and then put the details about defaulting to sRGB and rejecting the promise earlier below, just below the &quot;Reviewed by&quot; line.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805863</commentid>
    <comment_count>4</comment_count>
      <attachid>441331</attachid>
    <who name="Said Abou-Hallawa">sabouhallawa</who>
    <bug_when>2021-10-18 20:31:33 -0700</bug_when>
    <thetext>Comment on attachment 441331
Patch

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

r=me based on Cameron&apos;s review.

&gt;&gt; Source/WebCore/ChangeLog:3
&gt;&gt; +        Reject createImageBitmap request earlier if the image is null. Also, fix a null ptr deref by checking that the native image is nonnull when requesting the colorspace, otherwise, return a default of SRGB.
&gt; 
&gt; Nit: Two sentences is a bit long for this line. :-) I would mention the more important fix here like &quot;Avoid null pointer dereference when creating ImageBitmap from a null image&quot;, and then put the details about defaulting to sRGB and rejecting the promise earlier below, just below the &quot;Reviewed by&quot; line.

Yes please change it to the shorter description.

&gt; Source/WebCore/ChangeLog:9
&gt; +        No new tests (OOPS!).

This line should be removed before committing. It will be great if we can get a layout test though.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806467</commentid>
    <comment_count>5</comment_count>
      <attachid>441838</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-10-19 20:14:50 -0700</bug_when>
    <thetext>Created attachment 441838
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806472</commentid>
    <comment_count>6</comment_count>
      <attachid>441840</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-10-19 20:29:11 -0700</bug_when>
    <thetext>Created attachment 441840
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806534</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-10-20 01:09:02 -0700</bug_when>
    <thetext>Committed r284522 (243265@main): &lt;https://commits.webkit.org/243265@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 441840.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1843662</commentid>
    <comment_count>8</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2022-02-18 14:51:38 -0800</bug_when>
    <thetext>*** Bug 236622 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441331</attachid>
            <date>2021-10-14 21:43:50 -0700</date>
            <delta_ts>2021-10-19 20:14:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-231794-20211014214349.patch</filename>
            <type>text/plain</type>
            <size>2509</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTMxODU2MTM3Y2VhMmQy
MWE1ZDgzMDVkMzBjNDM5NmRhNTNkZjllMS4uNzZkZjBlODVlMzQ2NTJkNjcyMWM3ZmE1NjhiOTdl
NTA2ZTI1YzVmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTE0ICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVqZWN0
IGNyZWF0ZUltYWdlQml0bWFwIHJlcXVlc3QgZWFybGllciBpZiB0aGUgaW1hZ2UgaXMgbnVsbC4g
QWxzbywgZml4IGEgbnVsbCBwdHIgZGVyZWYgYnkgY2hlY2tpbmcgdGhhdCB0aGUgbmF0aXZlIGlt
YWdlIGlzIG5vbm51bGwgd2hlbiByZXF1ZXN0aW5nIHRoZSBjb2xvcnNwYWNlLCBvdGhlcndpc2Us
IHJldHVybiBhIGRlZmF1bHQgb2YgU1JHQi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIzMTc5NAorICAgICAgICByZGFyOi8vODM4Mjk4MDIKKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMg
KE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvSW1hZ2VCaXRtYXAuY3BwOgorICAgICAgICAoV2Vi
Q29yZTo6SW1hZ2VCaXRtYXA6OmNyZWF0ZUZyb21CdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3Jt
L2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdl
Ojpjb2xvclNwYWNlKToKKwogMjAyMS0xMC0xNCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBh
cHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gU3VwcG9ydCBhY2NlbnQtY29sb3IgZm9yIGNvbnRy
b2xzIHdpdGhvdXQgdGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbWFnZUJp
dG1hcC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlQml0bWFwLmNwcAppbmRleCAwNjJh
N2Q3OThkZjA4ZmY2ZmFiYjU3MmRiNTIwZmJiMTk5MmU2MTY3Li4wODJkYTRmYmQyMmUyMmY3NDc3
YmUzM2U3NDliOWVlNmY5NThhYWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0lt
YWdlQml0bWFwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlQml0bWFwLmNwcApA
QCAtNzQ5LDcgKzc0OSw3IEBAIHZvaWQgSW1hZ2VCaXRtYXA6OmNyZWF0ZUZyb21CdWZmZXIoU2Ny
aXB0RXhlY3V0aW9uQ29udGV4dCYgc2NyaXB0RXhlY3V0aW9uQ29udGV4CiAgICAgYXV0byBvYnNl
cnZlciA9IEltYWdlQml0bWFwSW1hZ2VPYnNlcnZlcjo6Y3JlYXRlKG1pbWVUeXBlLCBleHBlY3Rl
ZENvbnRlbnRMZW5ndGgsIHNvdXJjZVVSTCk7CiAgICAgYXV0byBpbWFnZSA9IEJpdG1hcEltYWdl
OjpjcmVhdGUob2JzZXJ2ZXIucHRyKCkpOwogICAgIGF1dG8gcmVzdWx0ID0gaW1hZ2UtPnNldERh
dGEoc2hhcmVkQnVmZmVyLmNvcHlSZWYoKSwgdHJ1ZSk7Ci0gICAgaWYgKHJlc3VsdCAhPSBFbmNv
ZGVkRGF0YVN0YXR1czo6Q29tcGxldGUpIHsKKyAgICBpZiAocmVzdWx0ICE9IEVuY29kZWREYXRh
U3RhdHVzOjpDb21wbGV0ZSB8fCBpbWFnZS0+aXNOdWxsKCkpIHsKICAgICAgICAgcHJvbWlzZS5y
ZWplY3QoSW52YWxpZFN0YXRlRXJyb3IsICJDYW5ub3QgZGVjb2RlIHRoZSBkYXRhIGluIHRoZSBh
cmd1bWVudCB0byBjcmVhdGVJbWFnZUJpdG1hcCIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2Uu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwCmlu
ZGV4IDIwYmQxMThlMGE0NmUwYmVjMjJhN2EyYzFjYzRkNDk4MjY0NDkzNGEuLjYwMjc3MzRlMTkz
YjYyNTg3NDFlMGI3MGRlYTQ1NThlMTJhNWRiY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKQEAgLTY1OSw3ICs2NTksOSBAQCB2b2lk
IEJpdG1hcEltYWdlOjppbWFnZUZyYW1lQXZhaWxhYmxlQXRJbmRleChzaXplX3QgaW5kZXgpCiAK
IERlc3RpbmF0aW9uQ29sb3JTcGFjZSBCaXRtYXBJbWFnZTo6Y29sb3JTcGFjZSgpCiB7Ci0gICAg
cmV0dXJuIG5hdGl2ZUltYWdlKCktPmNvbG9yU3BhY2UoKTsKKyAgICBpZiAoYXV0byBuYXRpdmVJ
bWFnZSA9IHRoaXMtPm5hdGl2ZUltYWdlKCkpCisgICAgICAgIHJldHVybiBuYXRpdmVJbWFnZS0+
Y29sb3JTcGFjZSgpOworICAgIHJldHVybiBEZXN0aW5hdGlvbkNvbG9yU3BhY2U6OlNSR0IoKTsK
IH0KIAogdW5zaWduZWQgQml0bWFwSW1hZ2U6OmRlY29kZUNvdW50Rm9yVGVzdGluZygpIGNvbnN0
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441838</attachid>
            <date>2021-10-19 20:14:50 -0700</date>
            <delta_ts>2021-10-19 20:29:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-231794-20211019201449.patch</filename>
            <type>text/plain</type>
            <size>4953</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWUxMjE4M2VmM2JhZDEw
ZWIzNjdlYzE2YWY2NzNkYzAyMTE1MDY3ZC4uOTliMmE4ZjNkOGYxMmRjNjIxNWY5MWU0ZTRiMDNh
NzllMGY0ZjkyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTEwLTE5ICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQg
bnVsbCBwb2ludGVyIGRlcmVmZXJlbmNlIHdoZW4gY3JlYXRpbmcgSW1hZ2VCaXRtYXAgZnJvbSBh
IG51bGwgaW1hZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMzE3OTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBJZiB0aGUgaW1hZ2UgaXMgbnVsbCwgd2UgY2FuIHJlamVjdCB0aGUgcHJvbWlzZSBlYXJs
aWVyLiBEZWZhdWx0IHRvIHNSR0Igd2hlbiBhCisgICAgICAgIEJpdG1hcEltYWdlJ3MgbmF0aXZl
SW1hZ2UgaXMgbnVsbC4KKworICAgICAgICBUZXN0OiBmYXN0L2NhbnZhcy9jcmVhdGVJbWFnZUJp
dG1hcC1pbnZhbGlkLWltYWdlLWJsb2ItY3Jhc2guaHRtbAorCisgICAgICAgICogaHRtbC9JbWFn
ZUJpdG1hcC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJpdG1hcDo6Y3JlYXRlRnJvbUJ1
ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6Qml0bWFwSW1hZ2U6OmNvbG9yU3BhY2UpOgorCiAyMDIxLTEwLTE1ICBB
bnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRlZ3Jh
dGlvbl0gRmFjdG9yIGxpbmUgbG9naWNhbCBvcmRlciB0cmF2ZXJzYWwgb3V0IG9mIGl0ZXJhdG9y
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlQml0bWFwLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvSW1hZ2VCaXRtYXAuY3BwCmluZGV4IDA2MmE3ZDc5OGRmMDhmZjZmYWJi
NTcyZGI1MjBmYmIxOTkyZTYxNjcuLjA4MmRhNGZiZDIyZTIyZjc0NzdiZTMzZTc0OWI5ZWU2Zjk1
OGFhYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VCaXRtYXAuY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VCaXRtYXAuY3BwCkBAIC03NDksNyArNzQ5LDcg
QEAgdm9pZCBJbWFnZUJpdG1hcDo6Y3JlYXRlRnJvbUJ1ZmZlcihTY3JpcHRFeGVjdXRpb25Db250
ZXh0JiBzY3JpcHRFeGVjdXRpb25Db250ZXgKICAgICBhdXRvIG9ic2VydmVyID0gSW1hZ2VCaXRt
YXBJbWFnZU9ic2VydmVyOjpjcmVhdGUobWltZVR5cGUsIGV4cGVjdGVkQ29udGVudExlbmd0aCwg
c291cmNlVVJMKTsKICAgICBhdXRvIGltYWdlID0gQml0bWFwSW1hZ2U6OmNyZWF0ZShvYnNlcnZl
ci5wdHIoKSk7CiAgICAgYXV0byByZXN1bHQgPSBpbWFnZS0+c2V0RGF0YShzaGFyZWRCdWZmZXIu
Y29weVJlZigpLCB0cnVlKTsKLSAgICBpZiAocmVzdWx0ICE9IEVuY29kZWREYXRhU3RhdHVzOjpD
b21wbGV0ZSkgeworICAgIGlmIChyZXN1bHQgIT0gRW5jb2RlZERhdGFTdGF0dXM6OkNvbXBsZXRl
IHx8IGltYWdlLT5pc051bGwoKSkgewogICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkU3Rh
dGVFcnJvciwgIkNhbm5vdCBkZWNvZGUgdGhlIGRhdGEgaW4gdGhlIGFyZ3VtZW50IHRvIGNyZWF0
ZUltYWdlQml0bWFwIik7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKaW5kZXggMjBiZDExOGUwYTQ2
ZTBiZWMyMmE3YTJjMWNjNGQ0OTgyNjQ0OTM0YS4uNjAyNzczNGUxOTNiNjI1ODc0MWUwYjcwZGVh
NDU1OGUxMmE1ZGJjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp
Y3MvQml0bWFwSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L0JpdG1hcEltYWdlLmNwcApAQCAtNjU5LDcgKzY1OSw5IEBAIHZvaWQgQml0bWFwSW1hZ2U6Omlt
YWdlRnJhbWVBdmFpbGFibGVBdEluZGV4KHNpemVfdCBpbmRleCkKIAogRGVzdGluYXRpb25Db2xv
clNwYWNlIEJpdG1hcEltYWdlOjpjb2xvclNwYWNlKCkKIHsKLSAgICByZXR1cm4gbmF0aXZlSW1h
Z2UoKS0+Y29sb3JTcGFjZSgpOworICAgIGlmIChhdXRvIG5hdGl2ZUltYWdlID0gdGhpcy0+bmF0
aXZlSW1hZ2UoKSkKKyAgICAgICAgcmV0dXJuIG5hdGl2ZUltYWdlLT5jb2xvclNwYWNlKCk7Cisg
ICAgcmV0dXJuIERlc3RpbmF0aW9uQ29sb3JTcGFjZTo6U1JHQigpOwogfQogCiB1bnNpZ25lZCBC
aXRtYXBJbWFnZTo6ZGVjb2RlQ291bnRGb3JUZXN0aW5nKCkgY29uc3QKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMmQwODZk
NTExM2MwZTQyZjc2ZTk4ZmQ4MGM4N2IyMmRiOTIyNTI2Li5jYzA2ODZmYTVmNzE5ZjQxZmVlZDQx
OGU3NDljZDQzMGZkODcxNDc1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTAtMTkgIEpv
aG4gQ3VubmluZ2hhbSAgPGpvaG5jdW5uaW5naGFtQGFwcGxlLmNvbT4KKworICAgICAgICBBdm9p
ZCBudWxsIHBvaW50ZXIgZGVyZWZlcmVuY2Ugd2hlbiBjcmVhdGluZyBJbWFnZUJpdG1hcCBmcm9t
IGEgbnVsbCBpbWFnZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIzMTc5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIElmIHRoZSBpbWFnZSBpcyBudWxsLCB3ZSBjYW4gcmVqZWN0IHRoZSBwcm9taXNlIGVh
cmxpZXIuIERlZmF1bHQgdG8gc1JHQiB3aGVuIGEKKyAgICAgICAgQml0bWFwSW1hZ2UncyBuYXRp
dmVJbWFnZSBpcyBudWxsLgorCisgICAgICAgICogZmFzdC9jYW52YXMvY3JlYXRlSW1hZ2VCaXRt
YXAtaW52YWxpZC1pbWFnZS1ibG9iLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg
ICogZmFzdC9jYW52YXMvY3JlYXRlSW1hZ2VCaXRtYXAtaW52YWxpZC1pbWFnZS1ibG9iLWNyYXNo
Lmh0bWw6IEFkZGVkLgorCiAyMDIxLTEwLTE1ICBSb2JlcnQgSmVubmVyICA8SmVubmVyQGFwcGxl
LmNvbT4KIAogICAgICAgICBSRUJBU0VMSU5FIDIgdGFibGVzL21vemlsbGEgdGVzdHMgZmFpbGlu
ZyBjb25zdGFudGx5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jcmVhdGVJ
bWFnZUJpdG1hcC1pbnZhbGlkLWltYWdlLWJsb2ItY3Jhc2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0
VGVzdHMvZmFzdC9jYW52YXMvY3JlYXRlSW1hZ2VCaXRtYXAtaW52YWxpZC1pbWFnZS1ibG9iLWNy
YXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40OGVlZjkzYzQ2MmE0YTBjM2UxNDZkMGI2MDQ1
NzQ1MGU0MDBjNTc5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMv
Y3JlYXRlSW1hZ2VCaXRtYXAtaW52YWxpZC1pbWFnZS1ibG9iLWNyYXNoLWV4cGVjdGVkLnR4dApA
QCAtMCwwICsxLDUgQEAKK1BBU1NFRCAoSWYgdGhpcyBwYWdlIGRpZCBub3QgY3Jhc2guKQorUEFT
UyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NyZWF0ZUltYWdlQml0bWFwLWludmFsaWQtaW1h
Z2UtYmxvYi1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY3JlYXRlSW1hZ2VC
aXRtYXAtaW52YWxpZC1pbWFnZS1ibG9iLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzZkOGIyZTNk
ZjUxYzA3Y2Q4Zjg5NTAyYjJjOTcxY2IxMTgzNGE1MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2Zhc3QvY2FudmFzL2NyZWF0ZUltYWdlQml0bWFwLWludmFsaWQtaW1hZ2UtYmxvYi1j
cmFzaC5odG1sCkBAIC0wLDAgKzEsMTkgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0i
Li4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5j
dGlvbiBydW5UZXN0KCkgeworICAgIC8vIEEgdmFsaWQgUE5HIGhlYWRlciB3aXRoIG5vIGFkZGl0
aW9uYWwgZGF0YSBmb3IgYW4gaW1hZ2UuCisgICAgbGV0IHBuZ0hlYWRlckRhdGEgPSBuZXcgVWlu
dDhBcnJheShbMHg4OSwgMHg1MCwgMHg0RSwgMHg0NywgMHgwRCwgMHgwQSwgMHgxQSwgMHgwQSwg
MHgwMCwgMHgwMF0pOworICAgIGxldCBwbmdIZWFkZXIgPSBuZXcgRmlsZShbcG5nSGVhZGVyRGF0
YV0sICcnKTsKKyAgICBjcmVhdGVJbWFnZUJpdG1hcChwbmdIZWFkZXIsIHtyZXNpemVXaWR0aDog
MSwgcmVzaXplSGVpZ2h0OiAxfSk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9h
ZD0icnVuVGVzdCgpIj4KKyAgICA8Y2FudmFzIGlkPSJ0ZXN0IiB3aWR0aD0iMTAwMCIgaGVpZ2h0
PSIxMDAwIj48L2NhbnZhcz4KK1BBU1NFRCAoSWYgdGhpcyBwYWdlIGRpZCBub3QgY3Jhc2guKQor
ICAgIDxwcmUgaWQ9J2NvbnNvbGUnPjwvcHJlPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNv
dXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441840</attachid>
            <date>2021-10-19 20:29:11 -0700</date>
            <delta_ts>2021-10-20 01:09:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-231794-20211019202910.patch</filename>
            <type>text/plain</type>
            <size>4959</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWUxMjE4M2VmM2JhZDEw
ZWIzNjdlYzE2YWY2NzNkYzAyMTE1MDY3ZC4uMDVmN2RlMWY5NjMzN2ZmMTFlYWUxZmIzMjc1N2Ew
NWE3NjU2MTQ3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTEwLTE5ICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQg
bnVsbCBwb2ludGVyIGRlcmVmZXJlbmNlIHdoZW4gY3JlYXRpbmcgSW1hZ2VCaXRtYXAgZnJvbSBh
IG51bGwgaW1hZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMzE3OTQKKworICAgICAgICBSZXZpZXdlZCBieSBTYWlkIEFib3UtSGFsbGF3YS4KKwor
ICAgICAgICBJZiB0aGUgaW1hZ2UgaXMgbnVsbCwgd2UgY2FuIHJlamVjdCB0aGUgcHJvbWlzZSBl
YXJsaWVyLiBEZWZhdWx0IHRvIHNSR0Igd2hlbiBhCisgICAgICAgIEJpdG1hcEltYWdlJ3MgbmF0
aXZlSW1hZ2UgaXMgbnVsbC4KKworICAgICAgICBUZXN0OiBmYXN0L2NhbnZhcy9jcmVhdGVJbWFn
ZUJpdG1hcC1pbnZhbGlkLWltYWdlLWJsb2ItY3Jhc2guaHRtbAorCisgICAgICAgICogaHRtbC9J
bWFnZUJpdG1hcC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJpdG1hcDo6Y3JlYXRlRnJv
bUJ1ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6Qml0bWFwSW1hZ2U6OmNvbG9yU3BhY2UpOgorCiAyMDIxLTEwLTE1
ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRl
Z3JhdGlvbl0gRmFjdG9yIGxpbmUgbG9naWNhbCBvcmRlciB0cmF2ZXJzYWwgb3V0IG9mIGl0ZXJh
dG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlQml0bWFwLmNwcCBiL1Nv
dXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VCaXRtYXAuY3BwCmluZGV4IDA2MmE3ZDc5OGRmMDhmZjZm
YWJiNTcyZGI1MjBmYmIxOTkyZTYxNjcuLjA4MmRhNGZiZDIyZTIyZjc0NzdiZTMzZTc0OWI5ZWU2
Zjk1OGFhYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VCaXRtYXAuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VCaXRtYXAuY3BwCkBAIC03NDksNyArNzQ5
LDcgQEAgdm9pZCBJbWFnZUJpdG1hcDo6Y3JlYXRlRnJvbUJ1ZmZlcihTY3JpcHRFeGVjdXRpb25D
b250ZXh0JiBzY3JpcHRFeGVjdXRpb25Db250ZXgKICAgICBhdXRvIG9ic2VydmVyID0gSW1hZ2VC
aXRtYXBJbWFnZU9ic2VydmVyOjpjcmVhdGUobWltZVR5cGUsIGV4cGVjdGVkQ29udGVudExlbmd0
aCwgc291cmNlVVJMKTsKICAgICBhdXRvIGltYWdlID0gQml0bWFwSW1hZ2U6OmNyZWF0ZShvYnNl
cnZlci5wdHIoKSk7CiAgICAgYXV0byByZXN1bHQgPSBpbWFnZS0+c2V0RGF0YShzaGFyZWRCdWZm
ZXIuY29weVJlZigpLCB0cnVlKTsKLSAgICBpZiAocmVzdWx0ICE9IEVuY29kZWREYXRhU3RhdHVz
OjpDb21wbGV0ZSkgeworICAgIGlmIChyZXN1bHQgIT0gRW5jb2RlZERhdGFTdGF0dXM6OkNvbXBs
ZXRlIHx8IGltYWdlLT5pc051bGwoKSkgewogICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlk
U3RhdGVFcnJvciwgIkNhbm5vdCBkZWNvZGUgdGhlIGRhdGEgaW4gdGhlIGFyZ3VtZW50IHRvIGNy
ZWF0ZUltYWdlQml0bWFwIik7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKaW5kZXggMjBiZDExOGUw
YTQ2ZTBiZWMyMmE3YTJjMWNjNGQ0OTgyNjQ0OTM0YS4uNjAyNzczNGUxOTNiNjI1ODc0MWUwYjcw
ZGVhNDU1OGUxMmE1ZGJjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvQml0bWFwSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL0JpdG1hcEltYWdlLmNwcApAQCAtNjU5LDcgKzY1OSw5IEBAIHZvaWQgQml0bWFwSW1hZ2U6
OmltYWdlRnJhbWVBdmFpbGFibGVBdEluZGV4KHNpemVfdCBpbmRleCkKIAogRGVzdGluYXRpb25D
b2xvclNwYWNlIEJpdG1hcEltYWdlOjpjb2xvclNwYWNlKCkKIHsKLSAgICByZXR1cm4gbmF0aXZl
SW1hZ2UoKS0+Y29sb3JTcGFjZSgpOworICAgIGlmIChhdXRvIG5hdGl2ZUltYWdlID0gdGhpcy0+
bmF0aXZlSW1hZ2UoKSkKKyAgICAgICAgcmV0dXJuIG5hdGl2ZUltYWdlLT5jb2xvclNwYWNlKCk7
CisgICAgcmV0dXJuIERlc3RpbmF0aW9uQ29sb3JTcGFjZTo6U1JHQigpOwogfQogCiB1bnNpZ25l
ZCBCaXRtYXBJbWFnZTo6ZGVjb2RlQ291bnRGb3JUZXN0aW5nKCkgY29uc3QKZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMmQw
ODZkNTExM2MwZTQyZjc2ZTk4ZmQ4MGM4N2IyMmRiOTIyNTI2Li41NjdjZDYyY2Y0ZGE4NWJhN2Jk
ODJiNjc3MTk4YTRkZDJiNmNjNGVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTAtMTkg
IEpvaG4gQ3VubmluZ2hhbSAgPGpvaG5jdW5uaW5naGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB
dm9pZCBudWxsIHBvaW50ZXIgZGVyZWZlcmVuY2Ugd2hlbiBjcmVhdGluZyBJbWFnZUJpdG1hcCBm
cm9tIGEgbnVsbCBpbWFnZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIzMTc5NAorCisgICAgICAgIFJldmlld2VkIGJ5IFNhaWQgQWJvdS1IYWxsYXdh
LgorCisgICAgICAgIElmIHRoZSBpbWFnZSBpcyBudWxsLCB3ZSBjYW4gcmVqZWN0IHRoZSBwcm9t
aXNlIGVhcmxpZXIuIERlZmF1bHQgdG8gc1JHQiB3aGVuIGEKKyAgICAgICAgQml0bWFwSW1hZ2Un
cyBuYXRpdmVJbWFnZSBpcyBudWxsLgorCisgICAgICAgICogZmFzdC9jYW52YXMvY3JlYXRlSW1h
Z2VCaXRtYXAtaW52YWxpZC1pbWFnZS1ibG9iLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg
ICAgICAgICogZmFzdC9jYW52YXMvY3JlYXRlSW1hZ2VCaXRtYXAtaW52YWxpZC1pbWFnZS1ibG9i
LWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDIxLTEwLTE1ICBSb2JlcnQgSmVubmVyICA8SmVubmVy
QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUJBU0VMSU5FIDIgdGFibGVzL21vemlsbGEgdGVzdHMg
ZmFpbGluZyBjb25zdGFudGx5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9j
cmVhdGVJbWFnZUJpdG1hcC1pbnZhbGlkLWltYWdlLWJsb2ItY3Jhc2gtZXhwZWN0ZWQudHh0IGIv
TGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY3JlYXRlSW1hZ2VCaXRtYXAtaW52YWxpZC1pbWFnZS1i
bG9iLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40OGVlZjkzYzQ2MmE0YTBjM2UxNDZk
MGI2MDQ1NzQ1MGU0MDBjNTc5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9j
YW52YXMvY3JlYXRlSW1hZ2VCaXRtYXAtaW52YWxpZC1pbWFnZS1ibG9iLWNyYXNoLWV4cGVjdGVk
LnR4dApAQCAtMCwwICsxLDUgQEAKK1BBU1NFRCAoSWYgdGhpcyBwYWdlIGRpZCBub3QgY3Jhc2gu
KQorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NyZWF0ZUltYWdlQml0bWFwLWludmFs
aWQtaW1hZ2UtYmxvYi1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY3JlYXRl
SW1hZ2VCaXRtYXAtaW52YWxpZC1pbWFnZS1ibG9iLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAx
MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzZk
OGIyZTNkZjUxYzA3Y2Q4Zjg5NTAyYjJjOTcxY2IxMTgzNGE1MQotLS0gL2Rldi9udWxsCisrKyBi
L0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NyZWF0ZUltYWdlQml0bWFwLWludmFsaWQtaW1hZ2Ut
YmxvYi1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMTkgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0
IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+
CitmdW5jdGlvbiBydW5UZXN0KCkgeworICAgIC8vIEEgdmFsaWQgUE5HIGhlYWRlciB3aXRoIG5v
IGFkZGl0aW9uYWwgZGF0YSBmb3IgYW4gaW1hZ2UuCisgICAgbGV0IHBuZ0hlYWRlckRhdGEgPSBu
ZXcgVWludDhBcnJheShbMHg4OSwgMHg1MCwgMHg0RSwgMHg0NywgMHgwRCwgMHgwQSwgMHgxQSwg
MHgwQSwgMHgwMCwgMHgwMF0pOworICAgIGxldCBwbmdIZWFkZXIgPSBuZXcgRmlsZShbcG5nSGVh
ZGVyRGF0YV0sICcnKTsKKyAgICBjcmVhdGVJbWFnZUJpdG1hcChwbmdIZWFkZXIsIHtyZXNpemVX
aWR0aDogMSwgcmVzaXplSGVpZ2h0OiAxfSk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5
IG9ubG9hZD0icnVuVGVzdCgpIj4KKyAgICA8Y2FudmFzIGlkPSJ0ZXN0IiB3aWR0aD0iMTAwMCIg
aGVpZ2h0PSIxMDAwIj48L2NhbnZhcz4KK1BBU1NFRCAoSWYgdGhpcyBwYWdlIGRpZCBub3QgY3Jh
c2guKQorICAgIDxwcmUgaWQ9J2NvbnNvbGUnPjwvcHJlPgorICAgIDxzY3JpcHQgc3JjPSIuLi8u
Li9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K
</data>

          </attachment>
      

    </bug>

</bugzilla>