<?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>199586</bug_id>
          
          <creation_ts>2019-07-08 14:00:56 -0700</creation_ts>
          <short_desc>Cleanup uses of NetworkProcess::m_sessionByConnection</short_desc>
          <delta_ts>2019-07-09 15:40:17 -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>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>beidson</cc>
    
    <cc>commit-queue</cc>
    
    <cc>ryanhaddad</cc>
    
    <cc>sihui_liu</cc>
    
    <cc>tsavell</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1550951</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-07-08 14:00:56 -0700</bug_when>
    <thetext>Cleanup uses of NetworkProces::m_sessionByConnection.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1550952</commentid>
    <comment_count>1</comment_count>
      <attachid>373661</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-07-08 14:08:02 -0700</bug_when>
    <thetext>Created attachment 373661
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1550960</commentid>
    <comment_count>2</comment_count>
      <attachid>373663</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-07-08 14:13:46 -0700</bug_when>
    <thetext>Created attachment 373663
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1550978</commentid>
    <comment_count>3</comment_count>
      <attachid>373666</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-07-08 14:41:24 -0700</bug_when>
    <thetext>Created attachment 373666
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1550997</commentid>
    <comment_count>4</comment_count>
      <attachid>373666</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-07-08 15:28:35 -0700</bug_when>
    <thetext>Comment on attachment 373666
Patch

Clearing flags on attachment: 373666

Committed r247230: &lt;https://trac.webkit.org/changeset/247230&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1550998</commentid>
    <comment_count>5</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-07-08 15:28:37 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551304</commentid>
    <comment_count>6</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2019-07-09 11:08:39 -0700</bug_when>
    <thetext>It looks like the changes in https://trac.webkit.org/changeset/247230/webkit
caused this test to crash on Debug WK2 for Mac and iOS: storage/domstorage/localstorage/private-browsing-affects-storage.html

History:
https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&amp;tests=storage%2Fdomstorage%2Flocalstorage%2Fprivate-browsing-affects-storage.html

Crash:
https://build.webkit.org/results/Apple%20Mojave%20Debug%20WK2%20(Tests)/r247258%20(3475)/storage/domstorage/localstorage/private-browsing-affects-storage-crash-log.txt

I was able to reproduce this locally with command:

