<?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>174828</bug_id>
          
          <creation_ts>2017-07-25 12:28:29 -0700</creation_ts>
          <short_desc>Use SandboxExtension::HandleArray when sending extensions for file uploads to the web process</short_desc>
          <delta_ts>2017-07-26 11:32:50 -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>WebKit2</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></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>174867</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Blaze Burg">bburg</reporter>
          <assigned_to name="Blaze Burg">bburg</assigned_to>
          <cc>bburg</cc>
    
    <cc>commit-queue</cc>
    
    <cc>darin</cc>
    
    <cc>thorton</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1332042</commentid>
    <comment_count>0</comment_count>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2017-07-25 12:28:29 -0700</bug_when>
    <thetext>Minor code cleanup.

I didn&apos;t merge this into the didChooseFilesForOpenPanel message, since the necessity of sandbox extensions depends on ENABLE(SANDBOX_EXTENSIONS). I don&apos;t want to conditionally define the same message more than one way since we don&apos;t do that anywhere else that I&apos;m aware of.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332043</commentid>
    <comment_count>1</comment_count>
      <attachid>316383</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2017-07-25 12:30:25 -0700</bug_when>
    <thetext>Created attachment 316383
Proposed Fix</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332096</commentid>
    <comment_count>2</comment_count>
      <attachid>316383</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-07-25 14:22:32 -0700</bug_when>
    <thetext>Comment on attachment 316383
Proposed Fix

Clearing flags on attachment: 316383

Committed r219887: &lt;http://trac.webkit.org/changeset/219887&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332097</commentid>
    <comment_count>3</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-07-25 14:22:34 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332196</commentid>
    <comment_count>4</comment_count>
      <attachid>316383</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2017-07-25 18:00:04 -0700</bug_when>
    <thetext>Comment on attachment 316383
Proposed Fix

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

