<?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>62971</bug_id>
          
          <creation_ts>2011-06-20 02:33:57 -0700</creation_ts>
          <short_desc>view-source doesn&apos;t colorize &lt;/script&gt; correctly</short_desc>
          <delta_ts>2012-01-12 03:43:42 -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>DOM</component>
          <version>528+ (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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="WebKit Review Bot">webkit.review.bot</reporter>
          <assigned_to name="Adam Barth">abarth</assigned_to>
          <cc>abarth</cc>
    
    <cc>ap</cc>
    
    <cc>eric</cc>
    
    <cc>mathias</cc>
    
    <cc>tsepez</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>423566</commentid>
    <comment_count>0</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-06-20 02:33:57 -0700</bug_when>
    <thetext>view-source doesn&apos;t colorize &lt;/script&gt; correctly
Requested by abarth on #webkit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>423692</commentid>
    <comment_count>1</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2011-06-20 09:03:14 -0700</bug_when>
    <thetext>See bug 61774 for more information (which should have been in this bug, but using the bot precludes one from filing good bugs).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>423730</commentid>
    <comment_count>2</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-06-20 10:10:22 -0700</bug_when>
    <thetext>I&apos;m actually surprised there isn&apos;t another bug to dupe this one against.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>483585</commentid>
    <comment_count>3</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-10-13 15:51:58 -0700</bug_when>
    <thetext>This bug is worth fixing, but it&apos;s non-trivial.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>527481</commentid>
    <comment_count>4</comment_count>
      <attachid>120621</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-12-27 15:19:19 -0800</bug_when>
    <thetext>Created attachment 120621
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>527482</commentid>
    <comment_count>5</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-12-27 15:22:33 -0800</bug_when>
    <thetext>Note: Once we fix this bug, we should try adding these ASSERTs back:
http://trac.webkit.org/changeset/89258/trunk/Source/WebCore/html/parser/HTMLToken.h</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>528995</commentid>
    <comment_count>6</comment_count>
      <attachid>120621</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2012-01-03 13:20:15 -0800</bug_when>
    <thetext>Comment on attachment 120621
Patch

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

LGTM if the perf is OK.

&gt; Source/WebCore/ChangeLog:35
&gt; +            previous segment of source.  We copy them into our accumulation
&gt; +            buffer and adjust the token base offset to account for the extra
&gt; +            characters.

Did you perf test this change?  Could you please mention the effect (if any) in the ChangeLog?

&gt; Source/WebCore/ChangeLog:56
&gt; +          - Previously, we cleared the temporary buffer lazily when we needed
&gt; +            to add new characters to it.  Now we clear it eagerly so that it&apos;s
&gt; +            length tells us whether we&apos;re currently using it to store
&gt; +            characters.

Moar perf fear.

&gt; Source/WebCore/html/parser/HTMLTokenizer.cpp:168
&gt; +    m_temporaryBuffer.clear();

Is temporary buffer a spec name?  Seems we could give htis a more descriptive name about what it contains or how it&apos;s used...

&gt; Source/WebCore/html/parser/HTMLTokenizer.cpp:1590
&gt; +    characters.append(&apos;&lt;&apos;);
&gt; +    characters.append(&apos;/&apos;);

Can we assert that we&apos;re in the &quot;waiting for end tag state&quot;?  Seems this should at least have a comment that the only time we buffer characters is when searching for an end tag.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>529116</commentid>
    <comment_count>7</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2012-01-03 15:49:22 -0800</bug_when>
    <thetext>I&apos;ve re-tested the perf and there&apos;s no measurable difference.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>529121</commentid>
    <comment_count>8</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2012-01-03 15:53:12 -0800</bug_when>
    <thetext>(In reply to comment #6)
&gt; (From update of attachment 120621 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=120621&amp;action=review
&gt;
&gt; &gt; Source/WebCore/ChangeLog:56
&gt; &gt; +          - Previously, we cleared the temporary buffer lazily when we needed
&gt; &gt; +            to add new characters to it.  Now we clear it eagerly so that it&apos;s
&gt; &gt; +            length tells us whether we&apos;re currently using it to store
&gt; &gt; +            characters.
&gt; 
&gt; Moar perf fear.

Yes.  That was from before we had the benchmark.  :)

&gt; &gt; Source/WebCore/html/parser/HTMLTokenizer.cpp:168
&gt; &gt; +    m_temporaryBuffer.clear();
&gt; 
&gt; Is temporary buffer a spec name?  Seems we could give htis a more descriptive name about what it contains or how it&apos;s used...

It&apos;s a name from the spec:

http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#temporary-buffer

We don&apos;t need to use the spec name if something else would be clearer.

&gt; &gt; Source/WebCore/html/parser/HTMLTokenizer.cpp:1590
&gt; &gt; +    characters.append(&apos;&lt;&apos;);
&gt; &gt; +    characters.append(&apos;/&apos;);
&gt; 
&gt; Can we assert that we&apos;re in the &quot;waiting for end tag state&quot;?  Seems this should at least have a comment that the only time we buffer characters is when searching for an end tag.

I&apos;ve added a FIXME about adding this ASSERT.  I need to study this more closely to get the full list of states in which we use the temporary buffer.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>529125</commentid>
    <comment_count>9</comment_count>
      <attachid>121013</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2012-01-03 15:55:38 -0800</bug_when>
    <thetext>Created attachment 121013
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>529238</commentid>
    <comment_count>10</comment_count>
      <attachid>121013</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-01-03 18:42:14 -0800</bug_when>
    <thetext>Comment on attachment 121013
Patch for landing

Clearing flags on attachment: 121013

Committed r103999: &lt;http://trac.webkit.org/changeset/103999&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>529239</commentid>
    <comment_count>11</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2012-01-03 18:42:19 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>120621</attachid>
            <date>2011-12-27 15:19:19 -0800</date>
            <delta_ts>2012-01-03 15:55:31 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62971-20111227151914.patch</filename>
            <type>text/plain</type>
            <size>20643</size>
            <attacher name="Adam Barth">abarth</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzcyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDc4IEBACisyMDExLTEyLTI3ICBBZGFtIEJh
cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgdmlldy1zb3VyY2UgZG9lc24ndCBj
b2xvcml6ZSA8L3NjcmlwdD4gY29ycmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD02Mjk3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSByZWFzb24gdGhlc2UgdGFncyB3ZXJlbid0IGNvbG9yaXpl
ZCBjb3JyZWN0bHkgd2FzIGJlY2F1c2UgdGhlCisgICAgICAgIGNoYXJhY3RlcnMgZm9yIHRoZSBl
bmQgdGFncyB3aGVyZSBjb25zdW1lZCBieSB0aGUgdG9rZW5pemVyIGF0IHRoZSBzYW1lCisgICAg
ICAgIHRpbWUgYXMgaXQgY29uc3VtZWQgdGhlIHRleHQgb2YgdGhlIHNjcmlwdCB0YWcuICBUaGVz
ZSBjaGFyYWN0ZXJzIGFyZQorICAgICAgICBidWZmZXJlZCBpbnRlcm5hbGx5IGJ5IHRoZSB0b2tl
bml6ZXIgYmVjYXVzZSB0aGUgdG9rZW5pemVyIGlzIHNlYXJjaGluZworICAgICAgICBmb3IgImFu
IGFwcHJvcHJpYXRlIGVuZCB0YWciLCB3aGljaCBpcyAiPC9zY3JpcHQ+IiBpbiB0aGlzIGNhc2Uu
CisKKyAgICAgICAgSSB0cmllZCBhIG51bWJlciBvZiBkaWZmZXJlbnQgYXBwcm9hY2hlcyB0byBm
aXhpbmcgdGhpcyBidWcuICBUaGUKKyAgICAgICAgYXBwcm9hY2ggaW4gdGhpcyBwYXRjaCBhZGRz
IGFuIGFjY2Vzc29yIHRvIHRoZSB0b2tlbml6ZXIgdG8gcmVhZCBvdXQKKyAgICAgICAgdGhlIGJ1
ZmZlcmVkIGNoYXJhY3RlcnMuICBUaGlzIGFwcHJvYWNoIG1ha2VzIGl0IGVhc2llciBmb3IgdGhl
CisgICAgICAgIEhUTUxTb3VyY2VUcmFja2VyIHRvIGdldCBleGFjdGx5IHRoZSByaWdodCB2YWx1
ZSBmb3IgdGhlc2UgYnVmZmVyZWQKKyAgICAgICAgY2hhcmFjdGVycyB3aXRob3V0IGhhdmluZyB0
byBkbyBhIGNvbXBsaWNhdGVkIHNpbXVsYXRpb24gb2YgdGhlCisgICAgICAgIGJ1ZmZlcmluZyBp
dHNlbGYuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtcGxhaW4tdGV4
dC10YWdzLmh0bWw6CisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVmlld1NvdXJjZVBhcnNl
ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJjZVBhcnNlcjo6cHVtcFRva2Vu
aXplcik6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcik6CisgICAg
ICAgICAgLSBHaXZlIHRoZSBIVE1MU291cmNlVHJhY2tlciBhIHBvaW50ZXIgdG8gdGhlIHRva2Vu
aXplciBzbyBpdCBjYW4gYXNrCisgICAgICAgICAgICBmb3IgdGhlIGJ1ZmZlcmVkIGNoYXJhY3Rl
cnMuCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFNvdXJjZVRyYWNrZXIuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6SFRNTFNvdXJjZVRyYWNrZXI6OnN0YXJ0KToKKyAgICAgICAgICAtIFRoZSBp
ZGVhIGhlcmUgaXMgdG8gdHJlYXQgY2hhcmFjdGVycyBidWZmZXJlZCBpbnRlcm5hbGx5IGJ5IHRo
ZQorICAgICAgICAgICAgdG9rZW5pemVyIHRoZSBzYW1lIHdheSB3ZSB0cmVhdCBjaGFyYWN0ZXJz
IHRoYXQgd2VyZSBjb250YWluZWQgaW4gYQorICAgICAgICAgICAgcHJldmlvdXMgc2VnbWVudCBv
ZiBzb3VyY2UuICBXZSBjb3B5IHRoZW0gaW50byBvdXIgYWNjdW11bGF0aW9uCisgICAgICAgICAg
ICBidWZmZXIgYW5kIGFkanVzdCB0aGUgdG9rZW4gYmFzZSBvZmZzZXQgdG8gYWNjb3VudCBmb3Ig
dGhlIGV4dHJhCisgICAgICAgICAgICBjaGFyYWN0ZXJzLgorICAgICAgICAoV2ViQ29yZTo6SFRN
TFNvdXJjZVRyYWNrZXI6OmVuZCk6CisgICAgICAgICAgLSBEb24ndCBjb25zaWVyIHRoZSBjaGFy
YWN0ZXIgYnVmZmVyZWQgYnkgdGhlIHRva2VuaXplciB0byBiZSBwYXJ0IG9mCisgICAgICAgICAg
ICB0aGUgdG9rZW4gd2UndmUganVzdCBmaW5pc2hlZC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxT
b3VyY2VUcmFja2VyOjpzb3VyY2VGb3JUb2tlbik6CisgICAgICAgICAgLSBSZW1vdmUgdGhlIGFz
c3VtcHRpb24gdGhhdCBhbGwgb2YgdGhlIG1fcHJldmlvdXNTb3VyY2UgaXMgY29udGFpbmVkCisg
ICAgICAgICAgICBpbiB0aGUgc291cmNlIGZvciB0aGUgY3VycmVudCB0b2tlbi4gIEJlY2F1c2Ug
d2Ugbm93IHVuZGVyc3RhbmQKKyAgICAgICAgICAgIHRoYXQgdGhlIHRva2VuaXplciBjYW4gYnVm
ZmVyIHNvbWUgY2hhcmFjdGVycyBpbnRlcm5hbGx5LCB3ZSBtaWdodAorICAgICAgICAgICAgbm90
IGV4aGF1c3QgdGhlIG1fcHJldmlvdXNTb3VyY2UuCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRN
TFNvdXJjZVRyYWNrZXIuaDoKKyAgICAgICAgICAtIFJlbmFtZSBtX3NvdXJjZUZyb21QcmV2aW91
c1NlZ21lbnRzIHRvIG1fcHJldmlvdXNTb3VyY2UgYW5kIGNoYW5nZWQKKyAgICAgICAgICAgIHRv
IGEgU2VnZW1lbnRlZFN0cmluZyB0byBhdm9pZCBleHRyYSBtYWxsb2NzIHdlIGtlZXAgYXBwZW5k
aW5nIHRpbnkKKyAgICAgICAgICAgIHNlZ21lbnRzLgorICAgICAgICAgIC0gUmVuYW1lIG1fc291
cmNlIHRvIG1fY3VycmVudFNvdXJjZSB0byBjb250cmFzdCBuaWNlbHkgd2l0aAorICAgICAgICAg
ICAgbV9wcmV2aW91c1NvdXJjZS4KKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVG9rZW5pemVy
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6OmZsdXNoQnVmZmVyZWRFbmRU
YWcpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRva2VuaXplcjo6bmV4dFRva2VuKToKKyAgICAg
ICAgICAtIFByZXZpb3VzbHksIHdlIGNsZWFyZWQgdGhlIHRlbXBvcmFyeSBidWZmZXIgbGF6aWx5
IHdoZW4gd2UgbmVlZGVkCisgICAgICAgICAgICB0byBhZGQgbmV3IGNoYXJhY3RlcnMgdG8gaXQu
ICBOb3cgd2UgY2xlYXIgaXQgZWFnZXJseSBzbyB0aGF0IGl0J3MKKyAgICAgICAgICAgIGxlbmd0
aCB0ZWxscyB1cyB3aGV0aGVyIHdlJ3JlIGN1cnJlbnRseSB1c2luZyBpdCB0byBzdG9yZQorICAg
ICAgICAgICAgY2hhcmFjdGVycy4KKyAgICAgICAgICAtIFByZXZpb3VzbHksIHdlIHdlcmVuJ3Qg
c3RvcmluZyB0aGUgY2hhcmFjdGVyIHRoYXQgd2UgdXNlZCB0bworICAgICAgICAgICAgdGVybWlu
YXRlIHRoZSBhcHByb3ByaWF0ZSBlbmQgdGFnIChlLmcuLCB0aGUgPiBpbiA8L3NjcmlwdD4pCisg
ICAgICAgICAgICBiZWNhdXNlIHdlIGRpZG4ndCBuZWVkIHRvICJ1bmJ1ZmZlciIgdGhhdCBjaGFy
YWN0ZXIgaW50byB0aGUKKyAgICAgICAgICAgIEhUTUxUb2tlbjo6YXBwZW5kVG9DaGFyYWN0ZXIu
ICBOb3csIHdlIGRvIHN0b3JlIHRoYXQgY2hhcmFjdGVyIGluCisgICAgICAgICAgICB0aGUgdGVt
cG9yYXJ5IGJ1ZmZlciBzbyB0aGF0IHRoZSBIVE1MU291cmNlVHJhY2tlciBjYW4gc2VlIHRoYXQK
KyAgICAgICAgICAgIGNoYXJhY3Rlci4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6
OmJ1ZmZlcmVkQ2hhcmFjdGVycyk6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFRva2VuaXpl
ci5oOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRva2VuaXplcjo6bnVtYmVyT2ZCdWZmZXJlZENo
YXJhY3RlcnMpOgorICAgICAgICAgIC0gQWRkIGFjY2Vzc29yIG1ldGhvZHMgdG8gY29weSBvdXQg
dGhlIGJ1ZmZlcmVkIGNoYXJhY3RlcnMuCisgICAgICAgICAgLSBBbHNvLCB1bnJlbGF0ZWQgdG8g
dGhlIHJlc3Qgb2YgdGhpcyBwYXRjaCwgSSBtYWRlIHRoZSBjb25zdHJ1Y3RvcgorICAgICAgICAg
ICAgZm9yIEhUTUxUb2tlbml6ZXIgZXhwbGljaXQgYmVjYXVzZSBpdCB0YWtlcyBvbmx5IGEgc2lu
Z2xlCisgICAgICAgICAgICBwYXJhbWF0ZXIsIHBlciB0aGUgc3R5bGUgZ3VpZGUuCisgICAgICAg
ICogcGxhdGZvcm0vdGV4dC9TZWdtZW50ZWRTdHJpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
U2VnbWVudGVkU3RyaW5nOjpjbGVhcik6CisgICAgICAgICAgLSBTZWdtZW50ZWRTdHJpbmc6OmNs
ZWFyIHdhc24ndCBjbGVhcmluZyBhbGwgb2YgaXRzIHN0YXRlLiAgSSBkb24ndAorICAgICAgICAg
ICAgdGhpbmsgdGhpcyBpc3N1ZSB3YXMgYWN0dWFsbHkgb2JzZXJ2YWJsZSwgYnV0IEkgbm90aWNl
ZCBpdCB3aGVuCisgICAgICAgICAgICB3b3JraW5nIG9uIHRoaXMgcGF0Y2gsIHNvIEkgZml4ZWQg
aXQuCisKIDIwMTEtMTItMjcgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgog
CiAgICAgICAgIFdJUDogRW5hYmxlIHRoZSBbU3VwcGxlbWVudGFsXSBJREwgb24gR3RrCkluZGV4
OiBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5j
cHAJKHJldmlzaW9uIDEwMzcxMykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxE
b2N1bWVudFBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2MiwxMyArMjYyLDEzIEBAIHZv
aWQgSFRNTERvY3VtZW50UGFyc2VyOjpwdW1wVG9rZW5pemVyKFMKIAogICAgIHdoaWxlIChjYW5U
YWtlTmV4dFRva2VuKG1vZGUsIHNlc3Npb24pICYmICFzZXNzaW9uLm5lZWRzWWllbGQpIHsKICAg
ICAgICAgaWYgKCFpc1BhcnNpbmdGcmFnbWVudCgpKQotICAgICAgICAgICAgbV9zb3VyY2VUcmFj
a2VyLnN0YXJ0KG1faW5wdXQsIG1fdG9rZW4pOworICAgICAgICAgICAgbV9zb3VyY2VUcmFja2Vy
LnN0YXJ0KG1faW5wdXQsIG1fdG9rZW5pemVyLmdldCgpLCBtX3Rva2VuKTsKIAogICAgICAgICBp
ZiAoIW1fdG9rZW5pemVyLT5uZXh0VG9rZW4obV9pbnB1dC5jdXJyZW50KCksIG1fdG9rZW4pKQog
ICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgaWYgKCFpc1BhcnNpbmdGcmFnbWVudCgpKSB7
Ci0gICAgICAgICAgICBtX3NvdXJjZVRyYWNrZXIuZW5kKG1faW5wdXQsIG1fdG9rZW4pOworICAg
ICAgICAgICAgbV9zb3VyY2VUcmFja2VyLmVuZChtX2lucHV0LCBtX3Rva2VuaXplci5nZXQoKSwg
bV90b2tlbik7CiAKICAgICAgICAgICAgIC8vIFdlIGRvIG5vdCBYU1MgZmlsdGVyIGlubmVySFRN
TCwgd2hpY2ggbWVhbnMgd2UgKGludGVudGlvbmFsbHkpIGZhaWwKICAgICAgICAgICAgIC8vIGh0
dHAvdGVzdHMvc2VjdXJpdHkveHNzQXVkaXRvci9kb20td3JpdGUtaW5uZXJIVE1MLmh0bWwKSW5k
ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxTb3VyY2VUcmFja2VyLmNwcAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MU291cmNlVHJhY2tlci5j
cHAJKHJldmlzaW9uIDEwMzcxMykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxT
b3VyY2VUcmFja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjUsNiArMjUsNyBAQAogCiAjaW5j
bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSFRNTFNvdXJjZVRyYWNrZXIuaCIKKyNpbmNsdWRl
ICJIVE1MVG9rZW5pemVyLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgog
CiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0zMywxOSArMzQsMjUgQEAgSFRNTFNvdXJjZVRyYWNr
ZXI6OkhUTUxTb3VyY2VUcmFja2VyKCkKIHsKIH0KIAotdm9pZCBIVE1MU291cmNlVHJhY2tlcjo6
c3RhcnQoY29uc3QgSFRNTElucHV0U3RyZWFtJiBpbnB1dCwgSFRNTFRva2VuJiB0b2tlbikKK3Zv
aWQgSFRNTFNvdXJjZVRyYWNrZXI6OnN0YXJ0KGNvbnN0IEhUTUxJbnB1dFN0cmVhbSYgaW5wdXQs
IEhUTUxUb2tlbml6ZXIqIHRva2VuaXplciwgSFRNTFRva2VuJiB0b2tlbikKIHsKLSAgICBtX3Nv
dXJjZUZyb21QcmV2aW91c1NlZ21lbnRzID0gdG9rZW4udHlwZSgpID09IEhUTUxUb2tlblR5cGVz
OjpVbmluaXRpYWxpemVkID8gU3RyaW5nKCkgOiBtX3NvdXJjZUZyb21QcmV2aW91c1NlZ21lbnRz
ICsgbV9zb3VyY2UudG9TdHJpbmcoKTsKLSAgICBtX3NvdXJjZSA9IGlucHV0LmN1cnJlbnQoKTsK
LSAgICB0b2tlbi5zZXRCYXNlT2Zmc2V0KGlucHV0LmN1cnJlbnQoKS5udW1iZXJPZkNoYXJhY3Rl
cnNDb25zdW1lZCgpIC0gbV9zb3VyY2VGcm9tUHJldmlvdXNTZWdtZW50cy5sZW5ndGgoKSk7Cisg
ICAgaWYgKHRva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW5UeXBlczo6VW5pbml0aWFsaXplZCkgewor
ICAgICAgICBtX3ByZXZpb3VzU291cmNlLmNsZWFyKCk7CisgICAgICAgIGlmICh0b2tlbml6ZXIt
Pm51bWJlck9mQnVmZmVyZWRDaGFyYWN0ZXJzKCkpCisgICAgICAgICAgICBtX3ByZXZpb3VzU291
cmNlID0gdG9rZW5pemVyLT5idWZmZXJlZENoYXJhY3RlcnMoKTsKKyAgICB9IGVsc2UKKyAgICAg
ICAgbV9wcmV2aW91c1NvdXJjZS5hcHBlbmQobV9jdXJyZW50U291cmNlKTsKKworICAgIG1fY3Vy
cmVudFNvdXJjZSA9IGlucHV0LmN1cnJlbnQoKTsKKyAgICB0b2tlbi5zZXRCYXNlT2Zmc2V0KG1f
Y3VycmVudFNvdXJjZS5udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZCgpIC0gbV9wcmV2aW91c1Nv
dXJjZS5sZW5ndGgoKSk7CiB9CiAKLXZvaWQgSFRNTFNvdXJjZVRyYWNrZXI6OmVuZChjb25zdCBI
VE1MSW5wdXRTdHJlYW0mIGlucHV0LCBIVE1MVG9rZW4mIHRva2VuKQordm9pZCBIVE1MU291cmNl
VHJhY2tlcjo6ZW5kKGNvbnN0IEhUTUxJbnB1dFN0cmVhbSYgaW5wdXQsIEhUTUxUb2tlbml6ZXIq
IHRva2VuaXplciwgSFRNTFRva2VuJiB0b2tlbikKIHsKICAgICBtX2NhY2hlZFNvdXJjZUZvclRv
a2VuID0gU3RyaW5nKCk7CiAKICAgICAvLyBGSVhNRTogVGhpcyB3b3JrIHNob3VsZCByZWFsbHkg
YmUgZG9uZSBieSB0aGUgSFRNTFRva2VuaXplci4KLSAgICB0b2tlbi5lbmQoaW5wdXQuY3VycmVu
dCgpLm51bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkKCkpOworICAgIHRva2VuLmVuZChpbnB1dC5j
dXJyZW50KCkubnVtYmVyT2ZDaGFyYWN0ZXJzQ29uc3VtZWQoKSAtIHRva2VuaXplci0+bnVtYmVy
T2ZCdWZmZXJlZENoYXJhY3RlcnMoKSk7CiB9CiAKIFN0cmluZyBIVE1MU291cmNlVHJhY2tlcjo6
c291cmNlRm9yVG9rZW4oY29uc3QgSFRNTFRva2VuJiB0b2tlbikKQEAgLTU3LDE1ICs2NCwyMiBA
QCBTdHJpbmcgSFRNTFNvdXJjZVRyYWNrZXI6OnNvdXJjZUZvclRva2VuCiAgICAgICAgIHJldHVy
biBtX2NhY2hlZFNvdXJjZUZvclRva2VuOwogCiAgICAgQVNTRVJUKCF0b2tlbi5zdGFydEluZGV4
KCkpOwotICAgIGludCBsZW5ndGggPSB0b2tlbi5lbmRJbmRleCgpIC0gdG9rZW4uc3RhcnRJbmRl
eCgpOworICAgIHNpemVfdCBsZW5ndGggPSBzdGF0aWNfY2FzdDxzaXplX3Q+KHRva2VuLmVuZElu
ZGV4KCkgLSB0b2tlbi5zdGFydEluZGV4KCkpOworCiAgICAgU3RyaW5nQnVpbGRlciBzb3VyY2U7
CiAgICAgc291cmNlLnJlc2VydmVDYXBhY2l0eShsZW5ndGgpOwotICAgIHNvdXJjZS5hcHBlbmQo
bV9zb3VyY2VGcm9tUHJldmlvdXNTZWdtZW50cyk7Ci0gICAgbGVuZ3RoIC09IG1fc291cmNlRnJv
bVByZXZpb3VzU2VnbWVudHMubGVuZ3RoKCk7Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW5n
dGg7ICsraSkgewotICAgICAgICBzb3VyY2UuYXBwZW5kKCptX3NvdXJjZSk7Ci0gICAgICAgIG1f
c291cmNlLmFkdmFuY2UoKTsKKworICAgIHNpemVfdCBpID0gMDsKKyAgICBmb3IgKCA7IGkgPCBs
ZW5ndGggJiYgIW1fcHJldmlvdXNTb3VyY2UuaXNFbXB0eSgpOyArK2kpIHsKKyAgICAgICAgc291
cmNlLmFwcGVuZCgqbV9wcmV2aW91c1NvdXJjZSk7CisgICAgICAgIG1fcHJldmlvdXNTb3VyY2Uu
YWR2YW5jZSgpOwogICAgIH0KKyAgICBmb3IgKCA7IGkgPCBsZW5ndGg7ICsraSkgeworICAgICAg
ICBBU1NFUlQoIW1fY3VycmVudFNvdXJjZS5pc0VtcHR5KCkpOworICAgICAgICBzb3VyY2UuYXBw
ZW5kKCptX2N1cnJlbnRTb3VyY2UpOworICAgICAgICBtX2N1cnJlbnRTb3VyY2UuYWR2YW5jZSgp
OworICAgIH0KKwogICAgIG1fY2FjaGVkU291cmNlRm9yVG9rZW4gPSBzb3VyY2UudG9TdHJpbmco
KTsKICAgICByZXR1cm4gbV9jYWNoZWRTb3VyY2VGb3JUb2tlbjsKIH0KSW5kZXg6IFNvdXJjZS9X
ZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxTb3VyY2VUcmFja2VyLmgKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFNvdXJjZVRyYWNrZXIuaAkocmV2aXNpb24gMTAz
NzEzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFNvdXJjZVRyYWNrZXIuaAko
d29ya2luZyBjb3B5KQpAQCAtMjgsOSArMjgsMTIgQEAKIAogI2luY2x1ZGUgIkhUTUxJbnB1dFN0
cmVhbS5oIgogI2luY2x1ZGUgIkhUTUxUb2tlbi5oIgorI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmlu
Z0J1aWxkZXIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBIVE1MVG9rZW5pemVy
OworCiBjbGFzcyBIVE1MU291cmNlVHJhY2tlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUo
SFRNTFNvdXJjZVRyYWNrZXIpOwogcHVibGljOgpAQCAtMzksMTQgKzQyLDE1IEBAIHB1YmxpYzoK
ICAgICAvLyBGSVhNRTogT25jZSB3ZSBtb3ZlICJlbmQiIGludG8gSFRNTFRva2VuaXplciwgcmVu
YW1lICJzdGFydCIgdG8KICAgICAvLyBzb21ldGhpbmcgdGhhdCBtYWtlcyBpdCBvYnZpb3VzIHRo
YXQgdGhpcyBtZXRob2QgY2FuIGJlIGNhbGxlZCBtdWx0aXBsZQogICAgIC8vIHRpbWVzLgotICAg
IHZvaWQgc3RhcnQoY29uc3QgSFRNTElucHV0U3RyZWFtJiwgSFRNTFRva2VuJik7Ci0gICAgdm9p
ZCBlbmQoY29uc3QgSFRNTElucHV0U3RyZWFtJiwgSFRNTFRva2VuJik7CisgICAgdm9pZCBzdGFy
dChjb25zdCBIVE1MSW5wdXRTdHJlYW0mLCBIVE1MVG9rZW5pemVyKiwgSFRNTFRva2VuJik7Cisg
ICAgdm9pZCBlbmQoY29uc3QgSFRNTElucHV0U3RyZWFtJiwgSFRNTFRva2VuaXplciosIEhUTUxU
b2tlbiYpOwogCiAgICAgU3RyaW5nIHNvdXJjZUZvclRva2VuKGNvbnN0IEhUTUxUb2tlbiYpOwog
CiBwcml2YXRlOgotICAgIFN0cmluZyBtX3NvdXJjZUZyb21QcmV2aW91c1NlZ21lbnRzOwotICAg
IFNlZ21lbnRlZFN0cmluZyBtX3NvdXJjZTsKKyAgICBTZWdtZW50ZWRTdHJpbmcgbV9wcmV2aW91
c1NvdXJjZTsKKyAgICBTZWdtZW50ZWRTdHJpbmcgbV9jdXJyZW50U291cmNlOworCiAgICAgU3Ry
aW5nIG1fY2FjaGVkU291cmNlRm9yVG9rZW47CiB9OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9o
dG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y
ZS9odG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmNwcAkocmV2aXNpb24gMTAzNzEzKQorKysgU291
cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5jcHAJKHdvcmtpbmcgY29weSkK
QEAgLTE2NSw2ICsxNjUsNyBAQCBib29sIEhUTUxUb2tlbml6ZXI6OmZsdXNoQnVmZmVyZWRFbmRU
YWcoCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIG1fdG9rZW4tPmJlZ2luRW5kVGFnKG1fYnVm
ZmVyZWRFbmRUYWdOYW1lKTsKICAgICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5jbGVhcigpOworICAg
IG1fdGVtcG9yYXJ5QnVmZmVyLmNsZWFyKCk7CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCkBAIC0x
OTksNiArMjAwLDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkUwog
ICAgICAgICAvLyBXZSBzdGFydGVkIGFuIGVuZCB0YWcgZHVyaW5nIG91ciBsYXN0IGl0ZXJhdGlv
bi4KICAgICAgICAgbV90b2tlbi0+YmVnaW5FbmRUYWcobV9idWZmZXJlZEVuZFRhZ05hbWUpOwog
ICAgICAgICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5jbGVhcigpOworICAgICAgICBtX3RlbXBvcmFy
eUJ1ZmZlci5jbGVhcigpOwogICAgICAgICBpZiAobV9zdGF0ZSA9PSBIVE1MVG9rZW5pemVyU3Rh
dGU6OkRhdGFTdGF0ZSkgewogICAgICAgICAgICAgLy8gV2UncmUgYmFjayBpbiB0aGUgZGF0YSBz
dGF0ZSwgc28gd2UgbXVzdCBiZSBkb25lIHdpdGggdGhlIHRhZy4KICAgICAgICAgICAgIHJldHVy
biB0cnVlOwpAQCAtNDAwLDE5ICs0MDIsMjYgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9r
ZW4oU2VnbWVudGVkUwogICAgICAgICAgICAgSFRNTF9BRFZBTkNFX1RPKFJDREFUQUVuZFRhZ05h
bWVTdGF0ZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAoaXNUb2tlbml6ZXJX
aGl0ZXNwYWNlKGNjKSkgewotICAgICAgICAgICAgICAgIGlmIChpc0FwcHJvcHJpYXRlRW5kVGFn
KCkpCisgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkgeworICAgICAg
ICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoY2MpOwogICAgICAgICAgICAg
ICAgICAgICBGTFVTSF9BTkRfQURWQU5DRV9UTyhCZWZvcmVBdHRyaWJ1dGVOYW1lU3RhdGUpOwor
ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJy8nKSB7Ci0g
ICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkKKyAgICAgICAgICAgICAg
ICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAgICAgICAgICAgICAgIG1fdGVt
cG9yYXJ5QnVmZmVyLmFwcGVuZChjYyk7CiAgICAgICAgICAgICAgICAgICAgIEZMVVNIX0FORF9B
RFZBTkNFX1RPKFNlbGZDbG9zaW5nU3RhcnRUYWdTdGF0ZSk7CisgICAgICAgICAgICAgICAgfQog
ICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnPicpIHsKLSAgICAgICAgICAgICAgICBpZiAo
aXNBcHByb3ByaWF0ZUVuZFRhZygpKQorICAgICAgICAgICAgICAgIGlmIChpc0FwcHJvcHJpYXRl
RW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuYXBwZW5k
KGNjKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZsdXNoRW1pdEFuZFJlc3VtZUluKHNv
dXJjZSwgSFRNTFRva2VuaXplclN0YXRlOjpEYXRhU3RhdGUpOworICAgICAgICAgICAgICAgIH0K
ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJ1ZmZlckNoYXJhY3RlcignPCcpOwogICAgICAg
ICAgICAgYnVmZmVyQ2hhcmFjdGVyKCcvJyk7CiAgICAgICAgICAgICBtX3Rva2VuLT5hcHBlbmRU
b0NoYXJhY3RlcihtX3RlbXBvcmFyeUJ1ZmZlcik7CiAgICAgICAgICAgICBtX2J1ZmZlcmVkRW5k
VGFnTmFtZS5jbGVhcigpOworICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuY2xlYXIoKTsK
ICAgICAgICAgICAgIEhUTUxfUkVDT05TVU1FX0lOKFJDREFUQVN0YXRlKTsKICAgICAgICAgfQog
ICAgIH0KQEAgLTQ1OCwxOSArNDY3LDI2IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2Vu
KFNlZ21lbnRlZFMKICAgICAgICAgICAgIEhUTUxfQURWQU5DRV9UTyhSQVdURVhURW5kVGFnTmFt
ZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChpc1Rva2VuaXplcldo
aXRlc3BhY2UoY2MpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWco
KSkKKyAgICAgICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAg
ICAgICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChjYyk7CiAgICAgICAgICAgICAg
ICAgICAgIEZMVVNIX0FORF9BRFZBTkNFX1RPKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSk7Cisg
ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnLycpIHsKLSAg
ICAgICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKQorICAgICAgICAgICAgICAg
IGlmIChpc0FwcHJvcHJpYXRlRW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbV90ZW1w
b3JhcnlCdWZmZXIuYXBwZW5kKGNjKTsKICAgICAgICAgICAgICAgICAgICAgRkxVU0hfQU5EX0FE
VkFOQ0VfVE8oU2VsZkNsb3NpbmdTdGFydFRhZ1N0YXRlKTsKKyAgICAgICAgICAgICAgICB9CiAg
ICAgICAgICAgICB9IGVsc2UgaWYgKGNjID09ICc+JykgewotICAgICAgICAgICAgICAgIGlmIChp
c0FwcHJvcHJpYXRlRW5kVGFnKCkpCisgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVF
bmRUYWcoKSkgeworICAgICAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQo
Y2MpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmx1c2hFbWl0QW5kUmVzdW1lSW4oc291
cmNlLCBIVE1MVG9rZW5pemVyU3RhdGU6OkRhdGFTdGF0ZSk7CisgICAgICAgICAgICAgICAgfQog
ICAgICAgICAgICAgfQogICAgICAgICAgICAgYnVmZmVyQ2hhcmFjdGVyKCc8Jyk7CiAgICAgICAg
ICAgICBidWZmZXJDaGFyYWN0ZXIoJy8nKTsKICAgICAgICAgICAgIG1fdG9rZW4tPmFwcGVuZFRv
Q2hhcmFjdGVyKG1fdGVtcG9yYXJ5QnVmZmVyKTsKICAgICAgICAgICAgIG1fYnVmZmVyZWRFbmRU
YWdOYW1lLmNsZWFyKCk7CisgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5jbGVhcigpOwog
ICAgICAgICAgICAgSFRNTF9SRUNPTlNVTUVfSU4oUkFXVEVYVFN0YXRlKTsKICAgICAgICAgfQog
ICAgIH0KQEAgLTUyMCwxOSArNTM2LDI2IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2Vu
KFNlZ21lbnRlZFMKICAgICAgICAgICAgIEhUTUxfQURWQU5DRV9UTyhTY3JpcHREYXRhRW5kVGFn
TmFtZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChpc1Rva2VuaXpl
cldoaXRlc3BhY2UoY2MpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRU
YWcoKSkKKyAgICAgICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAg
ICAgICAgICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChjYyk7CiAgICAgICAgICAg
ICAgICAgICAgIEZMVVNIX0FORF9BRFZBTkNFX1RPKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSk7
CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnLycpIHsK
LSAgICAgICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKQorICAgICAgICAgICAg
ICAgIGlmIChpc0FwcHJvcHJpYXRlRW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbV90
ZW1wb3JhcnlCdWZmZXIuYXBwZW5kKGNjKTsKICAgICAgICAgICAgICAgICAgICAgRkxVU0hfQU5E
X0FEVkFOQ0VfVE8oU2VsZkNsb3NpbmdTdGFydFRhZ1N0YXRlKTsKKyAgICAgICAgICAgICAgICB9
CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGNjID09ICc+JykgewotICAgICAgICAgICAgICAgIGlm
IChpc0FwcHJvcHJpYXRlRW5kVGFnKCkpCisgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlh
dGVFbmRUYWcoKSkgeworICAgICAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBl
bmQoY2MpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmx1c2hFbWl0QW5kUmVzdW1lSW4o
c291cmNlLCBIVE1MVG9rZW5pemVyU3RhdGU6OkRhdGFTdGF0ZSk7CisgICAgICAgICAgICAgICAg
fQogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnVmZmVyQ2hhcmFjdGVyKCc8Jyk7CiAgICAg
ICAgICAgICBidWZmZXJDaGFyYWN0ZXIoJy8nKTsKICAgICAgICAgICAgIG1fdG9rZW4tPmFwcGVu
ZFRvQ2hhcmFjdGVyKG1fdGVtcG9yYXJ5QnVmZmVyKTsKICAgICAgICAgICAgIG1fYnVmZmVyZWRF
bmRUYWdOYW1lLmNsZWFyKCk7CisgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5jbGVhcigp
OwogICAgICAgICAgICAgSFRNTF9SRUNPTlNVTUVfSU4oU2NyaXB0RGF0YVN0YXRlKTsKICAgICAg
ICAgfQogICAgIH0KQEAgLTY1OSwxOSArNjgyLDI2IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4
dFRva2VuKFNlZ21lbnRlZFMKICAgICAgICAgICAgIEhUTUxfQURWQU5DRV9UTyhTY3JpcHREYXRh
RXNjYXBlZEVuZFRhZ05hbWVTdGF0ZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBp
ZiAoaXNUb2tlbml6ZXJXaGl0ZXNwYWNlKGNjKSkgewotICAgICAgICAgICAgICAgIGlmIChpc0Fw
cHJvcHJpYXRlRW5kVGFnKCkpCisgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRU
YWcoKSkgeworICAgICAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoY2Mp
OwogICAgICAgICAgICAgICAgICAgICBGTFVTSF9BTkRfQURWQU5DRV9UTyhCZWZvcmVBdHRyaWJ1
dGVOYW1lU3RhdGUpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSBpZiAo
Y2MgPT0gJy8nKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkK
KyAgICAgICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAgICAg
ICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChjYyk7CiAgICAgICAgICAgICAgICAg
ICAgIEZMVVNIX0FORF9BRFZBTkNFX1RPKFNlbGZDbG9zaW5nU3RhcnRUYWdTdGF0ZSk7CisgICAg
ICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnPicpIHsKLSAgICAg
ICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKQorICAgICAgICAgICAgICAgIGlm
IChpc0FwcHJvcHJpYXRlRW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbV90ZW1wb3Jh
cnlCdWZmZXIuYXBwZW5kKGNjKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZsdXNoRW1p
dEFuZFJlc3VtZUluKHNvdXJjZSwgSFRNTFRva2VuaXplclN0YXRlOjpEYXRhU3RhdGUpOworICAg
ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJ1ZmZlckNoYXJhY3Rl
cignPCcpOwogICAgICAgICAgICAgYnVmZmVyQ2hhcmFjdGVyKCcvJyk7CiAgICAgICAgICAgICBt
X3Rva2VuLT5hcHBlbmRUb0NoYXJhY3RlcihtX3RlbXBvcmFyeUJ1ZmZlcik7CiAgICAgICAgICAg
ICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5jbGVhcigpOworICAgICAgICAgICAgbV90ZW1wb3JhcnlC
dWZmZXIuY2xlYXIoKTsKICAgICAgICAgICAgIEhUTUxfUkVDT05TVU1FX0lOKFNjcmlwdERhdGFF
c2NhcGVkU3RhdGUpOwogICAgICAgICB9CiAgICAgfQpAQCAtMTU1Miw2ICsxNTgyLDE2IEBAIGJv
b2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFMKICAgICByZXR1cm4gZmFsc2U7
CiB9CiAKK1N0cmluZyBIVE1MVG9rZW5pemVyOjpidWZmZXJlZENoYXJhY3RlcnMoKSBjb25zdAor
eworICAgIFN0cmluZ0J1aWxkZXIgY2hhcmFjdGVyczsKKyAgICBjaGFyYWN0ZXJzLnJlc2VydmVD
YXBhY2l0eShudW1iZXJPZkJ1ZmZlcmVkQ2hhcmFjdGVycygpKTsKKyAgICBjaGFyYWN0ZXJzLmFw
cGVuZCgnPCcpOworICAgIGNoYXJhY3RlcnMuYXBwZW5kKCcvJyk7CisgICAgY2hhcmFjdGVycy5h
cHBlbmQobV90ZW1wb3JhcnlCdWZmZXIuZGF0YSgpLCBtX3RlbXBvcmFyeUJ1ZmZlci5zaXplKCkp
OworICAgIHJldHVybiBjaGFyYWN0ZXJzLnRvU3RyaW5nKCk7Cit9CisKIHZvaWQgSFRNTFRva2Vu
aXplcjo6dXBkYXRlU3RhdGVGb3IoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lLCBGcmFtZSog
ZnJhbWUpCiB7CiAgICAgaWYgKHRhZ05hbWUgPT0gdGV4dGFyZWFUYWcgfHwgdGFnTmFtZSA9PSB0
aXRsZVRhZykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUb2tlbml6ZXIu
aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVG9rZW5pemVy
LmgJKHJldmlzaW9uIDEwMzcxMykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxU
b2tlbml6ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTMwLDYgKzEzMCwxOSBAQCBwdWJsaWM6CiAg
ICAgLy8gdGhleSBjYWxsIHJlc2V0KCkgZmlyc3QpLgogICAgIGJvb2wgbmV4dFRva2VuKFNlZ21l
bnRlZFN0cmluZyYsIEhUTUxUb2tlbiYpOwogCisgICAgLy8gUmV0dXJucyBhIGNvcHkgb2YgYW55
IGNoYXJhY3RlcnMgYnVmZmVyZWQgaW50ZXJuYWxseSBieSB0aGUgdG9rZW5pemVyLgorICAgIC8v
IFRoZSB0b2tlbml6ZXIgYnVmZmVycyBjaGFyYWN0ZXJzIHdoZW4gc2VhcmNoaW5nIGZvciB0aGUg
PC9zY3JpcHQ+IHRva2VuCisgICAgLy8gdGhhdCB0ZXJtaW5hdGVzIGEgc2NyaXB0IGVsZW1lbnQu
CisgICAgU3RyaW5nIGJ1ZmZlcmVkQ2hhcmFjdGVycygpIGNvbnN0OworCisgICAgc2l6ZV90IG51
bWJlck9mQnVmZmVyZWRDaGFyYWN0ZXJzKCkgY29uc3QKKyAgICB7CisgICAgICAgIC8vIE5vdGlj
ZSB0aGF0IHdlIGFkZCAyIHRvIHRoZSBsZW5ndGggb2YgdGhlIG1fdGVtcG9yYXJ5QnVmZmVyIHRv
CisgICAgICAgIC8vIGFjY291bnQgZm9yIHRoZSAiPC8iIGNoYXJhY3RlcnMsIHdoaWNoIGFyZSBl
ZmZlY2l0dmVseSBidWZmZXJlZCBpbgorICAgICAgICAvLyB0aGUgdG9rZW5pemVyJ3Mgc3RhdGUg
bWFjaGluZS4KKyAgICAgICAgcmV0dXJuIG1fdGVtcG9yYXJ5QnVmZmVyLnNpemUoKSA/IG1fdGVt
cG9yYXJ5QnVmZmVyLnNpemUoKSArIDIgOiAwOworICAgIH0KKwogICAgIC8vIFVwZGF0ZXMgdGhl
IHRva2VuaXplcidzIHN0YXRlIGFjY29yZGluZyB0byB0aGUgZ2l2ZW4gdGFnIG5hbWUuIFRoaXMg
aXMKICAgICAvLyBhbiBhcHByb3hpbWF0aW9uIG9mIGhvdyB0aGUgdHJlZSBidWlsZGVyIHdvdWxk
IHVwZGF0ZSB0aGUgdG9rZW5pemVyJ3MKICAgICAvLyBzdGF0ZS4gVGhpcyBtZXRob2QgaXMgdXNl
ZnVsIGZvciBhcHByb3hpbWF0aW5nIEhUTUwgdG9rZW5pemF0aW9uLiBUbwpAQCAtMTUzLDcgKzE2
Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFNob3VsZEFsbG93Q0RBVEEoYm9vbCB2YWx1ZSkg
eyBtX3Nob3VsZEFsbG93Q0RBVEEgPSB2YWx1ZTsgfQogCiBwcml2YXRlOgotICAgIEhUTUxUb2tl
bml6ZXIoYm9vbCB1c2VQcmVIVE1MNVBhcnNlclF1aXJrcyk7CisgICAgZXhwbGljaXQgSFRNTFRv
a2VuaXplcihib29sIHVzZVByZUhUTUw1UGFyc2VyUXVpcmtzKTsKIAogICAgIGlubGluZSBib29s
IHByb2Nlc3NFbnRpdHkoU2VnbWVudGVkU3RyaW5nJik7CiAKQEAgLTIwMiw3ICsyMTUsNyBAQCBw
cml2YXRlOgogICAgIC8vIHRva2VuIChlLmcuLCB3aGVuIGxleGluZyBzY3JpcHQpLiBXZSBidWZm
ZXIgdGhlIG5hbWUgb2YgdGhlIGVuZCB0YWcKICAgICAvLyB0b2tlbiBoZXJlIHNvIHdlIHJlbWVt
YmVyIGl0IG5leHQgdGltZSB3ZSByZS1lbnRlciB0aGUgdG9rZW5pemVyLgogICAgIFZlY3RvcjxV
Q2hhciwgMzI+IG1fYnVmZmVyZWRFbmRUYWdOYW1lOwotICAgIAorCiAgICAgYm9vbCBtX3VzZVBy
ZUhUTUw1UGFyc2VyUXVpcmtzOwogfTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz
ZXIvSFRNTFZpZXdTb3VyY2VQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl
L2h0bWwvcGFyc2VyL0hUTUxWaWV3U291cmNlUGFyc2VyLmNwcAkocmV2aXNpb24gMTAzNzEzKQor
KysgU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFZpZXdTb3VyY2VQYXJzZXIuY3BwCSh3
b3JraW5nIGNvcHkpCkBAIC01MCwxMCArNTAsMTAgQEAgdm9pZCBIVE1MVmlld1NvdXJjZVBhcnNl
cjo6aW5zZXJ0KGNvbnN0IAogdm9pZCBIVE1MVmlld1NvdXJjZVBhcnNlcjo6cHVtcFRva2VuaXpl
cigpCiB7CiAgICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAgbV9zb3VyY2VUcmFja2VyLnN0YXJ0
KG1faW5wdXQsIG1fdG9rZW4pOworICAgICAgICBtX3NvdXJjZVRyYWNrZXIuc3RhcnQobV9pbnB1
dCwgbV90b2tlbml6ZXIuZ2V0KCksIG1fdG9rZW4pOwogICAgICAgICBpZiAoIW1fdG9rZW5pemVy
LT5uZXh0VG9rZW4obV9pbnB1dC5jdXJyZW50KCksIG1fdG9rZW4pKQogICAgICAgICAgICAgYnJl
YWs7Ci0gICAgICAgIG1fc291cmNlVHJhY2tlci5lbmQobV9pbnB1dCwgbV90b2tlbik7CisgICAg
ICAgIG1fc291cmNlVHJhY2tlci5lbmQobV9pbnB1dCwgbV90b2tlbml6ZXIuZ2V0KCksIG1fdG9r
ZW4pOwogCiAgICAgICAgIGRvY3VtZW50KCktPmFkZFNvdXJjZShzb3VyY2VGb3JUb2tlbigpLCBt
X3Rva2VuKTsKICAgICAgICAgdXBkYXRlVG9rZW5pemVyU3RhdGUoKTsKSW5kZXg6IFNvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL3RleHQvU2VnbWVudGVkU3RyaW5nLmNwcAo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1NlZ21lbnRlZFN0cmluZy5jcHAJKHJldmlzaW9u
IDEwMzcxMykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvU2VnbWVudGVkU3RyaW5n
LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTEsNiArOTEsOSBAQCB2b2lkIFNlZ21lbnRlZFN0cmlu
Zzo6Y2xlYXIoKQogICAgIG1fcHVzaGVkQ2hhcjIgPSAwOwogICAgIG1fY3VycmVudENoYXIgPSAw
OwogICAgIG1fY3VycmVudFN0cmluZy5jbGVhcigpOworICAgIG1fbnVtYmVyT2ZDaGFyYWN0ZXJz
Q29uc3VtZWRQcmlvclRvQ3VycmVudFN0cmluZyA9IDA7CisgICAgbV9udW1iZXJPZkNoYXJhY3Rl
cnNDb25zdW1lZFByaW9yVG9DdXJyZW50TGluZSA9IDA7CisgICAgbV9jdXJyZW50TGluZSA9IDA7
CiAgICAgbV9zdWJzdHJpbmdzLmNsZWFyKCk7CiAgICAgbV9jbG9zZWQgPSBmYWxzZTsKIH0KSW5k
ZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFu
Z2VMb2cJKHJldmlzaW9uIDEwMzcyOSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDExLTEyLTI3ICBBZGFtIEJhcnRoICA8YWJhcnRo
QHdlYmtpdC5vcmc+CisKKyAgICAgICAgdmlldy1zb3VyY2UgZG9lc24ndCBjb2xvcml6ZSA8L3Nj
cmlwdD4gY29ycmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD02Mjk3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgICogZmFzdC9mcmFtZXMvdmlld3NvdXJjZS1wbGFpbi10ZXh0LXRhZ3MuaHRtbDoKKwog
MjAxMS0xMi0yNyAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAK
ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MjYwCklu
ZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy92aWV3c291cmNlLXBsYWluLXRleHQtdGFncy5o
dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtcGxh
aW4tdGV4dC10YWdzLmh0bWwJKHJldmlzaW9uIDEwMzcxMykKKysrIExheW91dFRlc3RzL2Zhc3Qv
ZnJhbWVzL3ZpZXdzb3VyY2UtcGxhaW4tdGV4dC10YWdzLmh0bWwJKHdvcmtpbmcgY29weSkKQEAg
LTE2LDExICsxNiwxMCBAQAogICAgIH0KICAgICAKICAgICBmdW5jdGlvbiB0ZXN0U2VjdGlvbih0
ZXh0LCBuYW1lKSB7Ci0gICAgICAgIC8vIENsb3NpbmcgdGFncyBhcmUgbm90IGNvcnJlY3RseSBm
b3JtYXRlZCwgc28gZG9uJ3QgY2hlY2sgdGhlaXIgbWFya3VwLgogICAgICAgICByZXR1cm4gbmFt
ZSArICc6ICcgKwotICAgICAgICAgICAgIGZvdW5kKHRleHQsICc8c3BhbiBjbGFzcz0id2Via2l0
LWh0bWwtdGFnIj4mbHQ7JyArIG5hbWUgKyAnJmd0JykgKyAnICcgKworICAgICAgICAgICAgIGZv
dW5kKHRleHQsICc8c3BhbiBjbGFzcz0id2Via2l0LWh0bWwtdGFnIj4mbHQ7JyArIG5hbWUgKyAn
Jmd0OycpICsgJyAnICsKICAgICAgICAgICAgICBmb3VuZCh0ZXh0LCAnPHRkIGNsYXNzPSJ3ZWJr
aXQtbGluZS1jb250ZW50Ij4mbHQ7dGVzdCcgKyBuYW1lICsgJyZndDsnKSArICcgJyArCi0gICAg
ICAgICAgICAgZm91bmQodGV4dCwgJyZsdDsvJyArIG5hbWUgKyAnJmd0OycpICsgJ1xuJzsKKyAg
ICAgICAgICAgICBmb3VuZCh0ZXh0LCAnPHNwYW4gY2xhc3M9IndlYmtpdC1odG1sLXRhZyI+Jmx0
Oy8nICsgbmFtZSArICcmZ3Q7JykgKyAnXG4nOwogICAgIH0KIAogICAgIGZ1bmN0aW9uIHJlcG9y
dChmcmFtZSkK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>121013</attachid>
            <date>2012-01-03 15:55:38 -0800</date>
            <delta_ts>2012-01-03 18:42:14 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-62971-20120103155536.patch</filename>
            <type>text/plain</type>
            <size>20715</size>
            <attacher name="Adam Barth">abarth</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzk3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDc4IEBACisyMDEyLTAxLTAzICBBZGFtIEJh
cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgdmlldy1zb3VyY2UgZG9lc24ndCBj
b2xvcml6ZSA8L3NjcmlwdD4gY29ycmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD02Mjk3MQorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp
ZGVsLgorCisgICAgICAgIFRoZSByZWFzb24gdGhlc2UgdGFncyB3ZXJlbid0IGNvbG9yaXplZCBj
b3JyZWN0bHkgd2FzIGJlY2F1c2UgdGhlCisgICAgICAgIGNoYXJhY3RlcnMgZm9yIHRoZSBlbmQg
dGFncyB3aGVyZSBjb25zdW1lZCBieSB0aGUgdG9rZW5pemVyIGF0IHRoZSBzYW1lCisgICAgICAg
IHRpbWUgYXMgaXQgY29uc3VtZWQgdGhlIHRleHQgb2YgdGhlIHNjcmlwdCB0YWcuICBUaGVzZSBj
aGFyYWN0ZXJzIGFyZQorICAgICAgICBidWZmZXJlZCBpbnRlcm5hbGx5IGJ5IHRoZSB0b2tlbml6
ZXIgYmVjYXVzZSB0aGUgdG9rZW5pemVyIGlzIHNlYXJjaGluZworICAgICAgICBmb3IgImFuIGFw
cHJvcHJpYXRlIGVuZCB0YWciLCB3aGljaCBpcyAiPC9zY3JpcHQ+IiBpbiB0aGlzIGNhc2UuCisK
KyAgICAgICAgSSB0cmllZCBhIG51bWJlciBvZiBkaWZmZXJlbnQgYXBwcm9hY2hlcyB0byBmaXhp
bmcgdGhpcyBidWcuICBUaGUKKyAgICAgICAgYXBwcm9hY2ggaW4gdGhpcyBwYXRjaCBhZGRzIGFu
IGFjY2Vzc29yIHRvIHRoZSB0b2tlbml6ZXIgdG8gcmVhZCBvdXQKKyAgICAgICAgdGhlIGJ1ZmZl
cmVkIGNoYXJhY3RlcnMuICBUaGlzIGFwcHJvYWNoIG1ha2VzIGl0IGVhc2llciBmb3IgdGhlCisg
ICAgICAgIEhUTUxTb3VyY2VUcmFja2VyIHRvIGdldCBleGFjdGx5IHRoZSByaWdodCB2YWx1ZSBm
b3IgdGhlc2UgYnVmZmVyZWQKKyAgICAgICAgY2hhcmFjdGVycyB3aXRob3V0IGhhdmluZyB0byBk
byBhIGNvbXBsaWNhdGVkIHNpbXVsYXRpb24gb2YgdGhlCisgICAgICAgIGJ1ZmZlcmluZyBpdHNl
bGYuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtcGxhaW4tdGV4dC10
YWdzLmh0bWw6CisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVmlld1NvdXJjZVBhcnNlci5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJjZVBhcnNlcjo6cHVtcFRva2VuaXpl
cik6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcik6CisgICAgICAg
ICAgLSBHaXZlIHRoZSBIVE1MU291cmNlVHJhY2tlciBhIHBvaW50ZXIgdG8gdGhlIHRva2VuaXpl
ciBzbyBpdCBjYW4gYXNrCisgICAgICAgICAgICBmb3IgdGhlIGJ1ZmZlcmVkIGNoYXJhY3RlcnMu
CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFNvdXJjZVRyYWNrZXIuY3BwOgorICAgICAgICAo
V2ViQ29yZTo6SFRNTFNvdXJjZVRyYWNrZXI6OnN0YXJ0KToKKyAgICAgICAgICAtIFRoZSBpZGVh
IGhlcmUgaXMgdG8gdHJlYXQgY2hhcmFjdGVycyBidWZmZXJlZCBpbnRlcm5hbGx5IGJ5IHRoZQor
ICAgICAgICAgICAgdG9rZW5pemVyIHRoZSBzYW1lIHdheSB3ZSB0cmVhdCBjaGFyYWN0ZXJzIHRo
YXQgd2VyZSBjb250YWluZWQgaW4gYQorICAgICAgICAgICAgcHJldmlvdXMgc2VnbWVudCBvZiBz
b3VyY2UuICBXZSBjb3B5IHRoZW0gaW50byBvdXIgYWNjdW11bGF0aW9uCisgICAgICAgICAgICBi
dWZmZXIgYW5kIGFkanVzdCB0aGUgdG9rZW4gYmFzZSBvZmZzZXQgdG8gYWNjb3VudCBmb3IgdGhl
IGV4dHJhCisgICAgICAgICAgICBjaGFyYWN0ZXJzLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNv
dXJjZVRyYWNrZXI6OmVuZCk6CisgICAgICAgICAgLSBEb24ndCBjb25zaWVyIHRoZSBjaGFyYWN0
ZXIgYnVmZmVyZWQgYnkgdGhlIHRva2VuaXplciB0byBiZSBwYXJ0IG9mCisgICAgICAgICAgICB0
aGUgdG9rZW4gd2UndmUganVzdCBmaW5pc2hlZC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTb3Vy
Y2VUcmFja2VyOjpzb3VyY2VGb3JUb2tlbik6CisgICAgICAgICAgLSBSZW1vdmUgdGhlIGFzc3Vt
cHRpb24gdGhhdCBhbGwgb2YgdGhlIG1fcHJldmlvdXNTb3VyY2UgaXMgY29udGFpbmVkCisgICAg
ICAgICAgICBpbiB0aGUgc291cmNlIGZvciB0aGUgY3VycmVudCB0b2tlbi4gIEJlY2F1c2Ugd2Ug
bm93IHVuZGVyc3RhbmQKKyAgICAgICAgICAgIHRoYXQgdGhlIHRva2VuaXplciBjYW4gYnVmZmVy
IHNvbWUgY2hhcmFjdGVycyBpbnRlcm5hbGx5LCB3ZSBtaWdodAorICAgICAgICAgICAgbm90IGV4
aGF1c3QgdGhlIG1fcHJldmlvdXNTb3VyY2UuCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFNv
dXJjZVRyYWNrZXIuaDoKKyAgICAgICAgICAtIFJlbmFtZSBtX3NvdXJjZUZyb21QcmV2aW91c1Nl
Z21lbnRzIHRvIG1fcHJldmlvdXNTb3VyY2UgYW5kIGNoYW5nZWQKKyAgICAgICAgICAgIHRvIGEg
U2VnZW1lbnRlZFN0cmluZyB0byBhdm9pZCBleHRyYSBtYWxsb2NzIHdlIGtlZXAgYXBwZW5kaW5n
IHRpbnkKKyAgICAgICAgICAgIHNlZ21lbnRzLgorICAgICAgICAgIC0gUmVuYW1lIG1fc291cmNl
IHRvIG1fY3VycmVudFNvdXJjZSB0byBjb250cmFzdCBuaWNlbHkgd2l0aAorICAgICAgICAgICAg
bV9wcmV2aW91c1NvdXJjZS4KKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6OmZsdXNoQnVmZmVyZWRFbmRUYWcp
OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRva2VuaXplcjo6bmV4dFRva2VuKToKKyAgICAgICAg
ICAtIFByZXZpb3VzbHksIHdlIGNsZWFyZWQgdGhlIHRlbXBvcmFyeSBidWZmZXIgbGF6aWx5IHdo
ZW4gd2UgbmVlZGVkCisgICAgICAgICAgICB0byBhZGQgbmV3IGNoYXJhY3RlcnMgdG8gaXQuICBO
b3cgd2UgY2xlYXIgaXQgZWFnZXJseSBzbyB0aGF0IGl0J3MKKyAgICAgICAgICAgIGxlbmd0aCB0
ZWxscyB1cyB3aGV0aGVyIHdlJ3JlIGN1cnJlbnRseSB1c2luZyBpdCB0byBzdG9yZQorICAgICAg
ICAgICAgY2hhcmFjdGVycy4KKyAgICAgICAgICAtIFByZXZpb3VzbHksIHdlIHdlcmVuJ3Qgc3Rv
cmluZyB0aGUgY2hhcmFjdGVyIHRoYXQgd2UgdXNlZCB0bworICAgICAgICAgICAgdGVybWluYXRl
IHRoZSBhcHByb3ByaWF0ZSBlbmQgdGFnIChlLmcuLCB0aGUgPiBpbiA8L3NjcmlwdD4pCisgICAg
ICAgICAgICBiZWNhdXNlIHdlIGRpZG4ndCBuZWVkIHRvICJ1bmJ1ZmZlciIgdGhhdCBjaGFyYWN0
ZXIgaW50byB0aGUKKyAgICAgICAgICAgIEhUTUxUb2tlbjo6YXBwZW5kVG9DaGFyYWN0ZXIuICBO
b3csIHdlIGRvIHN0b3JlIHRoYXQgY2hhcmFjdGVyIGluCisgICAgICAgICAgICB0aGUgdGVtcG9y
YXJ5IGJ1ZmZlciBzbyB0aGF0IHRoZSBIVE1MU291cmNlVHJhY2tlciBjYW4gc2VlIHRoYXQKKyAg
ICAgICAgICAgIGNoYXJhY3Rlci4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6OmJ1
ZmZlcmVkQ2hhcmFjdGVycyk6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5o
OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRva2VuaXplcjo6bnVtYmVyT2ZCdWZmZXJlZENoYXJh
Y3RlcnMpOgorICAgICAgICAgIC0gQWRkIGFjY2Vzc29yIG1ldGhvZHMgdG8gY29weSBvdXQgdGhl
IGJ1ZmZlcmVkIGNoYXJhY3RlcnMuCisgICAgICAgICAgLSBBbHNvLCB1bnJlbGF0ZWQgdG8gdGhl
IHJlc3Qgb2YgdGhpcyBwYXRjaCwgSSBtYWRlIHRoZSBjb25zdHJ1Y3RvcgorICAgICAgICAgICAg
Zm9yIEhUTUxUb2tlbml6ZXIgZXhwbGljaXQgYmVjYXVzZSBpdCB0YWtlcyBvbmx5IGEgc2luZ2xl
CisgICAgICAgICAgICBwYXJhbWF0ZXIsIHBlciB0aGUgc3R5bGUgZ3VpZGUuCisgICAgICAgICog
cGxhdGZvcm0vdGV4dC9TZWdtZW50ZWRTdHJpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Vn
bWVudGVkU3RyaW5nOjpjbGVhcik6CisgICAgICAgICAgLSBTZWdtZW50ZWRTdHJpbmc6OmNsZWFy
IHdhc24ndCBjbGVhcmluZyBhbGwgb2YgaXRzIHN0YXRlLiAgSSBkb24ndAorICAgICAgICAgICAg
dGhpbmsgdGhpcyBpc3N1ZSB3YXMgYWN0dWFsbHkgb2JzZXJ2YWJsZSwgYnV0IEkgbm90aWNlZCBp
dCB3aGVuCisgICAgICAgICAgICB3b3JraW5nIG9uIHRoaXMgcGF0Y2gsIHNvIEkgZml4ZWQgaXQu
CisKIDIwMTItMDEtMDMgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KIAogICAg
ICAgICBbY2hyb21pdW1dIFJlbW92ZSB1bm5lZWRlZCBjb250ZW50IHZzLiBsYXllciBzcGFjZSBk
aXN0aW5jdGlvbiBpbiB0aWxlZCBsYXllcnMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFy
c2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv
aHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcAkocmV2aXNpb24gMTAzOTIyKQorKysg
U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcAkod29ya2lu
ZyBjb3B5KQpAQCAtMjYyLDEzICsyNjIsMTMgQEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6OnB1
bXBUb2tlbml6ZXIoUwogCiAgICAgd2hpbGUgKGNhblRha2VOZXh0VG9rZW4obW9kZSwgc2Vzc2lv
bikgJiYgIXNlc3Npb24ubmVlZHNZaWVsZCkgewogICAgICAgICBpZiAoIWlzUGFyc2luZ0ZyYWdt
ZW50KCkpCi0gICAgICAgICAgICBtX3NvdXJjZVRyYWNrZXIuc3RhcnQobV9pbnB1dCwgbV90b2tl
bik7CisgICAgICAgICAgICBtX3NvdXJjZVRyYWNrZXIuc3RhcnQobV9pbnB1dCwgbV90b2tlbml6
ZXIuZ2V0KCksIG1fdG9rZW4pOwogCiAgICAgICAgIGlmICghbV90b2tlbml6ZXItPm5leHRUb2tl
bihtX2lucHV0LmN1cnJlbnQoKSwgbV90b2tlbikpCiAgICAgICAgICAgICBicmVhazsKIAogICAg
ICAgICBpZiAoIWlzUGFyc2luZ0ZyYWdtZW50KCkpIHsKLSAgICAgICAgICAgIG1fc291cmNlVHJh
Y2tlci5lbmQobV9pbnB1dCwgbV90b2tlbik7CisgICAgICAgICAgICBtX3NvdXJjZVRyYWNrZXIu
ZW5kKG1faW5wdXQsIG1fdG9rZW5pemVyLmdldCgpLCBtX3Rva2VuKTsKIAogICAgICAgICAgICAg
Ly8gV2UgZG8gbm90IFhTUyBmaWx0ZXIgaW5uZXJIVE1MLCB3aGljaCBtZWFucyB3ZSAoaW50ZW50
aW9uYWxseSkgZmFpbAogICAgICAgICAgICAgLy8gaHR0cC90ZXN0cy9zZWN1cml0eS94c3NBdWRp
dG9yL2RvbS13cml0ZS1pbm5lckhUTUwuaHRtbApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9w
YXJzZXIvSFRNTFNvdXJjZVRyYWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl
L2h0bWwvcGFyc2VyL0hUTUxTb3VyY2VUcmFja2VyLmNwcAkocmV2aXNpb24gMTAzOTIyKQorKysg
U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFNvdXJjZVRyYWNrZXIuY3BwCSh3b3JraW5n
IGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl
ICJIVE1MU291cmNlVHJhY2tlci5oIgorI2luY2x1ZGUgIkhUTUxUb2tlbml6ZXIuaCIKICNpbmNs
dWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAg
LTMzLDE5ICszNCwyNSBAQCBIVE1MU291cmNlVHJhY2tlcjo6SFRNTFNvdXJjZVRyYWNrZXIoKQog
ewogfQogCi12b2lkIEhUTUxTb3VyY2VUcmFja2VyOjpzdGFydChjb25zdCBIVE1MSW5wdXRTdHJl
YW0mIGlucHV0LCBIVE1MVG9rZW4mIHRva2VuKQordm9pZCBIVE1MU291cmNlVHJhY2tlcjo6c3Rh
cnQoY29uc3QgSFRNTElucHV0U3RyZWFtJiBpbnB1dCwgSFRNTFRva2VuaXplciogdG9rZW5pemVy
LCBIVE1MVG9rZW4mIHRva2VuKQogewotICAgIG1fc291cmNlRnJvbVByZXZpb3VzU2VnbWVudHMg
PSB0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuVHlwZXM6OlVuaW5pdGlhbGl6ZWQgPyBTdHJpbmco
KSA6IG1fc291cmNlRnJvbVByZXZpb3VzU2VnbWVudHMgKyBtX3NvdXJjZS50b1N0cmluZygpOwot
ICAgIG1fc291cmNlID0gaW5wdXQuY3VycmVudCgpOwotICAgIHRva2VuLnNldEJhc2VPZmZzZXQo
aW5wdXQuY3VycmVudCgpLm51bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkKCkgLSBtX3NvdXJjZUZy
b21QcmV2aW91c1NlZ21lbnRzLmxlbmd0aCgpKTsKKyAgICBpZiAodG9rZW4udHlwZSgpID09IEhU
TUxUb2tlblR5cGVzOjpVbmluaXRpYWxpemVkKSB7CisgICAgICAgIG1fcHJldmlvdXNTb3VyY2Uu
Y2xlYXIoKTsKKyAgICAgICAgaWYgKHRva2VuaXplci0+bnVtYmVyT2ZCdWZmZXJlZENoYXJhY3Rl
cnMoKSkKKyAgICAgICAgICAgIG1fcHJldmlvdXNTb3VyY2UgPSB0b2tlbml6ZXItPmJ1ZmZlcmVk
Q2hhcmFjdGVycygpOworICAgIH0gZWxzZQorICAgICAgICBtX3ByZXZpb3VzU291cmNlLmFwcGVu
ZChtX2N1cnJlbnRTb3VyY2UpOworCisgICAgbV9jdXJyZW50U291cmNlID0gaW5wdXQuY3VycmVu
dCgpOworICAgIHRva2VuLnNldEJhc2VPZmZzZXQobV9jdXJyZW50U291cmNlLm51bWJlck9mQ2hh
cmFjdGVyc0NvbnN1bWVkKCkgLSBtX3ByZXZpb3VzU291cmNlLmxlbmd0aCgpKTsKIH0KIAotdm9p
ZCBIVE1MU291cmNlVHJhY2tlcjo6ZW5kKGNvbnN0IEhUTUxJbnB1dFN0cmVhbSYgaW5wdXQsIEhU
TUxUb2tlbiYgdG9rZW4pCit2b2lkIEhUTUxTb3VyY2VUcmFja2VyOjplbmQoY29uc3QgSFRNTElu
cHV0U3RyZWFtJiBpbnB1dCwgSFRNTFRva2VuaXplciogdG9rZW5pemVyLCBIVE1MVG9rZW4mIHRv
a2VuKQogewogICAgIG1fY2FjaGVkU291cmNlRm9yVG9rZW4gPSBTdHJpbmcoKTsKIAogICAgIC8v
IEZJWE1FOiBUaGlzIHdvcmsgc2hvdWxkIHJlYWxseSBiZSBkb25lIGJ5IHRoZSBIVE1MVG9rZW5p
emVyLgotICAgIHRva2VuLmVuZChpbnB1dC5jdXJyZW50KCkubnVtYmVyT2ZDaGFyYWN0ZXJzQ29u
c3VtZWQoKSk7CisgICAgdG9rZW4uZW5kKGlucHV0LmN1cnJlbnQoKS5udW1iZXJPZkNoYXJhY3Rl
cnNDb25zdW1lZCgpIC0gdG9rZW5pemVyLT5udW1iZXJPZkJ1ZmZlcmVkQ2hhcmFjdGVycygpKTsK
IH0KIAogU3RyaW5nIEhUTUxTb3VyY2VUcmFja2VyOjpzb3VyY2VGb3JUb2tlbihjb25zdCBIVE1M
VG9rZW4mIHRva2VuKQpAQCAtNTcsMTUgKzY0LDIyIEBAIFN0cmluZyBIVE1MU291cmNlVHJhY2tl
cjo6c291cmNlRm9yVG9rZW4KICAgICAgICAgcmV0dXJuIG1fY2FjaGVkU291cmNlRm9yVG9rZW47
CiAKICAgICBBU1NFUlQoIXRva2VuLnN0YXJ0SW5kZXgoKSk7Ci0gICAgaW50IGxlbmd0aCA9IHRv
a2VuLmVuZEluZGV4KCkgLSB0b2tlbi5zdGFydEluZGV4KCk7CisgICAgc2l6ZV90IGxlbmd0aCA9
IHN0YXRpY19jYXN0PHNpemVfdD4odG9rZW4uZW5kSW5kZXgoKSAtIHRva2VuLnN0YXJ0SW5kZXgo
KSk7CisKICAgICBTdHJpbmdCdWlsZGVyIHNvdXJjZTsKICAgICBzb3VyY2UucmVzZXJ2ZUNhcGFj
aXR5KGxlbmd0aCk7Ci0gICAgc291cmNlLmFwcGVuZChtX3NvdXJjZUZyb21QcmV2aW91c1NlZ21l
bnRzKTsKLSAgICBsZW5ndGggLT0gbV9zb3VyY2VGcm9tUHJldmlvdXNTZWdtZW50cy5sZW5ndGgo
KTsKLSAgICBmb3IgKGludCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7Ci0gICAgICAgIHNvdXJj
ZS5hcHBlbmQoKm1fc291cmNlKTsKLSAgICAgICAgbV9zb3VyY2UuYWR2YW5jZSgpOworCisgICAg
c2l6ZV90IGkgPSAwOworICAgIGZvciAoIDsgaSA8IGxlbmd0aCAmJiAhbV9wcmV2aW91c1NvdXJj
ZS5pc0VtcHR5KCk7ICsraSkgeworICAgICAgICBzb3VyY2UuYXBwZW5kKCptX3ByZXZpb3VzU291
cmNlKTsKKyAgICAgICAgbV9wcmV2aW91c1NvdXJjZS5hZHZhbmNlKCk7CiAgICAgfQorICAgIGZv
ciAoIDsgaSA8IGxlbmd0aDsgKytpKSB7CisgICAgICAgIEFTU0VSVCghbV9jdXJyZW50U291cmNl
LmlzRW1wdHkoKSk7CisgICAgICAgIHNvdXJjZS5hcHBlbmQoKm1fY3VycmVudFNvdXJjZSk7Cisg
ICAgICAgIG1fY3VycmVudFNvdXJjZS5hZHZhbmNlKCk7CisgICAgfQorCiAgICAgbV9jYWNoZWRT
b3VyY2VGb3JUb2tlbiA9IHNvdXJjZS50b1N0cmluZygpOwogICAgIHJldHVybiBtX2NhY2hlZFNv
dXJjZUZvclRva2VuOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFNv
dXJjZVRyYWNrZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I
VE1MU291cmNlVHJhY2tlci5oCShyZXZpc2lvbiAxMDM5MjIpCisrKyBTb3VyY2UvV2ViQ29yZS9o
dG1sL3BhcnNlci9IVE1MU291cmNlVHJhY2tlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw5ICsy
OCwxMiBAQAogCiAjaW5jbHVkZSAiSFRNTElucHV0U3RyZWFtLmgiCiAjaW5jbHVkZSAiSFRNTFRv
a2VuLmgiCisjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgogCiBuYW1lc3BhY2Ug
V2ViQ29yZSB7CiAKK2NsYXNzIEhUTUxUb2tlbml6ZXI7CisKIGNsYXNzIEhUTUxTb3VyY2VUcmFj
a2VyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShIVE1MU291cmNlVHJhY2tlcik7CiBwdWJs
aWM6CkBAIC0zOSwxNCArNDIsMTUgQEAgcHVibGljOgogICAgIC8vIEZJWE1FOiBPbmNlIHdlIG1v
dmUgImVuZCIgaW50byBIVE1MVG9rZW5pemVyLCByZW5hbWUgInN0YXJ0IiB0bwogICAgIC8vIHNv
bWV0aGluZyB0aGF0IG1ha2VzIGl0IG9idmlvdXMgdGhhdCB0aGlzIG1ldGhvZCBjYW4gYmUgY2Fs
bGVkIG11bHRpcGxlCiAgICAgLy8gdGltZXMuCi0gICAgdm9pZCBzdGFydChjb25zdCBIVE1MSW5w
dXRTdHJlYW0mLCBIVE1MVG9rZW4mKTsKLSAgICB2b2lkIGVuZChjb25zdCBIVE1MSW5wdXRTdHJl
YW0mLCBIVE1MVG9rZW4mKTsKKyAgICB2b2lkIHN0YXJ0KGNvbnN0IEhUTUxJbnB1dFN0cmVhbSYs
IEhUTUxUb2tlbml6ZXIqLCBIVE1MVG9rZW4mKTsKKyAgICB2b2lkIGVuZChjb25zdCBIVE1MSW5w
dXRTdHJlYW0mLCBIVE1MVG9rZW5pemVyKiwgSFRNTFRva2VuJik7CiAKICAgICBTdHJpbmcgc291
cmNlRm9yVG9rZW4oY29uc3QgSFRNTFRva2VuJik7CiAKIHByaXZhdGU6Ci0gICAgU3RyaW5nIG1f
c291cmNlRnJvbVByZXZpb3VzU2VnbWVudHM7Ci0gICAgU2VnbWVudGVkU3RyaW5nIG1fc291cmNl
OworICAgIFNlZ21lbnRlZFN0cmluZyBtX3ByZXZpb3VzU291cmNlOworICAgIFNlZ21lbnRlZFN0
cmluZyBtX2N1cnJlbnRTb3VyY2U7CisKICAgICBTdHJpbmcgbV9jYWNoZWRTb3VyY2VGb3JUb2tl
bjsKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUb2tlbml6ZXIu
Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUb2tlbml6
ZXIuY3BwCShyZXZpc2lvbiAxMDM5MjIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I
VE1MVG9rZW5pemVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY1LDYgKzE2NSw3IEBAIGJvb2wg
SFRNTFRva2VuaXplcjo6Zmx1c2hCdWZmZXJlZEVuZFRhZygKICAgICAgICAgcmV0dXJuIHRydWU7
CiAgICAgbV90b2tlbi0+YmVnaW5FbmRUYWcobV9idWZmZXJlZEVuZFRhZ05hbWUpOwogICAgIG1f
YnVmZmVyZWRFbmRUYWdOYW1lLmNsZWFyKCk7CisgICAgbV90ZW1wb3JhcnlCdWZmZXIuY2xlYXIo
KTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTE5OSw2ICsyMDAsNyBAQCBib29sIEhUTUxU
b2tlbml6ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTCiAgICAgICAgIC8vIFdlIHN0YXJ0ZWQgYW4g
ZW5kIHRhZyBkdXJpbmcgb3VyIGxhc3QgaXRlcmF0aW9uLgogICAgICAgICBtX3Rva2VuLT5iZWdp
bkVuZFRhZyhtX2J1ZmZlcmVkRW5kVGFnTmFtZSk7CiAgICAgICAgIG1fYnVmZmVyZWRFbmRUYWdO
YW1lLmNsZWFyKCk7CisgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmNsZWFyKCk7CiAgICAgICAg
IGlmIChtX3N0YXRlID09IEhUTUxUb2tlbml6ZXJTdGF0ZTo6RGF0YVN0YXRlKSB7CiAgICAgICAg
ICAgICAvLyBXZSdyZSBiYWNrIGluIHRoZSBkYXRhIHN0YXRlLCBzbyB3ZSBtdXN0IGJlIGRvbmUg
d2l0aCB0aGUgdGFnLgogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC00MDAsMTkgKzQwMiwy
NiBAQCBib29sIEhUTUxUb2tlbml6ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTCiAgICAgICAgICAg
ICBIVE1MX0FEVkFOQ0VfVE8oUkNEQVRBRW5kVGFnTmFtZVN0YXRlKTsKICAgICAgICAgfSBlbHNl
IHsKICAgICAgICAgICAgIGlmIChpc1Rva2VuaXplcldoaXRlc3BhY2UoY2MpKSB7Ci0gICAgICAg
ICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkKKyAgICAgICAgICAgICAgICBpZiAo
aXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAgICAgICAgICAgICAgIG1fdGVtcG9yYXJ5
QnVmZmVyLmFwcGVuZChjYyk7CiAgICAgICAgICAgICAgICAgICAgIEZMVVNIX0FORF9BRFZBTkNF
X1RPKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSk7CisgICAgICAgICAgICAgICAgfQogICAgICAg
ICAgICAgfSBlbHNlIGlmIChjYyA9PSAnLycpIHsKLSAgICAgICAgICAgICAgICBpZiAoaXNBcHBy
b3ByaWF0ZUVuZFRhZygpKQorICAgICAgICAgICAgICAgIGlmIChpc0FwcHJvcHJpYXRlRW5kVGFn
KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuYXBwZW5kKGNjKTsK
ICAgICAgICAgICAgICAgICAgICAgRkxVU0hfQU5EX0FEVkFOQ0VfVE8oU2VsZkNsb3NpbmdTdGFy
dFRhZ1N0YXRlKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGNj
ID09ICc+JykgewotICAgICAgICAgICAgICAgIGlmIChpc0FwcHJvcHJpYXRlRW5kVGFnKCkpCisg
ICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkgeworICAgICAgICAgICAg
ICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoY2MpOwogICAgICAgICAgICAgICAgICAg
ICByZXR1cm4gZmx1c2hFbWl0QW5kUmVzdW1lSW4oc291cmNlLCBIVE1MVG9rZW5pemVyU3RhdGU6
OkRhdGFTdGF0ZSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICAg
ICAgYnVmZmVyQ2hhcmFjdGVyKCc8Jyk7CiAgICAgICAgICAgICBidWZmZXJDaGFyYWN0ZXIoJy8n
KTsKICAgICAgICAgICAgIG1fdG9rZW4tPmFwcGVuZFRvQ2hhcmFjdGVyKG1fdGVtcG9yYXJ5QnVm
ZmVyKTsKICAgICAgICAgICAgIG1fYnVmZmVyZWRFbmRUYWdOYW1lLmNsZWFyKCk7CisgICAgICAg
ICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5jbGVhcigpOwogICAgICAgICAgICAgSFRNTF9SRUNPTlNV
TUVfSU4oUkNEQVRBU3RhdGUpOwogICAgICAgICB9CiAgICAgfQpAQCAtNDU4LDE5ICs0NjcsMjYg
QEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkUwogICAgICAgICAgICAg
SFRNTF9BRFZBTkNFX1RPKFJBV1RFWFRFbmRUYWdOYW1lU3RhdGUpOwogICAgICAgICB9IGVsc2Ug
ewogICAgICAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpIHsKLSAgICAgICAg
ICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKQorICAgICAgICAgICAgICAgIGlmIChp
c0FwcHJvcHJpYXRlRW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbV90ZW1wb3JhcnlC
dWZmZXIuYXBwZW5kKGNjKTsKICAgICAgICAgICAgICAgICAgICAgRkxVU0hfQU5EX0FEVkFOQ0Vf
VE8oQmVmb3JlQXR0cmlidXRlTmFtZVN0YXRlKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAg
ICAgICB9IGVsc2UgaWYgKGNjID09ICcvJykgewotICAgICAgICAgICAgICAgIGlmIChpc0FwcHJv
cHJpYXRlRW5kVGFnKCkpCisgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWco
KSkgeworICAgICAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoY2MpOwog
ICAgICAgICAgICAgICAgICAgICBGTFVTSF9BTkRfQURWQU5DRV9UTyhTZWxmQ2xvc2luZ1N0YXJ0
VGFnU3RhdGUpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2Mg
PT0gJz4nKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkKKyAg
ICAgICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAgICAgICAg
ICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChjYyk7CiAgICAgICAgICAgICAgICAgICAg
IHJldHVybiBmbHVzaEVtaXRBbmRSZXN1bWVJbihzb3VyY2UsIEhUTUxUb2tlbml6ZXJTdGF0ZTo6
RGF0YVN0YXRlKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAg
ICBidWZmZXJDaGFyYWN0ZXIoJzwnKTsKICAgICAgICAgICAgIGJ1ZmZlckNoYXJhY3RlcignLycp
OwogICAgICAgICAgICAgbV90b2tlbi0+YXBwZW5kVG9DaGFyYWN0ZXIobV90ZW1wb3JhcnlCdWZm
ZXIpOwogICAgICAgICAgICAgbV9idWZmZXJlZEVuZFRhZ05hbWUuY2xlYXIoKTsKKyAgICAgICAg
ICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmNsZWFyKCk7CiAgICAgICAgICAgICBIVE1MX1JFQ09OU1VN
RV9JTihSQVdURVhUU3RhdGUpOwogICAgICAgICB9CiAgICAgfQpAQCAtNTIwLDE5ICs1MzYsMjYg
QEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkUwogICAgICAgICAgICAg
SFRNTF9BRFZBTkNFX1RPKFNjcmlwdERhdGFFbmRUYWdOYW1lU3RhdGUpOwogICAgICAgICB9IGVs
c2UgewogICAgICAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpIHsKLSAgICAg
ICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKQorICAgICAgICAgICAgICAgIGlm
IChpc0FwcHJvcHJpYXRlRW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbV90ZW1wb3Jh
cnlCdWZmZXIuYXBwZW5kKGNjKTsKICAgICAgICAgICAgICAgICAgICAgRkxVU0hfQU5EX0FEVkFO
Q0VfVE8oQmVmb3JlQXR0cmlidXRlTmFtZVN0YXRlKTsKKyAgICAgICAgICAgICAgICB9CiAgICAg
ICAgICAgICB9IGVsc2UgaWYgKGNjID09ICcvJykgewotICAgICAgICAgICAgICAgIGlmIChpc0Fw
cHJvcHJpYXRlRW5kVGFnKCkpCisgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRU
YWcoKSkgeworICAgICAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoY2Mp
OwogICAgICAgICAgICAgICAgICAgICBGTFVTSF9BTkRfQURWQU5DRV9UTyhTZWxmQ2xvc2luZ1N0
YXJ0VGFnU3RhdGUpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZSBpZiAo
Y2MgPT0gJz4nKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkK
KyAgICAgICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAgICAg
ICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChjYyk7CiAgICAgICAgICAgICAgICAg
ICAgIHJldHVybiBmbHVzaEVtaXRBbmRSZXN1bWVJbihzb3VyY2UsIEhUTUxUb2tlbml6ZXJTdGF0
ZTo6RGF0YVN0YXRlKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAg
ICAgICBidWZmZXJDaGFyYWN0ZXIoJzwnKTsKICAgICAgICAgICAgIGJ1ZmZlckNoYXJhY3Rlcign
LycpOwogICAgICAgICAgICAgbV90b2tlbi0+YXBwZW5kVG9DaGFyYWN0ZXIobV90ZW1wb3JhcnlC
dWZmZXIpOwogICAgICAgICAgICAgbV9idWZmZXJlZEVuZFRhZ05hbWUuY2xlYXIoKTsKKyAgICAg
ICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmNsZWFyKCk7CiAgICAgICAgICAgICBIVE1MX1JFQ09O
U1VNRV9JTihTY3JpcHREYXRhU3RhdGUpOwogICAgICAgICB9CiAgICAgfQpAQCAtNjU5LDE5ICs2
ODIsMjYgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkUwogICAgICAg
ICAgICAgSFRNTF9BRFZBTkNFX1RPKFNjcmlwdERhdGFFc2NhcGVkRW5kVGFnTmFtZVN0YXRlKTsK
ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChpc1Rva2VuaXplcldoaXRlc3BhY2Uo
Y2MpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkKKyAgICAg
ICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAgICAgICAgICAg
ICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChjYyk7CiAgICAgICAgICAgICAgICAgICAgIEZM
VVNIX0FORF9BRFZBTkNFX1RPKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSk7CisgICAgICAgICAg
ICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnLycpIHsKLSAgICAgICAgICAg
ICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKQorICAgICAgICAgICAgICAgIGlmIChpc0Fw
cHJvcHJpYXRlRW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZm
ZXIuYXBwZW5kKGNjKTsKICAgICAgICAgICAgICAgICAgICAgRkxVU0hfQU5EX0FEVkFOQ0VfVE8o
U2VsZkNsb3NpbmdTdGFydFRhZ1N0YXRlKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg
ICB9IGVsc2UgaWYgKGNjID09ICc+JykgewotICAgICAgICAgICAgICAgIGlmIChpc0FwcHJvcHJp
YXRlRW5kVGFnKCkpCisgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkg
eworICAgICAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoY2MpOwogICAg
ICAgICAgICAgICAgICAgICByZXR1cm4gZmx1c2hFbWl0QW5kUmVzdW1lSW4oc291cmNlLCBIVE1M
VG9rZW5pemVyU3RhdGU6OkRhdGFTdGF0ZSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAg
ICAgfQogICAgICAgICAgICAgYnVmZmVyQ2hhcmFjdGVyKCc8Jyk7CiAgICAgICAgICAgICBidWZm
ZXJDaGFyYWN0ZXIoJy8nKTsKICAgICAgICAgICAgIG1fdG9rZW4tPmFwcGVuZFRvQ2hhcmFjdGVy
KG1fdGVtcG9yYXJ5QnVmZmVyKTsKICAgICAgICAgICAgIG1fYnVmZmVyZWRFbmRUYWdOYW1lLmNs
ZWFyKCk7CisgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5jbGVhcigpOwogICAgICAgICAg
ICAgSFRNTF9SRUNPTlNVTUVfSU4oU2NyaXB0RGF0YUVzY2FwZWRTdGF0ZSk7CiAgICAgICAgIH0K
ICAgICB9CkBAIC0xNTUyLDYgKzE1ODIsMTcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9r
ZW4oU2VnbWVudGVkUwogICAgIHJldHVybiBmYWxzZTsKIH0KIAorU3RyaW5nIEhUTUxUb2tlbml6
ZXI6OmJ1ZmZlcmVkQ2hhcmFjdGVycygpIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IEFkZCBhbiBh
c3NlcnQgYWJvdXQgbV9zdGF0ZS4KKyAgICBTdHJpbmdCdWlsZGVyIGNoYXJhY3RlcnM7CisgICAg
Y2hhcmFjdGVycy5yZXNlcnZlQ2FwYWNpdHkobnVtYmVyT2ZCdWZmZXJlZENoYXJhY3RlcnMoKSk7
CisgICAgY2hhcmFjdGVycy5hcHBlbmQoJzwnKTsKKyAgICBjaGFyYWN0ZXJzLmFwcGVuZCgnLycp
OworICAgIGNoYXJhY3RlcnMuYXBwZW5kKG1fdGVtcG9yYXJ5QnVmZmVyLmRhdGEoKSwgbV90ZW1w
b3JhcnlCdWZmZXIuc2l6ZSgpKTsKKyAgICByZXR1cm4gY2hhcmFjdGVycy50b1N0cmluZygpOwor
fQorCiB2b2lkIEhUTUxUb2tlbml6ZXI6OnVwZGF0ZVN0YXRlRm9yKGNvbnN0IEF0b21pY1N0cmlu
ZyYgdGFnTmFtZSwgRnJhbWUqIGZyYW1lKQogewogICAgIGlmICh0YWdOYW1lID09IHRleHRhcmVh
VGFnIHx8IHRhZ05hbWUgPT0gdGl0bGVUYWcpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3Bh
cnNlci9IVE1MVG9rZW5pemVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9w
YXJzZXIvSFRNTFRva2VuaXplci5oCShyZXZpc2lvbiAxMDM5MjIpCisrKyBTb3VyY2UvV2ViQ29y
ZS9odG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMCw2ICsx
MzAsMTkgQEAgcHVibGljOgogICAgIC8vIHRoZXkgY2FsbCByZXNldCgpIGZpcnN0KS4KICAgICBi
b29sIG5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmLCBIVE1MVG9rZW4mKTsKIAorICAgIC8vIFJl
dHVybnMgYSBjb3B5IG9mIGFueSBjaGFyYWN0ZXJzIGJ1ZmZlcmVkIGludGVybmFsbHkgYnkgdGhl
IHRva2VuaXplci4KKyAgICAvLyBUaGUgdG9rZW5pemVyIGJ1ZmZlcnMgY2hhcmFjdGVycyB3aGVu
IHNlYXJjaGluZyBmb3IgdGhlIDwvc2NyaXB0PiB0b2tlbgorICAgIC8vIHRoYXQgdGVybWluYXRl
cyBhIHNjcmlwdCBlbGVtZW50LgorICAgIFN0cmluZyBidWZmZXJlZENoYXJhY3RlcnMoKSBjb25z
dDsKKworICAgIHNpemVfdCBudW1iZXJPZkJ1ZmZlcmVkQ2hhcmFjdGVycygpIGNvbnN0CisgICAg
eworICAgICAgICAvLyBOb3RpY2UgdGhhdCB3ZSBhZGQgMiB0byB0aGUgbGVuZ3RoIG9mIHRoZSBt
X3RlbXBvcmFyeUJ1ZmZlciB0bworICAgICAgICAvLyBhY2NvdW50IGZvciB0aGUgIjwvIiBjaGFy
YWN0ZXJzLCB3aGljaCBhcmUgZWZmZWNpdHZlbHkgYnVmZmVyZWQgaW4KKyAgICAgICAgLy8gdGhl
IHRva2VuaXplcidzIHN0YXRlIG1hY2hpbmUuCisgICAgICAgIHJldHVybiBtX3RlbXBvcmFyeUJ1
ZmZlci5zaXplKCkgPyBtX3RlbXBvcmFyeUJ1ZmZlci5zaXplKCkgKyAyIDogMDsKKyAgICB9CisK
ICAgICAvLyBVcGRhdGVzIHRoZSB0b2tlbml6ZXIncyBzdGF0ZSBhY2NvcmRpbmcgdG8gdGhlIGdp
dmVuIHRhZyBuYW1lLiBUaGlzIGlzCiAgICAgLy8gYW4gYXBwcm94aW1hdGlvbiBvZiBob3cgdGhl
IHRyZWUgYnVpbGRlciB3b3VsZCB1cGRhdGUgdGhlIHRva2VuaXplcidzCiAgICAgLy8gc3RhdGUu
IFRoaXMgbWV0aG9kIGlzIHVzZWZ1bCBmb3IgYXBwcm94aW1hdGluZyBIVE1MIHRva2VuaXphdGlv
bi4gVG8KQEAgLTE1Myw3ICsxNjYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRTaG91bGRBbGxv
d0NEQVRBKGJvb2wgdmFsdWUpIHsgbV9zaG91bGRBbGxvd0NEQVRBID0gdmFsdWU7IH0KIAogcHJp
dmF0ZToKLSAgICBIVE1MVG9rZW5pemVyKGJvb2wgdXNlUHJlSFRNTDVQYXJzZXJRdWlya3MpOwor
ICAgIGV4cGxpY2l0IEhUTUxUb2tlbml6ZXIoYm9vbCB1c2VQcmVIVE1MNVBhcnNlclF1aXJrcyk7
CiAKICAgICBpbmxpbmUgYm9vbCBwcm9jZXNzRW50aXR5KFNlZ21lbnRlZFN0cmluZyYpOwogCkBA
IC0yMDIsNyArMjE1LDcgQEAgcHJpdmF0ZToKICAgICAvLyB0b2tlbiAoZS5nLiwgd2hlbiBsZXhp
bmcgc2NyaXB0KS4gV2UgYnVmZmVyIHRoZSBuYW1lIG9mIHRoZSBlbmQgdGFnCiAgICAgLy8gdG9r
ZW4gaGVyZSBzbyB3ZSByZW1lbWJlciBpdCBuZXh0IHRpbWUgd2UgcmUtZW50ZXIgdGhlIHRva2Vu
aXplci4KICAgICBWZWN0b3I8VUNoYXIsIDMyPiBtX2J1ZmZlcmVkRW5kVGFnTmFtZTsKLSAgICAK
KwogICAgIGJvb2wgbV91c2VQcmVIVE1MNVBhcnNlclF1aXJrczsKIH07CiAKSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxWaWV3U291cmNlUGFyc2VyLmNwcAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVmlld1NvdXJjZVBhcnNlci5jcHAJ
KHJldmlzaW9uIDEwMzkyMikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxWaWV3
U291cmNlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAsMTAgKzUwLDEwIEBAIHZvaWQg
SFRNTFZpZXdTb3VyY2VQYXJzZXI6Omluc2VydChjb25zdCAKIHZvaWQgSFRNTFZpZXdTb3VyY2VQ
YXJzZXI6OnB1bXBUb2tlbml6ZXIoKQogewogICAgIHdoaWxlICh0cnVlKSB7Ci0gICAgICAgIG1f
c291cmNlVHJhY2tlci5zdGFydChtX2lucHV0LCBtX3Rva2VuKTsKKyAgICAgICAgbV9zb3VyY2VU
cmFja2VyLnN0YXJ0KG1faW5wdXQsIG1fdG9rZW5pemVyLmdldCgpLCBtX3Rva2VuKTsKICAgICAg
ICAgaWYgKCFtX3Rva2VuaXplci0+bmV4dFRva2VuKG1faW5wdXQuY3VycmVudCgpLCBtX3Rva2Vu
KSkKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBtX3NvdXJjZVRyYWNrZXIuZW5kKG1faW5w
dXQsIG1fdG9rZW4pOworICAgICAgICBtX3NvdXJjZVRyYWNrZXIuZW5kKG1faW5wdXQsIG1fdG9r
ZW5pemVyLmdldCgpLCBtX3Rva2VuKTsKIAogICAgICAgICBkb2N1bWVudCgpLT5hZGRTb3VyY2Uo
c291cmNlRm9yVG9rZW4oKSwgbV90b2tlbik7CiAgICAgICAgIHVwZGF0ZVRva2VuaXplclN0YXRl
KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1NlZ21lbnRlZFN0cmluZy5j
cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9TZWdtZW50ZWRT
dHJpbmcuY3BwCShyZXZpc2lvbiAxMDM5MjIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90
ZXh0L1NlZ21lbnRlZFN0cmluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkxLDYgKzkxLDkgQEAg
dm9pZCBTZWdtZW50ZWRTdHJpbmc6OmNsZWFyKCkKICAgICBtX3B1c2hlZENoYXIyID0gMDsKICAg
ICBtX2N1cnJlbnRDaGFyID0gMDsKICAgICBtX2N1cnJlbnRTdHJpbmcuY2xlYXIoKTsKKyAgICBt
X251bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkUHJpb3JUb0N1cnJlbnRTdHJpbmcgPSAwOworICAg
IG1fbnVtYmVyT2ZDaGFyYWN0ZXJzQ29uc3VtZWRQcmlvclRvQ3VycmVudExpbmUgPSAwOworICAg
IG1fY3VycmVudExpbmUgPSAwOwogICAgIG1fc3Vic3RyaW5ncy5jbGVhcigpOwogICAgIG1fY2xv
c2VkID0gZmFsc2U7CiB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDM5MjIpCisrKyBMYXlvdXRUZXN0
cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAxMi0wMS0wMyAg
QWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIHZpZXctc291cmNlIGRv
ZXNuJ3QgY29sb3JpemUgPC9zY3JpcHQ+IGNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI5NzEKKworICAgICAgICBSZXZpZXdlZCBieSBF
cmljIFNlaWRlbC4KKworICAgICAgICAqIGZhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtcGxhaW4tdGV4
dC10YWdzLmh0bWw6CisKIDIwMTItMDEtMDIgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91
Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIEVTNSBwcm9oaWJpdHMgcGFyc2VJbnQgZnJvbSBzdXBw
b3J0aW5nIG9jdGFsCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy92aWV3c291cmNlLXBs
YWluLXRleHQtdGFncy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZnJhbWVz
L3ZpZXdzb3VyY2UtcGxhaW4tdGV4dC10YWdzLmh0bWwJKHJldmlzaW9uIDEwMzkyMikKKysrIExh
eW91dFRlc3RzL2Zhc3QvZnJhbWVzL3ZpZXdzb3VyY2UtcGxhaW4tdGV4dC10YWdzLmh0bWwJKHdv
cmtpbmcgY29weSkKQEAgLTE2LDExICsxNiwxMCBAQAogICAgIH0KICAgICAKICAgICBmdW5jdGlv
biB0ZXN0U2VjdGlvbih0ZXh0LCBuYW1lKSB7Ci0gICAgICAgIC8vIENsb3NpbmcgdGFncyBhcmUg
bm90IGNvcnJlY3RseSBmb3JtYXRlZCwgc28gZG9uJ3QgY2hlY2sgdGhlaXIgbWFya3VwLgogICAg
ICAgICByZXR1cm4gbmFtZSArICc6ICcgKwotICAgICAgICAgICAgIGZvdW5kKHRleHQsICc8c3Bh
biBjbGFzcz0id2Via2l0LWh0bWwtdGFnIj4mbHQ7JyArIG5hbWUgKyAnJmd0JykgKyAnICcgKwor
ICAgICAgICAgICAgIGZvdW5kKHRleHQsICc8c3BhbiBjbGFzcz0id2Via2l0LWh0bWwtdGFnIj4m
bHQ7JyArIG5hbWUgKyAnJmd0OycpICsgJyAnICsKICAgICAgICAgICAgICBmb3VuZCh0ZXh0LCAn
PHRkIGNsYXNzPSJ3ZWJraXQtbGluZS1jb250ZW50Ij4mbHQ7dGVzdCcgKyBuYW1lICsgJyZndDsn
KSArICcgJyArCi0gICAgICAgICAgICAgZm91bmQodGV4dCwgJyZsdDsvJyArIG5hbWUgKyAnJmd0
OycpICsgJ1xuJzsKKyAgICAgICAgICAgICBmb3VuZCh0ZXh0LCAnPHNwYW4gY2xhc3M9IndlYmtp
dC1odG1sLXRhZyI+Jmx0Oy8nICsgbmFtZSArICcmZ3Q7JykgKyAnXG4nOwogICAgIH0KIAogICAg
IGZ1bmN0aW9uIHJlcG9ydChmcmFtZSkK
</data>

          </attachment>
      

    </bug>

</bugzilla>