run-webkit-tests --root debug-247230 storage/domstorage/localstorage/private-browsing-affects-storage.html --iterations 20 -f --debug</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551305</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2019-07-09 11:10:18 -0700</bug_when>
    <thetext>&lt;rdar://problem/52842659&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551412</commentid>
    <comment_count>8</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2019-07-09 13:57:10 -0700</bug_when>
    <thetext>(In reply to Truitt Savell from comment #6)
&gt; It looks like the changes in https://trac.webkit.org/changeset/247230/webkit
&gt; caused this test to crash on Debug WK2 for Mac and iOS:
&gt; storage/domstorage/localstorage/private-browsing-affects-storage.html

ASSERTION FAILED: addResult.iterator-&gt;value == sessionID
/Volumes/Data/slave/mojave-debug/build/Source/WebKit/NetworkProcess/NetworkProcess.cpp(2670) : void WebKit::NetworkProcess::webPageWasAdded(IPC::Connection &amp;, PAL::SessionID, WebCore::PageIdentifier, WebCore::PageIdentifier)

Chris, can you take a look at this or should we revert?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551414</commentid>
    <comment_count>9</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2019-07-09 14:01:54 -0700</bug_when>
    <thetext>Reverted r247230 for reason:

Caused storage/domstorage/localstorage/private-browsing-affects-storage.html to crash with an assertion.

Committed r247277: &lt;https://trac.webkit.org/changeset/247277&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551420</commentid>
    <comment_count>10</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-07-09 14:06:09 -0700</bug_when>
    <thetext>(In reply to Ryan Haddad from comment #8)
&gt; (In reply to Truitt Savell from comment #6)
&gt; &gt; It looks like the changes in https://trac.webkit.org/changeset/247230/webkit
&gt; &gt; caused this test to crash on Debug WK2 for Mac and iOS:
&gt; &gt; storage/domstorage/localstorage/private-browsing-affects-storage.html
&gt; 
&gt; ASSERTION FAILED: addResult.iterator-&gt;value == sessionID
&gt; /Volumes/Data/slave/mojave-debug/build/Source/WebKit/NetworkProcess/
&gt; NetworkProcess.cpp(2670) : void
&gt; WebKit::NetworkProcess::webPageWasAdded(IPC::Connection &amp;, PAL::SessionID,
&gt; WebCore::PageIdentifier, WebCore::PageIdentifier)
&gt; 
&gt; Chris, can you take a look at this or should we revert?

Sihui, Alex, I believe my new assertion may have uncovered a bug in the existing code.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551444</commentid>
    <comment_count>11</comment_count>
      <attachid>373770</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-07-09 14:49:02 -0700</bug_when>
    <thetext>Created attachment 373770
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551486</commentid>
    <comment_count>12</comment_count>
      <attachid>373770</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-07-09 15:40:15 -0700</bug_when>
    <thetext>Comment on attachment 373770
Patch

Clearing flags on attachment: 373770

Committed r247283: &lt;https://trac.webkit.org/changeset/247283&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1551487</commentid>
    <comment_count>13</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-07-09 15:40:17 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373661</attachid>
            <date>2019-07-08 14:08:02 -0700</date>
            <delta_ts>2019-07-08 14:13:45 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-199586-20190708140802.patch</filename>
            <type>text/plain</type>
            <size>3134</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcxNjM4ZmE0ZDFhNGM4NDM4
M2Q0OTJmNjYzYmNlMTBmMTU0YjNiMjMuLjc2ZmU0YmM2ZTlmOTZjZDA1YzFhMWQ0NjgwYzkzNzdm
YjU0MjExOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDctMDggIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIHVzZXMgb2YgTmV0d29y
a1Byb2Nlczo6bV9zZXNzaW9uQnlDb25uZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk1ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBBdm9pZCBkb3VibGUgSGFzaE1hcCBsb29rdXBzIGFuZCBj
YWxsIGFkZCgpIGluc3RlYWQgb2YgZW5zdXJlKCkgd2hlbiBhcHByb3ByaWF0ZS4KKworICAgICAg
ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6
TmV0d29ya1Byb2Nlc3M6Om5ldHdvcmtTZXNzaW9uQnlDb25uZWN0aW9uIGNvbnN0KToKKyAgICAg
ICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OndlYlBhZ2VXYXNBZGRlZCk6CisgICAgICAgIChX
ZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjp3ZWJQcm9jZXNzV2FzRGlzY29ubmVjdGVkKToKKwogMjAx
OS0wNy0wOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAg
ICBbaVBhZE9TXSBWaWV3cG9ydCBwb3BzIHdoaWxlIGxvYWRpbmcgc29odS5jb20sIHhpbmh1YW5l
dC5jb20sIGFuZCB2YXJpb3VzIG90aGVyIHdlYnNpdGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0
d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IGU4ZTE1Y2EwODdmYzgyMTA2NDQ3
MTZiYmRlZDYwMzMzNDcwZDg3ZjUuLjhlMmU0NTBmNDJlNDU5MWViYzFiOGFkODAxOWVhMDkxNWE1
MTYzNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By
b2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nl
c3MuY3BwCkBAIC01NjYsMTAgKzU2Niw4IEBAIE5ldHdvcmtTZXNzaW9uKiBOZXR3b3JrUHJvY2Vz
czo6bmV0d29ya1Nlc3Npb24oY29uc3QgUEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCkKIAogTmV0
d29ya1Nlc3Npb24qIE5ldHdvcmtQcm9jZXNzOjpuZXR3b3JrU2Vzc2lvbkJ5Q29ubmVjdGlvbihJ
UEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pIGNvbnN0CiB7Ci0gICAgaWYgKCFtX3Nlc3Npb25C
eUNvbm5lY3Rpb24uY29udGFpbnMoY29ubmVjdGlvbi51bmlxdWVJRCgpKSkKLSAgICAgICAgcmV0
dXJuIG51bGxwdHI7Ci0KLSAgICByZXR1cm4gbmV0d29ya1Nlc3Npb24obV9zZXNzaW9uQnlDb25u
ZWN0aW9uLmdldChjb25uZWN0aW9uLnVuaXF1ZUlEKCkpKTsKKyAgICBhdXRvIHNlc3Npb25JRCA9
IG1fc2Vzc2lvbkJ5Q29ubmVjdGlvbi5nZXQoY29ubmVjdGlvbi51bmlxdWVJRCgpKTsKKyAgICBy
ZXR1cm4gc2Vzc2lvbklELmlzVmFsaWQoKSA/IG5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCkgOiBu
dWxscHRyOwogfQogCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpzZXRTZXNzaW9uKGNvbnN0IFBBTDo6
U2Vzc2lvbklEJiBzZXNzaW9uSUQsIFJlZjxOZXR3b3JrU2Vzc2lvbj4mJiBzZXNzaW9uKQpAQCAt
MjY2OCwxMCArMjY2Niw4IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OndlYlBhZ2VXYXNBZGRlZChJ
UEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIFBBTDo6U2Vzc2lvbklECiAgICAgfQogICAgIGF1
dG8mIHN0b3JhZ2VNYW5hZ2VyID0gc2Vzc2lvbi0+c3RvcmFnZU1hbmFnZXIoKTsKIAotICAgIGF1
dG8gY29ubmVjdGlvbklEID0gY29ubmVjdGlvbi51bmlxdWVJRCgpOwotICAgIG1fc2Vzc2lvbkJ5
Q29ubmVjdGlvbi5lbnN1cmUoY29ubmVjdGlvbklELCBbJl0oKSB7Ci0gICAgICAgIHJldHVybiBz
ZXNzaW9uSUQ7Ci0gICAgfSk7CisgICAgYXV0byBhZGRSZXN1bHQgPSBtX3Nlc3Npb25CeUNvbm5l
Y3Rpb24uYWRkKGNvbm5lY3Rpb24udW5pcXVlSUQoKSwgc2Vzc2lvbklEKTsKKyAgICBBU1NFUlQo
YWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9PSBzZXNzaW9uSUQpOwogCiAgICAgc3RvcmFnZU1h
bmFnZXIuY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UocGFnZUlELnRvVUludDY0KCksIHN0
ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSk7CiAgICAgc3RvcmFnZU1hbmFnZXIu
YWRkQWxsb3dlZFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlQ29ubmVjdGlvbihwYWdlSUQudG9VSW50
NjQoKSwgY29ubmVjdGlvbik7CkBAIC0yNjk4LDExICsyNjk0LDEwIEBAIHZvaWQgTmV0d29ya1By
b2Nlc3M6OndlYlBhZ2VXYXNSZW1vdmVkKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgUEFM
OjpTZXNzaW9uCiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OndlYlByb2Nlc3NXYXNEaXNjb25uZWN0
ZWQoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogewotICAgIGF1dG8gY29ubmVjdGlvbklE
ID0gY29ubmVjdGlvbi51bmlxdWVJRCgpOwotICAgIGlmICghbV9zZXNzaW9uQnlDb25uZWN0aW9u
LmNvbnRhaW5zKGNvbm5lY3Rpb25JRCkpCisgICAgYXV0byBzZXNzaW9uSUQgPSBtX3Nlc3Npb25C
eUNvbm5lY3Rpb24udGFrZShjb25uZWN0aW9uLnVuaXF1ZUlEKCkpOworICAgIGlmICghc2Vzc2lv
bklELmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0byBzZXNzaW9uSUQgPSBt
X3Nlc3Npb25CeUNvbm5lY3Rpb24udGFrZShjb25uZWN0aW9uSUQpOwogICAgIGlmIChhdXRvKiBz
ZXNzaW9uID0gbmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKSkKICAgICAgICAgc2Vzc2lvbi0+c3Rv
cmFnZU1hbmFnZXIoKS5wcm9jZXNzRGlkQ2xvc2VDb25uZWN0aW9uKGNvbm5lY3Rpb24pOwogfQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373663</attachid>
            <date>2019-07-08 14:13:46 -0700</date>
            <delta_ts>2019-07-08 14:41:23 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-199586-20190708141345.patch</filename>
            <type>text/plain</type>
            <size>3154</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcxNjM4ZmE0ZDFhNGM4NDM4
M2Q0OTJmNjYzYmNlMTBmMTU0YjNiMjMuLjExNTQwOTkxNWU5YzFjM2M1N2MxN2U4OTY1MWUwZTk0
MmJjMzllMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDctMDggIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIHVzZXMgb2YgTmV0d29y
a1Byb2Nlczo6bV9zZXNzaW9uQnlDb25uZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk1ODYKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4
IENocmlzdGVuc2VuLgorCisgICAgICAgIEF2b2lkIGRvdWJsZSBIYXNoTWFwIGxvb2t1cHMgYW5k
IGNhbGwgYWRkKCkgaW5zdGVhZCBvZiBlbnN1cmUoKSB3aGVuIGFwcHJvcHJpYXRlLgorCisgICAg
ICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0
OjpOZXR3b3JrUHJvY2Vzczo6bmV0d29ya1Nlc3Npb25CeUNvbm5lY3Rpb24gY29uc3QpOgorICAg
ICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6d2ViUGFnZVdhc0FkZGVkKToKKyAgICAgICAg
KFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OndlYlByb2Nlc3NXYXNEaXNjb25uZWN0ZWQpOgorCiAy
MDE5LTA3LTA4ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAg
ICAgIFtpUGFkT1NdIFZpZXdwb3J0IHBvcHMgd2hpbGUgbG9hZGluZyBzb2h1LmNvbSwgeGluaHVh
bmV0LmNvbSwgYW5kIHZhcmlvdXMgb3RoZXIgd2Vic2l0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9O
ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXggZThlMTVjYTA4N2ZjODIxMDY0
NDcxNmJiZGVkNjAzMzM0NzBkODdmNS4uMzNlNjFkZjgzY2M4YjVkMDVhNzg2OGM2MjdkYjgyYmIx
NThiNzA5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr
UHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv
Y2Vzcy5jcHAKQEAgLTU2NiwxMCArNTY2LDggQEAgTmV0d29ya1Nlc3Npb24qIE5ldHdvcmtQcm9j
ZXNzOjpuZXR3b3JrU2Vzc2lvbihjb25zdCBQQUw6OlNlc3Npb25JRCYgc2Vzc2lvbklEKQogCiBO
ZXR3b3JrU2Vzc2lvbiogTmV0d29ya1Byb2Nlc3M6Om5ldHdvcmtTZXNzaW9uQnlDb25uZWN0aW9u
KElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgY29uc3QKIHsKLSAgICBpZiAoIW1fc2Vzc2lv
bkJ5Q29ubmVjdGlvbi5jb250YWlucyhjb25uZWN0aW9uLnVuaXF1ZUlEKCkpKQotICAgICAgICBy
ZXR1cm4gbnVsbHB0cjsKLQotICAgIHJldHVybiBuZXR3b3JrU2Vzc2lvbihtX3Nlc3Npb25CeUNv
bm5lY3Rpb24uZ2V0KGNvbm5lY3Rpb24udW5pcXVlSUQoKSkpOworICAgIGF1dG8gc2Vzc2lvbklE
ID0gbV9zZXNzaW9uQnlDb25uZWN0aW9uLmdldChjb25uZWN0aW9uLnVuaXF1ZUlEKCkpOworICAg
IHJldHVybiBzZXNzaW9uSUQuaXNWYWxpZCgpID8gbmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKSA6
IG51bGxwdHI7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnNldFNlc3Npb24oY29uc3QgUEFM
OjpTZXNzaW9uSUQmIHNlc3Npb25JRCwgUmVmPE5ldHdvcmtTZXNzaW9uPiYmIHNlc3Npb24pCkBA
IC0yNjY4LDEwICsyNjY2LDggQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6d2ViUGFnZVdhc0FkZGVk
KElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgUEFMOjpTZXNzaW9uSUQKICAgICB9CiAgICAg
YXV0byYgc3RvcmFnZU1hbmFnZXIgPSBzZXNzaW9uLT5zdG9yYWdlTWFuYWdlcigpOwogCi0gICAg
YXV0byBjb25uZWN0aW9uSUQgPSBjb25uZWN0aW9uLnVuaXF1ZUlEKCk7Ci0gICAgbV9zZXNzaW9u
QnlDb25uZWN0aW9uLmVuc3VyZShjb25uZWN0aW9uSUQsIFsmXSgpIHsKLSAgICAgICAgcmV0dXJu
IHNlc3Npb25JRDsKLSAgICB9KTsKKyAgICBhdXRvIGFkZFJlc3VsdCA9IG1fc2Vzc2lvbkJ5Q29u
bmVjdGlvbi5hZGQoY29ubmVjdGlvbi51bmlxdWVJRCgpLCBzZXNzaW9uSUQpOworICAgIEFTU0VS
VF9VTlVTRUQoYWRkUmVzdWx0LCBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlID09IHNlc3Npb25J
RCk7CiAKICAgICBzdG9yYWdlTWFuYWdlci5jcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZShw
YWdlSUQudG9VSW50NjQoKSwgc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKTsK
ICAgICBzdG9yYWdlTWFuYWdlci5hZGRBbGxvd2VkU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VDb25u
ZWN0aW9uKHBhZ2VJRC50b1VJbnQ2NCgpLCBjb25uZWN0aW9uKTsKQEAgLTI2OTgsMTEgKzI2OTQs
MTAgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6d2ViUGFnZVdhc1JlbW92ZWQoSVBDOjpDb25uZWN0
aW9uJiBjb25uZWN0aW9uLCBQQUw6OlNlc3Npb24KIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6d2Vi
UHJvY2Vzc1dhc0Rpc2Nvbm5lY3RlZChJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pCiB7Ci0g
ICAgYXV0byBjb25uZWN0aW9uSUQgPSBjb25uZWN0aW9uLnVuaXF1ZUlEKCk7Ci0gICAgaWYgKCFt
X3Nlc3Npb25CeUNvbm5lY3Rpb24uY29udGFpbnMoY29ubmVjdGlvbklEKSkKKyAgICBhdXRvIHNl
c3Npb25JRCA9IG1fc2Vzc2lvbkJ5Q29ubmVjdGlvbi50YWtlKGNvbm5lY3Rpb24udW5pcXVlSUQo
KSk7CisgICAgaWYgKCFzZXNzaW9uSUQuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAKLSAg
ICBhdXRvIHNlc3Npb25JRCA9IG1fc2Vzc2lvbkJ5Q29ubmVjdGlvbi50YWtlKGNvbm5lY3Rpb25J
RCk7CiAgICAgaWYgKGF1dG8qIHNlc3Npb24gPSBuZXR3b3JrU2Vzc2lvbihzZXNzaW9uSUQpKQog
ICAgICAgICBzZXNzaW9uLT5zdG9yYWdlTWFuYWdlcigpLnByb2Nlc3NEaWRDbG9zZUNvbm5lY3Rp
b24oY29ubmVjdGlvbik7CiB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373666</attachid>
            <date>2019-07-08 14:41:24 -0700</date>
            <delta_ts>2019-07-09 14:49:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-199586-20190708144124.patch</filename>
            <type>text/plain</type>
            <size>3155</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcxNjM4ZmE0ZDFhNGM4NDM4
M2Q0OTJmNjYzYmNlMTBmMTU0YjNiMjMuLjFmNGI2YzI0MzJlMDI4NDkxMWY3NTUyYWM3ODlhMDI4
ZTYxY2U0YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDctMDggIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIHVzZXMgb2YgTmV0d29y
a1Byb2Nlc3M6Om1fc2Vzc2lvbkJ5Q29ubmVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NTg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxl
eCBDaHJpc3RlbnNlbi4KKworICAgICAgICBBdm9pZCBkb3VibGUgSGFzaE1hcCBsb29rdXBzIGFu
ZCBjYWxsIGFkZCgpIGluc3RlYWQgb2YgZW5zdXJlKCkgd2hlbiBhcHByb3ByaWF0ZS4KKworICAg
ICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktp
dDo6TmV0d29ya1Byb2Nlc3M6Om5ldHdvcmtTZXNzaW9uQnlDb25uZWN0aW9uIGNvbnN0KToKKyAg
ICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OndlYlBhZ2VXYXNBZGRlZCk6CisgICAgICAg
IChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjp3ZWJQcm9jZXNzV2FzRGlzY29ubmVjdGVkKToKKwog
MjAxOS0wNy0wOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg
ICAgICBbaVBhZE9TXSBWaWV3cG9ydCBwb3BzIHdoaWxlIGxvYWRpbmcgc29odS5jb20sIHhpbmh1
YW5ldC5jb20sIGFuZCB2YXJpb3VzIG90aGVyIHdlYnNpdGVzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQv
TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IGU4ZTE1Y2EwODdmYzgyMTA2
NDQ3MTZiYmRlZDYwMzMzNDcwZDg3ZjUuLjMzZTYxZGY4M2NjOGI1ZDA1YTc4NjhjNjI3ZGI4MmJi
MTU4YjcwOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y
a1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By
b2Nlc3MuY3BwCkBAIC01NjYsMTAgKzU2Niw4IEBAIE5ldHdvcmtTZXNzaW9uKiBOZXR3b3JrUHJv
Y2Vzczo6bmV0d29ya1Nlc3Npb24oY29uc3QgUEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCkKIAog
TmV0d29ya1Nlc3Npb24qIE5ldHdvcmtQcm9jZXNzOjpuZXR3b3JrU2Vzc2lvbkJ5Q29ubmVjdGlv
bihJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pIGNvbnN0CiB7Ci0gICAgaWYgKCFtX3Nlc3Np
b25CeUNvbm5lY3Rpb24uY29udGFpbnMoY29ubmVjdGlvbi51bmlxdWVJRCgpKSkKLSAgICAgICAg
cmV0dXJuIG51bGxwdHI7Ci0KLSAgICByZXR1cm4gbmV0d29ya1Nlc3Npb24obV9zZXNzaW9uQnlD
b25uZWN0aW9uLmdldChjb25uZWN0aW9uLnVuaXF1ZUlEKCkpKTsKKyAgICBhdXRvIHNlc3Npb25J
RCA9IG1fc2Vzc2lvbkJ5Q29ubmVjdGlvbi5nZXQoY29ubmVjdGlvbi51bmlxdWVJRCgpKTsKKyAg
ICByZXR1cm4gc2Vzc2lvbklELmlzVmFsaWQoKSA/IG5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCkg
OiBudWxscHRyOwogfQogCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpzZXRTZXNzaW9uKGNvbnN0IFBB
TDo6U2Vzc2lvbklEJiBzZXNzaW9uSUQsIFJlZjxOZXR3b3JrU2Vzc2lvbj4mJiBzZXNzaW9uKQpA
QCAtMjY2OCwxMCArMjY2Niw4IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OndlYlBhZ2VXYXNBZGRl
ZChJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIFBBTDo6U2Vzc2lvbklECiAgICAgfQogICAg
IGF1dG8mIHN0b3JhZ2VNYW5hZ2VyID0gc2Vzc2lvbi0+c3RvcmFnZU1hbmFnZXIoKTsKIAotICAg
IGF1dG8gY29ubmVjdGlvbklEID0gY29ubmVjdGlvbi51bmlxdWVJRCgpOwotICAgIG1fc2Vzc2lv
bkJ5Q29ubmVjdGlvbi5lbnN1cmUoY29ubmVjdGlvbklELCBbJl0oKSB7Ci0gICAgICAgIHJldHVy
biBzZXNzaW9uSUQ7Ci0gICAgfSk7CisgICAgYXV0byBhZGRSZXN1bHQgPSBtX3Nlc3Npb25CeUNv
bm5lY3Rpb24uYWRkKGNvbm5lY3Rpb24udW5pcXVlSUQoKSwgc2Vzc2lvbklEKTsKKyAgICBBU1NF
UlRfVU5VU0VEKGFkZFJlc3VsdCwgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9PSBzZXNzaW9u
SUQpOwogCiAgICAgc3RvcmFnZU1hbmFnZXIuY3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2Uo
cGFnZUlELnRvVUludDY0KCksIHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSk7
CiAgICAgc3RvcmFnZU1hbmFnZXIuYWRkQWxsb3dlZFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlQ29u
bmVjdGlvbihwYWdlSUQudG9VSW50NjQoKSwgY29ubmVjdGlvbik7CkBAIC0yNjk4LDExICsyNjk0
LDEwIEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OndlYlBhZ2VXYXNSZW1vdmVkKElQQzo6Q29ubmVj
dGlvbiYgY29ubmVjdGlvbiwgUEFMOjpTZXNzaW9uCiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6Ondl
YlByb2Nlc3NXYXNEaXNjb25uZWN0ZWQoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKQogewot
ICAgIGF1dG8gY29ubmVjdGlvbklEID0gY29ubmVjdGlvbi51bmlxdWVJRCgpOwotICAgIGlmICgh
bV9zZXNzaW9uQnlDb25uZWN0aW9uLmNvbnRhaW5zKGNvbm5lY3Rpb25JRCkpCisgICAgYXV0byBz
ZXNzaW9uSUQgPSBtX3Nlc3Npb25CeUNvbm5lY3Rpb24udGFrZShjb25uZWN0aW9uLnVuaXF1ZUlE
KCkpOworICAgIGlmICghc2Vzc2lvbklELmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0g
ICAgYXV0byBzZXNzaW9uSUQgPSBtX3Nlc3Npb25CeUNvbm5lY3Rpb24udGFrZShjb25uZWN0aW9u
SUQpOwogICAgIGlmIChhdXRvKiBzZXNzaW9uID0gbmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKSkK
ICAgICAgICAgc2Vzc2lvbi0+c3RvcmFnZU1hbmFnZXIoKS5wcm9jZXNzRGlkQ2xvc2VDb25uZWN0
aW9uKGNvbm5lY3Rpb24pOwogfQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>373770</attachid>
            <date>2019-07-09 14:49:02 -0700</date>
            <delta_ts>2019-07-09 15:40:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-199586-20190709144901.patch</filename>
            <type>text/plain</type>
            <size>5794</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3Mjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkYmE3OTRiZjIxNThmZmEy
OTNmMGJlODhmMTI5MzNjODA2OTc5MzUuLjM3NDhmMDJhZjQzNWE2Y2Y4YTM5MWE1YzcwYjI2ZDlj
MTgzYzYyNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDctMDkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIHVzZXMgb2YgTmV0d29y
a1Byb2Nlc3M6Om1fc2Vzc2lvbkJ5Q29ubmVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NTg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxl
eCBDaHJpc3RlbnNlbi4KKworICAgICAgICBBdm9pZCBkb3VibGUgSGFzaE1hcCBsb29rdXBzIGFu
ZCBjYWxsIGFkZCgpIGluc3RlYWQgb2YgZW5zdXJlKCkgd2hlbiBhcHByb3ByaWF0ZS4KKworICAg
ICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktp
dDo6TmV0d29ya1Byb2Nlc3M6Om5ldHdvcmtTZXNzaW9uQnlDb25uZWN0aW9uIGNvbnN0KToKKyAg
ICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OndlYlBhZ2VXYXNBZGRlZCk6CisgICAgICAg
IChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjp3ZWJQcm9jZXNzV2FzRGlzY29ubmVjdGVkKToKKwog
MjAxOS0wNy0wOSAgVHJ1aXR0IFNhdmVsbCAgPHRzYXZlbGxAYXBwbGUuY29tPgogCiAgICAgICAg
IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDcyMzAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9wYWdlL1BhZ2VHcm91cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5j
cHAKaW5kZXggMWQwOWFkOWI3NjZjMjY0MzBiNTI2Mzc5NmY2Y2FhYWY2YzY3ZGNlMC4uOTE5MzYw
NDVjMmZhZjc2Y2FjNWUyYzY5ZTYyMzNmMmNlMzBiZjliMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdy
b3VwLmNwcApAQCAtOTMsNiArOTMsOSBAQCB2b2lkIFBhZ2VHcm91cDo6YWRkUGFnZShQYWdlJiBw
YWdlKQogewogICAgIEFTU0VSVCghbV9wYWdlcy5jb250YWlucygmcGFnZSkpOwogICAgIG1fcGFn
ZXMuYWRkKCZwYWdlKTsKKyAgICAKKyAgICBpZiAobV9pc0xlZ2FjeVByaXZhdGVCcm93c2luZ0Vu
YWJsZWRGb3JUZXN0aW5nKQorICAgICAgICBwYWdlLmVuYWJsZUxlZ2FjeVByaXZhdGVCcm93c2lu
Zyh0cnVlKTsKIH0KIAogdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVBhZ2UoUGFnZSYgcGFnZSkKQEAg
LTEyMyw0ICsxMjYsMTUgQEAgQ2FwdGlvblVzZXJQcmVmZXJlbmNlcyYgUGFnZUdyb3VwOjpjYXB0
aW9uUHJlZmVyZW5jZXMoKQogfQogI2VuZGlmCiAKK3ZvaWQgUGFnZUdyb3VwOjplbmFibGVMZWdh
Y3lQcml2YXRlQnJvd3NpbmdGb3JUZXN0aW5nKGJvb2wgZW5hYmxlZCkKK3sKKyAgICBpZiAobV9p
c0xlZ2FjeVByaXZhdGVCcm93c2luZ0VuYWJsZWRGb3JUZXN0aW5nID09IGVuYWJsZWQpCisgICAg
ICAgIHJldHVybjsKKworICAgIG1faXNMZWdhY3lQcml2YXRlQnJvd3NpbmdFbmFibGVkRm9yVGVz
dGluZyA9IGVuYWJsZWQ7CisgICAgCisgICAgZm9yIChhdXRvKiBwYWdlIDogbV9wYWdlcykKKyAg
ICAgICAgcGFnZS0+ZW5hYmxlTGVnYWN5UHJpdmF0ZUJyb3dzaW5nKGVuYWJsZWQpOworfQorCiB9
IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh
Z2VHcm91cC5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuaAppbmRleCA4OGM2NTg3
YTFiYTdlNGYxNGVlOTNiMDBkZmEyZDc2ZDc1OGVkNzU2Li42YmFmMGExYWIxM2M5ZTJmMmVmNTJm
MmMxZTQwMWYzMjUwY2ZiMDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VH
cm91cC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmgKQEAgLTU4LDYgKzU4
LDggQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIENhcHRpb25Vc2VyUHJlZmVyZW5jZXMm
IGNhcHRpb25QcmVmZXJlbmNlcygpOwogI2VuZGlmCiAKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lk
IGVuYWJsZUxlZ2FjeVByaXZhdGVCcm93c2luZ0ZvclRlc3RpbmcoYm9vbCk7CisKIHByaXZhdGU6
CiAgICAgU3RyaW5nIG1fbmFtZTsKICAgICBIYXNoU2V0PFBhZ2UqPiBtX3BhZ2VzOwpAQCAtNjcs
NiArNjksOCBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShWSURFT19UUkFDSykKICAgICBzdGQ6OnVu
aXF1ZV9wdHI8Q2FwdGlvblVzZXJQcmVmZXJlbmNlcz4gbV9jYXB0aW9uUHJlZmVyZW5jZXM7CiAj
ZW5kaWYKKworICAgIGJvb2wgbV9pc0xlZ2FjeVByaXZhdGVCcm93c2luZ0VuYWJsZWRGb3JUZXN0
aW5nIHsgZmFsc2UgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwIGIvU291cmNl
L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXggZjhiYjc2Nzhl
ZTM4Njg0YjIyOTRkMTg0MDk5MTUwMjhlNDM3OWRhMC4uZWY5ZTBjOWNkMzI2ZTFlYzM0MjZhNjNj
MGRkY2Q1Y2NhYTViY2M5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz
cy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O
ZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTU3MiwxMCArNTcyLDggQEAgTmV0d29ya1Nlc3Npb24qIE5l
dHdvcmtQcm9jZXNzOjpuZXR3b3JrU2Vzc2lvbihjb25zdCBQQUw6OlNlc3Npb25JRCYgc2Vzc2lv
bklEKQogCiBOZXR3b3JrU2Vzc2lvbiogTmV0d29ya1Byb2Nlc3M6Om5ldHdvcmtTZXNzaW9uQnlD
b25uZWN0aW9uKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgY29uc3QKIHsKLSAgICBpZiAo
IW1fc2Vzc2lvbkJ5Q29ubmVjdGlvbi5jb250YWlucyhjb25uZWN0aW9uLnVuaXF1ZUlEKCkpKQot
ICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQotICAgIHJldHVybiBuZXR3b3JrU2Vzc2lvbihtX3Nl
c3Npb25CeUNvbm5lY3Rpb24uZ2V0KGNvbm5lY3Rpb24udW5pcXVlSUQoKSkpOworICAgIGF1dG8g
c2Vzc2lvbklEID0gbV9zZXNzaW9uQnlDb25uZWN0aW9uLmdldChjb25uZWN0aW9uLnVuaXF1ZUlE
KCkpOworICAgIHJldHVybiBzZXNzaW9uSUQuaXNWYWxpZCgpID8gbmV0d29ya1Nlc3Npb24oc2Vz
c2lvbklEKSA6IG51bGxwdHI7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnNldFNlc3Npb24o
Y29uc3QgUEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCwgUmVmPE5ldHdvcmtTZXNzaW9uPiYmIHNl
c3Npb24pCkBAIC0yNjczLDEwICsyNjcxLDggQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6d2ViUGFn
ZVdhc0FkZGVkKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgUEFMOjpTZXNzaW9uSUQKICAg
ICB9CiAgICAgYXV0byYgc3RvcmFnZU1hbmFnZXIgPSBzZXNzaW9uLT5zdG9yYWdlTWFuYWdlcigp
OwogCi0gICAgYXV0byBjb25uZWN0aW9uSUQgPSBjb25uZWN0aW9uLnVuaXF1ZUlEKCk7Ci0gICAg
bV9zZXNzaW9uQnlDb25uZWN0aW9uLmVuc3VyZShjb25uZWN0aW9uSUQsIFsmXSgpIHsKLSAgICAg
ICAgcmV0dXJuIHNlc3Npb25JRDsKLSAgICB9KTsKKyAgICBhdXRvIGFkZFJlc3VsdCA9IG1fc2Vz
c2lvbkJ5Q29ubmVjdGlvbi5hZGQoY29ubmVjdGlvbi51bmlxdWVJRCgpLCBzZXNzaW9uSUQpOwor
ICAgIEFTU0VSVF9VTlVTRUQoYWRkUmVzdWx0LCBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlID09
IHNlc3Npb25JRCk7CiAKICAgICBzdG9yYWdlTWFuYWdlci5jcmVhdGVTZXNzaW9uU3RvcmFnZU5h
bWVzcGFjZShwYWdlSUQudG9VSW50NjQoKSwgc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46
Om1heCgpKTsKICAgICBzdG9yYWdlTWFuYWdlci5hZGRBbGxvd2VkU2Vzc2lvblN0b3JhZ2VOYW1l
c3BhY2VDb25uZWN0aW9uKHBhZ2VJRC50b1VJbnQ2NCgpLCBjb25uZWN0aW9uKTsKQEAgLTI3MDMs
MTEgKzI2OTksMTAgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6d2ViUGFnZVdhc1JlbW92ZWQoSVBD
OjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBQQUw6OlNlc3Npb24KIAogdm9pZCBOZXR3b3JrUHJv
Y2Vzczo6d2ViUHJvY2Vzc1dhc0Rpc2Nvbm5lY3RlZChJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rp
b24pCiB7Ci0gICAgYXV0byBjb25uZWN0aW9uSUQgPSBjb25uZWN0aW9uLnVuaXF1ZUlEKCk7Ci0g
ICAgaWYgKCFtX3Nlc3Npb25CeUNvbm5lY3Rpb24uY29udGFpbnMoY29ubmVjdGlvbklEKSkKKyAg
ICBhdXRvIHNlc3Npb25JRCA9IG1fc2Vzc2lvbkJ5Q29ubmVjdGlvbi50YWtlKGNvbm5lY3Rpb24u
dW5pcXVlSUQoKSk7CisgICAgaWYgKCFzZXNzaW9uSUQuaXNWYWxpZCgpKQogICAgICAgICByZXR1
cm47CiAKLSAgICBhdXRvIHNlc3Npb25JRCA9IG1fc2Vzc2lvbkJ5Q29ubmVjdGlvbi50YWtlKGNv
bm5lY3Rpb25JRCk7CiAgICAgaWYgKGF1dG8qIHNlc3Npb24gPSBuZXR3b3JrU2Vzc2lvbihzZXNz
aW9uSUQpKQogICAgICAgICBzZXNzaW9uLT5zdG9yYWdlTWFuYWdlcigpLnByb2Nlc3NEaWRDbG9z
ZUNvbm5lY3Rpb24oY29ubmVjdGlvbik7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwIGIvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAppbmRleCBjMGFk
YmIxNmE4NGZiY2I1OGE0YWY1Mzk3NmE1ZGZkOTg4ZmZkZTZjLi4yMGNlNTU5MTFkNzA2NTFjMzM1
YTcwYWNmMjRlNWJkZmMyMWJkNjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAKQEAgLTM1MCw5ICsz
NTAsNyBAQCB2b2lkIEluamVjdGVkQnVuZGxlOjpzZXRQcml2YXRlQnJvd3NpbmdFbmFibGVkKFdl
YlBhZ2VHcm91cFByb3h5KiBwYWdlR3JvdXAsIGJvbwogICAgIEFTU0VSVCghaGFzUHJvY2Vzc1By
aXZpbGVnZShQcm9jZXNzUHJpdmlsZWdlOjpDYW5BY2Nlc3NSYXdDb29raWVzKSk7CiAgICAgV2Vi
UHJvY2Vzczo6c2luZ2xldG9uKCkuZW5hYmxlUHJpdmF0ZUJyb3dzaW5nRm9yVGVzdGluZyhlbmFi
bGVkKTsKIAotICAgIGNvbnN0IEhhc2hTZXQ8UGFnZSo+JiBwYWdlcyA9IFBhZ2VHcm91cDo6cGFn
ZUdyb3VwKHBhZ2VHcm91cC0+aWRlbnRpZmllcigpKS0+cGFnZXMoKTsKLSAgICBmb3IgKEhhc2hT
ZXQ8UGFnZSo+OjppdGVyYXRvciBpdGVyID0gcGFnZXMuYmVnaW4oKTsgaXRlciAhPSBwYWdlcy5l
bmQoKTsgKytpdGVyKQotICAgICAgICAoKml0ZXIpLT5lbmFibGVMZWdhY3lQcml2YXRlQnJvd3Np
bmcoZW5hYmxlZCk7CisgICAgUGFnZUdyb3VwOjpwYWdlR3JvdXAocGFnZUdyb3VwLT5pZGVudGlm
aWVyKCkpLT5lbmFibGVMZWdhY3lQcml2YXRlQnJvd3NpbmdGb3JUZXN0aW5nKGVuYWJsZWQpOwog
fQogCiB2b2lkIEluamVjdGVkQnVuZGxlOjpzZXRQb3B1cEJsb2NraW5nRW5hYmxlZChXZWJQYWdl
R3JvdXBQcm94eSogcGFnZUdyb3VwLCBib29sIGVuYWJsZWQpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>