&gt; Source/WebKit/WebProcess/WebPage/WebPage.cpp:3841
&gt; +    for (size_t i = 0; i &lt; handles.size(); ++i) {

I would prefer a modern for loop here. Presuming that there is a begin/end function on HandleArray.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332381</commentid>
    <comment_count>5</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-07-26 10:47:03 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 174867</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332385</commentid>
    <comment_count>6</comment_count>
      <attachid>316455</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2017-07-26 10:54:26 -0700</bug_when>
    <thetext>Created attachment 316455
Followup fix</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332386</commentid>
    <comment_count>7</comment_count>
      <attachid>316455</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2017-07-26 10:54:56 -0700</bug_when>
    <thetext>Comment on attachment 316455
Followup fix

Heh. Better.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332392</commentid>
    <comment_count>8</comment_count>
      <attachid>316455</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-07-26 11:32:49 -0700</bug_when>
    <thetext>Comment on attachment 316455
Followup fix

Clearing flags on attachment: 316455

Committed r219952: &lt;http://trac.webkit.org/changeset/219952&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1332393</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-07-26 11:32:50 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>316383</attachid>
            <date>2017-07-25 12:30:25 -0700</date>
            <delta_ts>2017-07-26 10:54:25 -0700</delta_ts>
            <desc>Proposed Fix</desc>
            <filename>bug-174828-20170725123105.patch</filename>
            <type>text/plain</type>
            <size>6920</size>
            <attacher name="Blaze Burg">bburg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5ODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZmNGEwNzgxNjUyMzRjOGFh
MWMzZjg2ZmYzMjc2YzA2N2Q1ZWFiNTQuLjdmY2Y5OWIyMzk4OTBiNjkzZTkzZWFmZGFhYjcwN2Fk
Mzc1YjliZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTctMDctMjUgIEJyaWFuIEJ1
cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIFNhbmRib3hFeHRlbnNpb246Okhh
bmRsZUFycmF5IHdoZW4gc2VuZGluZyBleHRlbnNpb25zIGZvciBmaWxlIHVwbG9hZHMgdG8gdGhl
IHdlYiBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNzQ4MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBTZW5kIGFsbCBvZiB0aGUgc2FuZGJveCBleHRlbnNpb24gaGFuZGxlcyBpbiBhIHNpbmds
ZSBtZXNzYWdlLCByYXRoZXIgdGhhbgorICAgICAgICBvbmUgbWVzc2FnZSBwZXIgZXh0ZW5zaW9u
LiBVcGRhdGUgbWVzc2FnZSBuYW1lIGFuZCBwYXJhbWV0ZXIgdHlwZXMgdG8gbWF0Y2guCisKKyAg
ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi
UGFnZVByb3h5OjpkaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5lbFdpdGhEaXNwbGF5U3RyaW5nQW5k
SWNvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ2hvb3NlRmlsZXNGb3JP
cGVuUGFuZWwpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAg
ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZXh0ZW5kU2FuZGJveEZvckZpbGVzRnJvbU9wZW5QYW5l
bCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmV4dGVuZFNhbmRib3hGb3JGaWxlRnJvbU9w
ZW5QYW5lbCk6IERlbGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu
aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwor
MjAxNy0wNy0yNSAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIg
QXV0b21hdGlvbjogYWRkIHN1cHBvcnQgZm9yIHVwbG9hZGluZyBmaWxlcwogICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0Nzk3CiAgICAgICAgIDxyZGFy
Oi8vcHJvYmxlbS8yODQ4NTA2Mz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku
Y3BwCmluZGV4IGU0ZTJmMDRhZmUzNThkYjM3Zjc0ZmI2NWQ3MWZhZmFhNDMyNzcyNTguLmZmMGU4
MWM4NmIzMjA5Y2E4ZTYwMmVmMDU5Yzk1ZjRhYTdjMzhkOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNDY4OCwxMiArNDY4OCwxMSBAQCB2b2lkIFdlYlBh
Z2VQcm94eTo6ZGlkQ2hvb3NlRmlsZXNGb3JPcGVuUGFuZWxXaXRoRGlzcGxheVN0cmluZ0FuZElj
b24oY29uc3QgVmVjdAogICAgICAgICByZXR1cm47CiAKICNpZiBFTkFCTEUoU0FOREJPWF9FWFRF
TlNJT05TKQotICAgIC8vIEZJWE1FOiBUaGUgc2FuZGJveCBleHRlbnNpb25zIHNob3VsZCBiZSBz
ZW50IHdpdGggdGhlIERpZENob29zZUZpbGVzRm9yT3BlblBhbmVsIG1lc3NhZ2UuIFRoaXMKLSAg
ICAvLyBpcyBnYXRlZCBvbiBhIHdheSBvZiBwYXNzaW5nIFNhbmRib3hFeHRlbnNpb246OkhhbmRs
ZXMgaW4gYSBWZWN0b3IuCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBmaWxlVVJMcy5zaXpl
KCk7ICsraSkgewotICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVu
c2lvbkhhbmRsZTsKLSAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKGZpbGVV
UkxzW2ldLCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFkT25seSwgc2FuZGJveEV4dGVuc2lvbkhhbmRs
ZSk7Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RXh0ZW5kU2Fu
ZGJveEZvckZpbGVGcm9tT3BlblBhbmVsKHNhbmRib3hFeHRlbnNpb25IYW5kbGUpLCBtX3BhZ2VJ
RCk7CisgICAgICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5IHNhbmRib3hFeHRlbnNp
b25IYW5kbGVzOworICAgICAgICBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlcy5hbGxvY2F0ZShmaWxl
VVJMcy5zaXplKCkpOworICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUoZmls
ZVVSTHNbaV0sIFNhbmRib3hFeHRlbnNpb246OlJlYWRPbmx5LCBzYW5kYm94RXh0ZW5zaW9uSGFu
ZGxlc1tpXSk7CisgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RXh0
ZW5kU2FuZGJveEZvckZpbGVzRnJvbU9wZW5QYW5lbChzYW5kYm94RXh0ZW5zaW9uSGFuZGxlcyks
IG1fcGFnZUlEKTsKICAgICB9CiAjZW5kaWYKIApAQCAtNDcxMCwxOCArNDcwOSwxNyBAQCB2b2lk
IFdlYlBhZ2VQcm94eTo6ZGlkQ2hvb3NlRmlsZXNGb3JPcGVuUGFuZWwoY29uc3QgVmVjdG9yPFN0
cmluZz4mIGZpbGVVUkxzKQogICAgICAgICByZXR1cm47CiAKICNpZiBFTkFCTEUoU0FOREJPWF9F
WFRFTlNJT05TKQotICAgIC8vIEZJWE1FOiBUaGUgc2FuZGJveCBleHRlbnNpb25zIHNob3VsZCBi
ZSBzZW50IHdpdGggdGhlIERpZENob29zZUZpbGVzRm9yT3BlblBhbmVsIG1lc3NhZ2UuIFRoaXMK
LSAgICAvLyBpcyBnYXRlZCBvbiBhIHdheSBvZiBwYXNzaW5nIFNhbmRib3hFeHRlbnNpb246Okhh
bmRsZXMgaW4gYSBWZWN0b3IuCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBmaWxlVVJMcy5z
aXplKCk7ICsraSkgewotICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4
dGVuc2lvbkhhbmRsZTsKLSAgICAgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gU2FuZGJveEV4
dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKGZpbGVVUkxzW2ldLCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFk
T25seSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CisgICAgICAgIFNhbmRib3hFeHRlbnNpb246
OkhhbmRsZUFycmF5IHNhbmRib3hFeHRlbnNpb25IYW5kbGVzOworICAgICAgICBzYW5kYm94RXh0
ZW5zaW9uSGFuZGxlcy5hbGxvY2F0ZShmaWxlVVJMcy5zaXplKCkpOworICAgICAgICBib29sIGNy
ZWF0ZWRFeHRlbnNpb24gPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUoZmlsZVVSTHNb
aV0sIFNhbmRib3hFeHRlbnNpb246OlJlYWRPbmx5LCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlc1tp
XSk7CiAgICAgICAgIGlmICghY3JlYXRlZEV4dGVuc2lvbikgewogICAgICAgICAgICAgLy8gVGhp
cyBjYW4gbGVnaXRpbWF0ZWx5IGZhaWwgaWYgYSBkaXJlY3RvcnkgY29udGFpbmluZyB0aGUgZmls
ZSBpcyBkZWxldGVkIGFmdGVyIHRoZSBmaWxlIHdhcyBjaG9zZW4uCiAgICAgICAgICAgICAvLyBX
ZSBhbHNvIGhhdmUgcmVwb3J0cyBvZiBjYXNlcyB3aGVyZSB0aGlzIGxpa2VseSBmYWlscyBmb3Ig
c29tZSB1bmtub3duIHJlYXNvbiwgPHJkYXI6Ly9wcm9ibGVtLzEwMTU2NzEwPi4KICAgICAgICAg
ICAgIFdURkxvZ0Fsd2F5cygiV2ViUGFnZVByb3h5OjpkaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5l
bDogY291bGQgbm90IGNyZWF0ZSBhIHNhbmRib3ggZXh0ZW5zaW9uIGZvciAnJXMnXG4iLCBmaWxl
VVJMc1tpXS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9
Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RXh0ZW5kU2FuZGJv
eEZvckZpbGVGcm9tT3BlblBhbmVsKHNhbmRib3hFeHRlbnNpb25IYW5kbGUpLCBtX3BhZ2VJRCk7
CisgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RXh0ZW5kU2FuZGJv
eEZvckZpbGVzRnJvbU9wZW5QYW5lbChzYW5kYm94RXh0ZW5zaW9uSGFuZGxlcyksIG1fcGFnZUlE
KTsKICAgICB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X
ZWJQYWdlLmNwcAppbmRleCBhMjBmMWQ1YzA2NGQ2MWI1ZTI5YWQ5ZWRkNWQxZTA0ZWZiYzBkNTdi
Li5iMjAyNWI4NTM1MDQyODhkYjhiZmU5MGRiYTVlYjg5YWJjMTI1MzJlIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMzgzNiwxMiArMzgzNiwx
NCBAQCB2b2lkIFdlYlBhZ2U6OmRpZENhbmNlbEZvck9wZW5QYW5lbCgpCiB9CiAKICNpZiBFTkFC
TEUoU0FOREJPWF9FWFRFTlNJT05TKQotdm9pZCBXZWJQYWdlOjpleHRlbmRTYW5kYm94Rm9yRmls
ZUZyb21PcGVuUGFuZWwoY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBoYW5kbGUpCit2
b2lkIFdlYlBhZ2U6OmV4dGVuZFNhbmRib3hGb3JGaWxlc0Zyb21PcGVuUGFuZWwoU2FuZGJveEV4
dGVuc2lvbjo6SGFuZGxlQXJyYXkmJiBoYW5kbGVzKQogewotICAgIGJvb2wgcmVzdWx0ID0gU2Fu
ZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KGhhbmRsZSk7Ci0gICAgaWYgKCFyZXN1
bHQpIHsKLSAgICAgICAgLy8gV2UgaGF2ZSByZXBvcnRzIG9mIGNhc2VzIHdoZXJlIHRoaXMgZmFp
bHMgZm9yIHNvbWUgdW5rbm93biByZWFzb24sIDxyZGFyOi8vcHJvYmxlbS8xMDE1NjcxMD4uCi0g
ICAgICAgIFdURkxvZ0Fsd2F5cygiV2ViUGFnZTo6ZXh0ZW5kU2FuZGJveEZvckZpbGVGcm9tT3Bl
blBhbmVsKCk6IENvdWxkIG5vdCBjb25zdW1lIGEgc2FuZGJveCBleHRlbnNpb24iKTsKKyAgICBm
b3IgKHNpemVfdCBpID0gMDsgaSA8IGhhbmRsZXMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgYm9v
bCByZXN1bHQgPSBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkoaGFuZGxlc1tp
XSk7CisgICAgICAgIGlmICghcmVzdWx0KSB7CisgICAgICAgICAgICAvLyBXZSBoYXZlIHJlcG9y
dHMgb2YgY2FzZXMgd2hlcmUgdGhpcyBmYWlscyBmb3Igc29tZSB1bmtub3duIHJlYXNvbiwgPHJk
YXI6Ly9wcm9ibGVtLzEwMTU2NzEwPi4KKyAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiV2ViUGFn
ZTo6ZXh0ZW5kU2FuZGJveEZvckZpbGVGcm9tT3BlblBhbmVsKCk6IENvdWxkIG5vdCBjb25zdW1l
IGEgc2FuZGJveCBleHRlbnNpb24iKTsKKyAgICAgICAgfQogICAgIH0KIH0KICNlbmRpZgpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDc3MjQ1ZDUwNzk4
MGY3NjMxY2JjMTBiMTk1YjNhYTNlYzRiYjUyMTYuLjNlNTkxOTY4MWVhMDJjNjNkNjVkYTY3YWFi
MzI4MzQ0OGJkN2NhZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ
YWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ
YWdlLmgKQEAgLTExNzgsNyArMTE3OCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRDaG9vc2VG
aWxlc0Zvck9wZW5QYW5lbChjb25zdCBWZWN0b3I8U3RyaW5nPiYpOwogICAgIHZvaWQgZGlkQ2Fu
Y2VsRm9yT3BlblBhbmVsKCk7CiAjaWYgRU5BQkxFKFNBTkRCT1hfRVhURU5TSU9OUykKLSAgICB2
b2lkIGV4dGVuZFNhbmRib3hGb3JGaWxlRnJvbU9wZW5QYW5lbChjb25zdCBTYW5kYm94RXh0ZW5z
aW9uOjpIYW5kbGUmKTsKKyAgICB2b2lkIGV4dGVuZFNhbmRib3hGb3JGaWxlc0Zyb21PcGVuUGFu
ZWwoU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkmJik7CiAjZW5kaWYKIAogICAgIHZvaWQg
ZGlkUmVjZWl2ZUdlb2xvY2F0aW9uUGVybWlzc2lvbkRlY2lzaW9uKHVpbnQ2NF90IGdlb2xvY2F0
aW9uSUQsIGJvb2wgYWxsb3dlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgppbmRleCAxYWFhMWRkMzljYmJjODQzYTZmNDU2
NDQyNDU2NjViOGU4OTJkMWUxLi44ZTRkMGM2OGQ0MDZkYmJlMzM1MjVjZDkxMTE0MGFiNTRhNzI2
YzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl
Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh
Z2UubWVzc2FnZXMuaW4KQEAgLTI3NCw3ICsyNzQsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExl
Z2FjeVJlY2VpdmVyIHsKICAgICBEaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5lbChWZWN0b3I8U3Ry
aW5nPiBmaWxlVVJMcykKICAgICBEaWRDYW5jZWxGb3JPcGVuUGFuZWwoKQogI2lmIEVOQUJMRShT
QU5EQk9YX0VYVEVOU0lPTlMpCi0gICAgRXh0ZW5kU2FuZGJveEZvckZpbGVGcm9tT3BlblBhbmVs
KFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIHNhbmRib3hFeHRlbnNpb25IYW5kbGUp
CisgICAgRXh0ZW5kU2FuZGJveEZvckZpbGVzRnJvbU9wZW5QYW5lbChXZWJLaXQ6OlNhbmRib3hF
eHRlbnNpb246OkhhbmRsZUFycmF5IHNhbmRib3hFeHRlbnNpb25zKQogI2VuZGlmCiAKICAgICAj
IFNwZWxsaW5nIGFuZCBncmFtbWFyLgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>316455</attachid>
            <date>2017-07-26 10:54:26 -0700</date>
            <delta_ts>2017-07-26 11:32:49 -0700</delta_ts>
            <desc>Followup fix</desc>
            <filename>bug-174828-20170726105345.patch</filename>
            <type>text/plain</type>
            <size>3700</size>
            <attacher name="Blaze Burg">bburg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5ODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdmY2Y5OWIyMzk4OTBiNjkz
ZTkzZWFmZGFhYjcwN2FkMzc1YjliZWYuLjUyYzViZTY4ZTU0YjY0ODczNDI5NzcyYmE2Mzc2NTRk
MDc5MGY2NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTctMDctMjYgIEJyaWFuIEJ1
cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIFNhbmRib3hFeHRlbnNpb246Okhh
bmRsZUFycmF5IHdoZW4gc2VuZGluZyBleHRlbnNpb25zIGZvciBmaWxlIHVwbG9hZHMgdG8gdGhl
IHdlYiBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNzQ4MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBJbiB0aGUgcHJldmlvdXMgY2hhbmdlIEkgZm9yZ290IHRvIGhvaXN0IHRoZSBIYW5kbGVB
cnJheSBhbmQgbWVzc2FnZS1zZW5kIG91dCBvZiB0aGUKKyAgICAgICAgbG9vcCwgc28gdGhlIGNv
ZGUgd2Fzbid0IGFjdHVhbGx5IHNlbmRpbmcgZmV3ZXIgbWVzc2FnZXMuIFRoYXQncyBmaXhlZCBu
b3cuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl
YktpdDo6V2ViUGFnZVByb3h5OjpkaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5lbFdpdGhEaXNwbGF5
U3RyaW5nQW5kSWNvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ2hvb3Nl
RmlsZXNGb3JPcGVuUGFuZWwpOgorCiAyMDE3LTA3LTI1ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBw
bGUuY29tPgogCiAgICAgICAgIFVzZSBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSB3aGVu
IHNlbmRpbmcgZXh0ZW5zaW9ucyBmb3IgZmlsZSB1cGxvYWRzIHRvIHRoZSB3ZWIgcHJvY2Vzcwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZmYwZTgxYzg2YjMy
MDljYThlNjAyZWYwNTljOTVmNGFhN2MzOGQ5OS4uYWRkZDAxNWRkMzYwODgzYzIwMDZjYzcwNmJm
NDZkMzM5NGU3OTczYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn
ZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw
CkBAIC00Njg4LDEyICs0Njg4LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDaG9vc2VGaWxl
c0Zvck9wZW5QYW5lbFdpdGhEaXNwbGF5U3RyaW5nQW5kSWNvbihjb25zdCBWZWN0CiAgICAgICAg
IHJldHVybjsKIAogI2lmIEVOQUJMRShTQU5EQk9YX0VYVEVOU0lPTlMpCi0gICAgZm9yIChzaXpl
X3QgaSA9IDA7IGkgPCBmaWxlVVJMcy5zaXplKCk7ICsraSkgewotICAgICAgICBTYW5kYm94RXh0
ZW5zaW9uOjpIYW5kbGVBcnJheSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlczsKLSAgICAgICAgc2Fu
ZGJveEV4dGVuc2lvbkhhbmRsZXMuYWxsb2NhdGUoZmlsZVVSTHMuc2l6ZSgpKTsKKyAgICBTYW5k
Ym94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlczsKKyAgICBz
YW5kYm94RXh0ZW5zaW9uSGFuZGxlcy5hbGxvY2F0ZShmaWxlVVJMcy5zaXplKCkpOworICAgIGZv
ciAoc2l6ZV90IGkgPSAwOyBpIDwgZmlsZVVSTHMuc2l6ZSgpOyArK2kpCiAgICAgICAgIFNhbmRi
b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZShmaWxlVVJMc1tpXSwgU2FuZGJveEV4dGVuc2lvbjo6
UmVhZE9ubHksIHNhbmRib3hFeHRlbnNpb25IYW5kbGVzW2ldKTsKLSAgICAgICAgbV9wcm9jZXNz
LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpFeHRlbmRTYW5kYm94Rm9yRmlsZXNGcm9tT3BlblBh
bmVsKHNhbmRib3hFeHRlbnNpb25IYW5kbGVzKSwgbV9wYWdlSUQpOwotICAgIH0KKworICAgIG1f
cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RXh0ZW5kU2FuZGJveEZvckZpbGVzRnJv
bU9wZW5QYW5lbChzYW5kYm94RXh0ZW5zaW9uSGFuZGxlcyksIG1fcGFnZUlEKTsKICNlbmRpZgog
CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRDaG9vc2VGaWxlc0Zv
ck9wZW5QYW5lbFdpdGhEaXNwbGF5U3RyaW5nQW5kSWNvbihmaWxlVVJMcywgZGlzcGxheVN0cmlu
ZywgaWNvbkRhdGEgPyBpY29uRGF0YS0+ZGF0YVJlZmVyZW5jZSgpIDogSVBDOjpEYXRhUmVmZXJl
bmNlKCkpLCBtX3BhZ2VJRCk7CkBAIC00NzA5LDkgKzQ3MDksOSBAQCB2b2lkIFdlYlBhZ2VQcm94
eTo6ZGlkQ2hvb3NlRmlsZXNGb3JPcGVuUGFuZWwoY29uc3QgVmVjdG9yPFN0cmluZz4mIGZpbGVV
UkxzKQogICAgICAgICByZXR1cm47CiAKICNpZiBFTkFCTEUoU0FOREJPWF9FWFRFTlNJT05TKQor
ICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5IHNhbmRib3hFeHRlbnNpb25IYW5kbGVz
OworICAgIHNhbmRib3hFeHRlbnNpb25IYW5kbGVzLmFsbG9jYXRlKGZpbGVVUkxzLnNpemUoKSk7
CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBmaWxlVVJMcy5zaXplKCk7ICsraSkgewotICAg
ICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxl
czsKLSAgICAgICAgc2FuZGJveEV4dGVuc2lvbkhhbmRsZXMuYWxsb2NhdGUoZmlsZVVSTHMuc2l6
ZSgpKTsKICAgICAgICAgYm9vbCBjcmVhdGVkRXh0ZW5zaW9uID0gU2FuZGJveEV4dGVuc2lvbjo6
Y3JlYXRlSGFuZGxlKGZpbGVVUkxzW2ldLCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFkT25seSwgc2Fu
ZGJveEV4dGVuc2lvbkhhbmRsZXNbaV0pOwogICAgICAgICBpZiAoIWNyZWF0ZWRFeHRlbnNpb24p
IHsKICAgICAgICAgICAgIC8vIFRoaXMgY2FuIGxlZ2l0aW1hdGVseSBmYWlsIGlmIGEgZGlyZWN0
b3J5IGNvbnRhaW5pbmcgdGhlIGZpbGUgaXMgZGVsZXRlZCBhZnRlciB0aGUgZmlsZSB3YXMgY2hv
c2VuLgpAQCAtNDcxOSw4ICs0NzE5LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENob29zZUZp
bGVzRm9yT3BlblBhbmVsKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBmaWxlVVJMcykKICAgICAgICAg
ICAgIFdURkxvZ0Fsd2F5cygiV2ViUGFnZVByb3h5OjpkaWRDaG9vc2VGaWxlc0Zvck9wZW5QYW5l
bDogY291bGQgbm90IGNyZWF0ZSBhIHNhbmRib3ggZXh0ZW5zaW9uIGZvciAnJXMnXG4iLCBmaWxl
VVJMc1tpXS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9
Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RXh0ZW5kU2FuZGJv
eEZvckZpbGVzRnJvbU9wZW5QYW5lbChzYW5kYm94RXh0ZW5zaW9uSGFuZGxlcyksIG1fcGFnZUlE
KTsKICAgICB9CisKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkV4dGVu
ZFNhbmRib3hGb3JGaWxlc0Zyb21PcGVuUGFuZWwoc2FuZGJveEV4dGVuc2lvbkhhbmRsZXMpLCBt
X3BhZ2VJRCk7CiAjZW5kaWYKIAogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn
ZTo6RGlkQ2hvb3NlRmlsZXNGb3JPcGVuUGFuZWwoZmlsZVVSTHMpLCBtX3BhZ2VJRCk7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>