<?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>152080</bug_id>
          
          <creation_ts>2015-12-09 10:59:47 -0800</creation_ts>
          <short_desc>Web Inspector: reproducible debug ASSERT when inspecting the inspector (WK2)</short_desc>
          <delta_ts>2026-01-12 09:09:45 -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>Web Inspector</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>REOPENED</bug_status>
          <resolution></resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>152100</dependson>
    
    <dependson>152711</dependson>
          <blocked>152472</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Blaze Burg">bburg</reporter>
          <assigned_to name="Blaze Burg">bburg</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>graouts</cc>
    
    <cc>inspector-bugzilla-changes</cc>
    
    <cc>mkwst</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1147860</commentid>
    <comment_count>0</comment_count>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2015-12-09 10:59:47 -0800</bug_when>
    <thetext>:(

Call stack:

ASSERTION FAILED: !m_messageReceivers.contains(std::make_pair(messageReceiverName, destinationID))
/Users/bburg/repos/webkit/OpenSource/Source/WebKit2/Platform/IPC/MessageReceiverMap.cpp(53) : void IPC::MessageReceiverMap::addMessageReceiver(IPC::StringReference, uint64_t, IPC::MessageReceiver &amp;)
1   0x110e72140 WTFCrash
2   0x1136d16fd IPC::MessageReceiverMap::addMessageReceiver(IPC::StringReference, unsigned long long, IPC::MessageReceiver&amp;)
3   0x1135539e2 WebKit::ChildProcessProxy::addMessageReceiver(IPC::StringReference, unsigned long long, IPC::MessageReceiver&amp;)
4   0x113c5db93 WebKit::WebInspectorProxy::eagerlyCreateInspectorPage()
5   0x113c5e92c WebKit::WebInspectorProxy::createInspectorPage(IPC::Attachment, bool, bool)
6   0x113c718b4 void IPC::callMemberFunctionImpl&lt;WebKit::WebInspectorProxy, void (WebKit::WebInspectorProxy::*)(IPC::Attachment, bool, bool), std::__1::tuple&lt;IPC::Attachment, bool, bool&gt;, 0ul, 1ul, 2ul&gt;(WebKit::WebInspectorProxy*, void (WebKit::WebInspectorProxy::*)(IPC::Attachment, bool, bool), std::__1::tuple&lt;IPC::Attachment, bool, bool&gt;&amp;&amp;, std::index_sequence&lt;0ul, 1ul, 2ul&gt;)
7   0x113c71598 void IPC::callMemberFunction&lt;WebKit::WebInspectorProxy, void (WebKit::WebInspectorProxy::*)(IPC::Attachment, bool, bool), std::__1::tuple&lt;IPC::Attachment, bool, bool&gt;, std::make_index_sequence&lt;3ul&gt; &gt;(std::__1::tuple&lt;IPC::Attachment, bool, bool&gt;&amp;&amp;, WebKit::WebInspectorProxy*, void (WebKit::WebInspectorProxy::*)(IPC::Attachment, bool, bool))
8   0x113c7070f void IPC::handleMessage&lt;Messages::WebInspectorProxy::CreateInspectorPage, WebKit::WebInspectorProxy, void (WebKit::WebInspectorProxy::*)(IPC::Attachment, bool, bool)&gt;(IPC::MessageDecoder&amp;, WebKit::WebInspectorProxy*, void (WebKit::WebInspectorProxy::*)(IPC::Attachment, bool, bool))
9   0x113c6fec5 WebKit::WebInspectorProxy::didReceiveMessage(IPC::Connection&amp;, IPC::MessageDecoder&amp;)
10  0x113c705e7 non-virtual thunk to WebKit::WebInspectorProxy::didReceiveMessage(IPC::Connection&amp;, IPC::MessageDecoder&amp;)
11  0x1136d1eff IPC::MessageReceiverMap::dispatchMessage(IPC::Connection&amp;, IPC::MessageDecoder&amp;)
12  0x113553ad7 WebKit::ChildProcessProxy::dispatchMessage(IPC::Connection&amp;, IPC::MessageDecoder&amp;)
13  0x113ead3ca WebKit::WebProcessProxy::didReceiveMessage(IPC::Connection&amp;, IPC::MessageDecoder&amp;)
14  0x113ead4c7 non-virtual thunk to WebKit::WebProcessProxy::didReceiveMessage(IPC::Connection&amp;, IPC::MessageDecoder&amp;)
15  0x113561c63 IPC::Connection::dispatchMessage(IPC::MessageDecoder&amp;)
16  0x113558b91 IPC::Connection::dispatchMessage(std::__1::unique_ptr&lt;IPC::MessageDecoder, std::__1::default_delete&lt;IPC::MessageDecoder&gt; &gt;)
17  0x11356225f IPC::Connection::dispatchOneMessage()
18  0x1135735bd IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr&lt;IPC::MessageDecoder, std::__1::default_delete&lt;IPC::MessageDecoder&gt; &gt;)::$_10::operator()() const
19  0x11357358d void std::__1::__invoke_void_return_wrapper&lt;void&gt;::__call&lt;IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr&lt;IPC::MessageDecoder, std::__1::default_delete&lt;IPC::MessageDecoder&gt; &gt;)::$_10&amp;&gt;(IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr&lt;IPC::MessageDecoder, std::__1::default_delete&lt;IPC::MessageDecoder&gt; &gt;)::$_10&amp;&amp;&amp;)
20  0x1135733dc std::__1::__function::__func&lt;IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr&lt;IPC::MessageDecoder, std::__1::default_delete&lt;IPC::MessageDecoder&gt; &gt;)::$_10, std::__1::allocator&lt;IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr&lt;IPC::MessageDecoder, std::__1::default_delete&lt;IPC::MessageDecoder&gt; &gt;)::$_10&gt;, void ()&gt;::operator()()
21  0x110896a3a std::__1::function&lt;void ()&gt;::operator()() const
22  0x110eba792 WTF::RunLoop::performWork()
23  0x110ebaed4 WTF::RunLoop::performWork(void*)
24  0x7fff985e75c1 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__
25  0x7fff985d941c __CFRunLoopDoSources0
26  0x7fff985d893f __CFRunLoopRun
27  0x7fff985d8338 CFRunLoopRunSpecific
28  0x7fff96609935 RunCurrentEventLoopInMode
29  0x7fff96609677 ReceiveNextEventCommon
30  0x7fff966095af _BlockUntilNextEventMatchingListInModeWithFilter
31  0x7fff8d37b38a _DPSNextEvent</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1147861</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2015-12-09 11:00:03 -0800</bug_when>
    <thetext>&lt;rdar://problem/23824211&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1147895</commentid>
    <comment_count>2</comment_count>
      <attachid>267033</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2015-12-09 12:12:50 -0800</bug_when>
    <thetext>Created attachment 267033
Proposed Fix</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1147946</commentid>
    <comment_count>3</comment_count>
      <attachid>267033</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-12-09 14:12:01 -0800</bug_when>
    <thetext>Comment on attachment 267033
Proposed Fix

Clearing flags on attachment: 267033

Committed r193864: &lt;http://trac.webkit.org/changeset/193864&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1147947</commentid>
    <comment_count>4</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-12-09 14:12:05 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1147985</commentid>
    <comment_count>5</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2015-12-09 15:54:57 -0800</bug_when>
    <thetext>Re-opened since this is blocked by bug 152100</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1151491</commentid>
    <comment_count>6</comment_count>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2015-12-28 15:10:31 -0800</bug_when>
    <thetext>Re-investigating this. Looks like we have mixed up the page ids for m_inspectedPage and m_inspectorPage.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1151563</commentid>
    <comment_count>7</comment_count>
      <attachid>267991</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2015-12-29 12:58:27 -0800</bug_when>
    <thetext>Created attachment 267991
Proposed Fix (v2)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1151654</commentid>
    <comment_count>8</comment_count>
      <attachid>268022</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2015-12-30 18:43:09 -0800</bug_when>
    <thetext>Created attachment 268022
Proposed Fix (v2.1)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1152176</commentid>
    <comment_count>9</comment_count>
      <attachid>268152</attachid>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2016-01-03 16:09:02 -0800</bug_when>
    <thetext>Created attachment 268152
Proposed fix (v2.2)

Latest patch fixes typo that caused crash when closing Inspector at quit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1152420</commentid>
    <comment_count>10</comment_count>
      <attachid>268152</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-01-04 11:40:12 -0800</bug_when>
    <thetext>Comment on attachment 268152
Proposed fix (v2.2)

Clearing flags on attachment: 268152

Committed r194544: &lt;http://trac.webkit.org/changeset/194544&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1152421</commentid>
    <comment_count>11</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-01-04 11:40:16 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1152480</commentid>
    <comment_count>12</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-01-04 13:24:38 -0800</bug_when>
    <thetext>Re-opened since this is blocked by bug 152711</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1152486</commentid>
    <comment_count>13</comment_count>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2016-01-04 13:27:15 -0800</bug_when>
    <thetext>Rolling out temporarily. The v2.2 patch regressed from earlier ones, messed up pairing of inspected pages with their ids. The code is correct on the invalidate() path but not the other paths, so we hit an assert when on the invalidate() path because the receiver map has junk in it.

Representative crashing stack trace:

12:33:36.347 91600   ASSERTION FAILED: m_messageReceivers.contains(std::make_pair(messageReceiverName, destinationID))
12:33:36.347 91600   /Volumes/Data/slave/elcapitan-debug/build/Source/WebKit2/Platform/IPC/MessageReceiverMap.cpp(72) : void IPC::MessageReceiverMap::removeMessageReceiver(IPC::StringReference, uint64_t)
12:33:36.347 91600   1   0x10aa46b90 WTFCrash
12:33:36.347 91600   2   0x10ca45470 IPC::MessageReceiverMap::removeMessageReceiver(IPC::StringReference, unsigned long long)
12:33:36.347 91600   3   0x10c8d9d3a WebKit::ChildProcessProxy::removeMessageReceiver(IPC::StringReference, unsigned long long)
12:33:36.347 91600   4   0x10cfce6b6 WebKit::WebInspectorProxy::invalidate()
12:33:36.348 91600   5   0x10d0af9a9 WebKit::WebPageProxy::resetState(WebKit::WebPageProxy::ResetStateReason)
12:33:36.348 91600   6   0x10d0a9035 WebKit::WebPageProxy::close()
12:33:36.348 91600   7   0x10cfd9031 WebKit::WebInspectorProxy::closeTimerFired()
12:33:36.348 91600   8   0x10cfd537e WTF::RunLoop::Timer&lt;WebKit::WebInspectorProxy&gt;::fired()
12:33:36.348 91600   9   0x10aa8fa91 WTF::RunLoop::TimerBase::timerFired(__CFRunLoopTimer*, void*)
12:33:36.348 91600   10  0x7fff94041bc4 __CFRUNLOOP_IS_CALLING_OUT_TO_A_TIMER_CALLBACK_FUNCTION__
12:33:36.348 91600   11  0x7fff94041853 __CFRunLoopDoTimer
12:33:36.348 91600   12  0x7fff940bfe6a __CFRunLoopDoTimers
12:33:36.348 91600   13  0x7fff93ffccd1 __CFRunLoopRun
12:33:36.348 91600   14  0x7fff93ffc338 CFRunLoopRunSpecific
12:33:36.348 91600   15  0x7fff8acd3e61 -[NSRunLoop(NSRunLoop) runMode:beforeDate:]
12:33:36.348 91600   16  0x109b216f6 WTR::TestController::platformRunUntil(bool&amp;, double)
12:33:36.348 91600   17  0x109af6369 WTR::TestController::runUntil(bool&amp;, double)
12:33:36.348 91600   18  0x109af61b2 WTR::TestController::resetStateToConsistentValues()
12:33:36.348 91600   19  0x109b10d9f WTR::TestInvocation::invoke()
12:33:36.348 91600   20  0x109afbc8b WTR::TestController::runTest(char const*)
12:33:36.348 91600   21  0x109afc988 WTR::TestController::runTestingServerLoop()
12:33:36.348 91600   22  0x109af24e7 WTR::TestController::run()
12:33:36.348 91600   23  0x109af2076 WTR::TestController::TestController(int, char const**)
12:33:36.348 91600   24  0x109af26b3 WTR::TestController::TestController(int, char const**)
12:33:36.348 91600   25  0x109adb2df main
12:33:36.348 91600   26  0x7fff9fc515ad start</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1233924</commentid>
    <comment_count>14</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2016-09-27 10:06:46 -0700</bug_when>
    <thetext>Perhaps this explains some mysteries on Web Inspector regression tests?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1234066</commentid>
    <comment_count>15</comment_count>
    <who name="Blaze Burg">bburg</who>
    <bug_when>2016-09-27 14:04:38 -0700</bug_when>
    <thetext>(In reply to comment #14)
&gt; Perhaps this explains some mysteries on Web Inspector regression tests?

Uh, how is that?</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>267033</attachid>
            <date>2015-12-09 12:12:50 -0800</date>
            <delta_ts>2015-12-29 12:58:21 -0800</delta_ts>
            <desc>Proposed Fix</desc>
            <filename>bug-152080-20151209121219.patch</filename>
            <type>text/plain</type>
            <size>1843</size>
            <attacher name="Blaze Burg">bburg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzODQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjFlZjhlNzU2NWYyMzJi
Y2EzNzAwMjk1NWYwMGEwMjZmNmRmYTIwNi4uZjlmNTE1YmU1ZjMwMTZmNDA3ZGFmNmI2YzE5ODNj
ZWM2ZDQ5NmZmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE1LTEyLTA5ICBCcmlh
biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcHJv
ZHVjaWJsZSBkZWJ1ZyBBU1NFUlQgd2hlbiBpbnNwZWN0aW5nIHRoZSBpbnNwZWN0b3IgKFdLMikK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjA4MAor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhpdCBh
biBhc3NlcnQgdW5kZXJuZWF0aCBDaGlsZFByb2Nlc3NQcm94eTo6YWRkTWVzc2FnZVJlY2VpdmVy
IGJlY2F1c2UKKyAgICAgICAgd2UgdHJpZWQgdG8gY29ubmVjdCB0aGUgaW5zcGVjdG9yIHBhZ2Ug
YW5kIGluc3BlY3RlZCBwYWdlIG1vcmUgdGhhbiBvbmNlLgorICAgICAgICBUaGlzIHJlbGF0aW9u
c2hpcCBpcyBhbHJlYWR5IHNldCB1cCBpbiB0aGUgY29uc3RydWN0b3Igb2YgV2ViUHJvY2Vzc1By
b3h5LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcDoKKyAgICAg
ICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OmVhZ2VybHlDcmVhdGVJbnNwZWN0b3JQYWdl
KToKKworMjAxNS0xMi0wOSAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwogICAgICAg
ICBXZWIgSW5zcGVjdG9yOiB6b29tIHdpdGggQ3RybCArLy0gZG9lc24ndCB3b3JrIGNvcnJlY3Rs
eSB3aGVuIGluc3BlY3RvciBpcyBkb2NrZWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTE1MjA3NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V
SVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz
L1dlYkluc3BlY3RvclByb3h5LmNwcAppbmRleCBiZTYwNmJkYjA0YzhmYzU1MmI4MTkyZjQ4MTAz
ODg5YmRlNzY0MDE0Li44ZGRiYzZmMDc0OTU5NjQzNTEyN2MxZGRkNzcxN2Y3OWUxNzc2ZDgxIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3Bw
CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKQEAg
LTUxMCw3ICs1MTAsNiBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjplYWdlcmx5Q3JlYXRlSW5z
cGVjdG9yUGFnZSgpCiAgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVudCh0b0FQSShtX2luc3Bl
Y3RvclBhZ2UpLCAmbG9hZGVyQ2xpZW50LmJhc2UpOwogICAgIFdLUGFnZVNldFBhZ2VDb250ZXh0
TWVudUNsaWVudCh0b0FQSShtX2luc3BlY3RvclBhZ2UpLCAmY29udGV4dE1lbnVDbGllbnQuYmFz
ZSk7CiAKLSAgICBtX2luc3BlY3RvclBhZ2UtPnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIo
TWVzc2FnZXM6OldlYkluc3BlY3RvclByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1faW5z
cGVjdGVkUGFnZS0+cGFnZUlEKCksICp0aGlzKTsKICAgICBtX2luc3BlY3RvclBhZ2UtPnByb2Nl
c3MoKS5hc3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0
b3JCYXNlVVJMKCkpOwogfQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>267991</attachid>
            <date>2015-12-29 12:58:27 -0800</date>
            <delta_ts>2015-12-30 18:43:04 -0800</delta_ts>
            <desc>Proposed Fix (v2)</desc>
            <filename>bug-152080-20151229125751.patch</filename>
            <type>text/plain</type>
            <size>4126</size>
            <attacher name="Blaze Burg">bburg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjM2Y2MxOWZlOWFlYjgx
NmU1MTFiOTc0MTI5ZGJhYjg4NDNiZjc3My4uZDRhNTkxZmRlNjlmN2M3NWJhZWMxNTE5NTU4N2Nj
ZTdiMzFjMDI5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTEyLTI4ICBCcmlh
biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcHJv
ZHVjaWJsZSBkZWJ1ZyBBU1NFUlQgd2hlbiBpbnNwZWN0aW5nIHRoZSBpbnNwZWN0b3IgKFdLMikK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjA4MAor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhpdCBh
biBhc3NlcnQgdW5kZXJuZWF0aCBDaGlsZFByb2Nlc3NQcm94eTo6YWRkTWVzc2FnZVJlY2VpdmVy
IHdoZW4gb3BlbmluZyBJbnNwZWN0b3JbMl0KKyAgICAgICAgYmVjYXVzZSB3ZSB0cnkgdG8gYWRk
IFdlYklucGVjdG9yUHJveHkgYXMgYSBtZXNzYWdlIHJlY2VpdmVyIHR3aWNlIGZvciB0aGUgc2Ft
ZSBwcm9jZXNzLgorCisgICAgICAgIE9uIGludmVzdGlnYXRpbmcsIEkgZm91bmQgc2V2ZXJhbCBp
bnRlcnJlbGF0ZWQgaXNzdWVzIHRoYXQgY2F1c2VkIHRoaXMgc3RhdGUgb2YgYWZmYWlyczoKKwor
ICAgICAgICAgLSBXZWJJbnNwZWN0b3JQcm94eSBhZGRzIG1lc3NhZ2UgcmVjZWl2ZXJzIGZvciBp
bnNwZWN0b3IgcGFnZSdzIFdlYlByb2Nlc3MgYW5kIHRoZQorICAgICAgICBpbnNwZWN0ZWQgcGFn
ZSdzIFdlYlByb2Nlc3MuIFdoZW4gaW5zcGVjdGluZyB0aGUgaW5zcGVjdG9yLCB3ZSBtaXN0YWtl
bmx5IGFkZCBhIHJlY2VpdmVyCisgICAgICAgIGFnYWluIGJlY2F1c2UgdGhlIGluc3BlY3RvciBp
cyBub3cgdGhlIGluc3BlY3RlZCBwYWdlLgorICAgICAgICAgLSBXZSBtaXhlZCB1cCBwcm9jZXNz
IGlkcyB3aGVuIGFkZGluZyBtZXNzYWdlIHJlY2VpdmVycy4KKyAgICAgICAgIC0gaW52YWxpZGF0
ZSgpIGlzIHJlLWVudHJhbnQsIGNhdXNpbmcgdXMgdG8gdHJ5IGFuZCBkb3VibGUtcmVtb3ZlIHRo
ZSBtZXNzYWdlIHJlY2VpdmVyLgorCisgICAgICAgIEZpeCB0aGlzIGJ5IHJlbW92aW5nIGFkZC9y
ZW1vdmUgb2YgbWVzc2FnZSByZWNpZXZlcnMgZm9yIHRoZSBpbnNwZWN0b3IgcGFnZS4KKyAgICAg
ICAgVGhlc2UgcmVjZWl2ZXJzIGFyZSBtYW5hZ2VkIGJ5IHRoZSBpbnNwZWN0b3IgcGFnZSdzIFdl
Ykluc3BlY3RvclByb3h5IGluc3RhbmNlLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkluc3Bl
Y3RvclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OmludmFs
aWRhdGUpOiBSZS1hcnJhbmdlIHRvIGd1YXJkIGFnYWluc3QgdXNlbGVzcyByZWVudHJhbmN5Lgor
ICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6ZGlkUmVsYXVuY2hJbnNwZWN0b3JQ
YWdlUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjplYWdlcmx5
Q3JlYXRlSW5zcGVjdG9yUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5
OjpkaWRDbG9zZSk6CisKIDIwMTUtMTItMjUgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29t
PgogCiAgICAgICAgIFN0b3AgbW92aW5nIGxvY2FsIG9iamVjdHMgaW4gcmV0dXJuIHN0YXRlbWVu
dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94
eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCmlu
ZGV4IGY2NWMwMjU5MTMzMDBiNDg1YjAwNWYyMzEyZjdkOGYyNjMxZTdiNmQuLjNlMTJiN2EzMWY4
MjYxMDEyZGMwYTA0ODlkODE1ZmIwM2EyOTY4YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy
L1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ
cm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcApAQCAtMTA4LDEzICsxMDgsMTcgQEAgdm9pZCBX
ZWJJbnNwZWN0b3JQcm94eTo6aW52YWxpZGF0ZSgpCiAgICAgICAgIFdlYkluc3BlY3RvclNlcnZl
cjo6c2luZ2xldG9uKCkudW5yZWdpc3RlclBhZ2UobV9yZW1vdGVJbnNwZWN0aW9uUGFnZUlkKTsK
ICNlbmRpZgogCi0gICAgbV9pbnNwZWN0ZWRQYWdlLT5wcm9jZXNzKCkucmVtb3ZlTWVzc2FnZVJl
Y2VpdmVyKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp
LCBtX2luc3BlY3RlZFBhZ2UtPnBhZ2VJRCgpKTsKKyAgICAvLyBXZSBjYW4gYmUgY2FsbGVkIHJl
ZW50cmFudGx5IHRocm91Z2ggcGxhdGZvcm1JbnZhbGlkYXRlKCksIGluIHdoaWNoIGNhc2Ugbm90
aGluZyBuZWVkcyB0byBiZSBkb25lLgorICAgIGlmICghbV9pbnNwZWN0ZWRQYWdlKQorICAgICAg
ICByZXR1cm47CiAKLSAgICBkaWRDbG9zZSgpOwotICAgIHBsYXRmb3JtSW52YWxpZGF0ZSgpOwor
ICAgIG1faW5zcGVjdGVkUGFnZS0+cHJvY2VzcygpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNz
YWdlczo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0
ZWRQYWdlLT5wYWdlSUQoKSk7CiAKICAgICBwYWdlTGV2ZWxNYXAoKS5yZW1vdmUobV9pbnNwZWN0
ZWRQYWdlKTsKICAgICBtX2luc3BlY3RlZFBhZ2UgPSBudWxscHRyOworCisgICAgZGlkQ2xvc2Uo
KTsKKyAgICBwbGF0Zm9ybUludmFsaWRhdGUoKTsKIH0KIAogLy8gUHVibGljIEFQSXMKQEAgLTE4
MCw3ICsxODQsNiBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpjbG9zZSgpCiAKIHZvaWQgV2Vi
SW5zcGVjdG9yUHJveHk6OmRpZFJlbGF1bmNoSW5zcGVjdG9yUGFnZVByb2Nlc3MoKQogewotICAg
IG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6
V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQYWdl
LT5wYWdlSUQoKSwgKnRoaXMpOwogICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFzc3Vt
ZVJlYWRBY2Nlc3NUb0Jhc2VVUkwoV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvckJhc2VVUkwo
KSk7CiAKICAgICAvLyBXaGVuIGRpZFJlbGF1bmNoSW5zcGVjdG9yUGFnZVByb2Nlc3MgaXMgY2Fs
bGVkIHdlIGNhbiBhc3N1bWUgaXQgaXMgZHVyaW5nIGEgbG9hZCByZXF1ZXN0LgpAQCAtNTEwLDcg
KzUxMyw2IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OmVhZ2VybHlDcmVhdGVJbnNwZWN0b3JQ
YWdlKCkKICAgICBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KHRvQVBJKG1faW5zcGVjdG9yUGFn
ZSksICZsb2FkZXJDbGllbnQuYmFzZSk7CiAgICAgV0tQYWdlU2V0UGFnZUNvbnRleHRNZW51Q2xp
ZW50KHRvQVBJKG1faW5zcGVjdG9yUGFnZSksICZjb250ZXh0TWVudUNsaWVudC5iYXNlKTsKIAot
ICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdl
czo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQ
YWdlLT5wYWdlSUQoKSwgKnRoaXMpOwogICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFz
c3VtZVJlYWRBY2Nlc3NUb0Jhc2VVUkwoV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvckJhc2VV
UkwoKSk7CiB9CiAKQEAgLTU3Miw3ICs1NzQsNiBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5Ojpk
aWRDbG9zZSgpCiAgICAgaWYgKCFtX2luc3BlY3RvclBhZ2UpCiAgICAgICAgIHJldHVybjsKIAot
ICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNz
YWdlczo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0
ZWRQYWdlLT5wYWdlSUQoKSk7CiAgICAgbV9pbnNwZWN0b3JQYWdlID0gbnVsbHB0cjsKIAogICAg
IG1faXNWaXNpYmxlID0gZmFsc2U7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>268022</attachid>
            <date>2015-12-30 18:43:09 -0800</date>
            <delta_ts>2016-01-03 16:08:57 -0800</delta_ts>
            <desc>Proposed Fix (v2.1)</desc>
            <filename>bug-152080-20151230184233.patch</filename>
            <type>text/plain</type>
            <size>4548</size>
            <attacher name="Blaze Burg">bburg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjM2Y2MxOWZlOWFlYjgx
NmU1MTFiOTc0MTI5ZGJhYjg4NDNiZjc3My4uNWNiMjA2OGQxZjRmMzQyNWNiNmM0NzVmNWQxMGRm
ZWU4MGE3YWMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTEyLTI4ICBCcmlh
biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcHJv
ZHVjaWJsZSBkZWJ1ZyBBU1NFUlQgd2hlbiBpbnNwZWN0aW5nIHRoZSBpbnNwZWN0b3IgKFdLMikK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjA4MAor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhpdCBh
biBhc3NlcnQgdW5kZXJuZWF0aCBDaGlsZFByb2Nlc3NQcm94eTo6YWRkTWVzc2FnZVJlY2VpdmVy
IHdoZW4gb3BlbmluZyBJbnNwZWN0b3JbMl0KKyAgICAgICAgYmVjYXVzZSB3ZSB0cnkgdG8gYWRk
IFdlYklucGVjdG9yUHJveHkgYXMgYSBtZXNzYWdlIHJlY2VpdmVyIHR3aWNlIGZvciB0aGUgc2Ft
ZSBwcm9jZXNzLgorCisgICAgICAgIE9uIGludmVzdGlnYXRpbmcsIEkgZm91bmQgc2V2ZXJhbCBp
bnRlcnJlbGF0ZWQgaXNzdWVzIHRoYXQgY2F1c2VkIHRoaXMgc3RhdGUgb2YgYWZmYWlyczoKKwor
ICAgICAgICAgLSBXZWJJbnNwZWN0b3JQcm94eSBhZGRzIG1lc3NhZ2UgcmVjZWl2ZXJzIGZvciBp
bnNwZWN0b3IgcGFnZSdzIFdlYlByb2Nlc3MgYW5kIHRoZQorICAgICAgICBpbnNwZWN0ZWQgcGFn
ZSdzIFdlYlByb2Nlc3MuIFdoZW4gaW5zcGVjdGluZyB0aGUgaW5zcGVjdG9yLCB3ZSBtaXN0YWtl
bmx5IGFkZCBhIHJlY2VpdmVyCisgICAgICAgIGFnYWluIGJlY2F1c2UgdGhlIGluc3BlY3RvciBp
cyBub3cgdGhlIGluc3BlY3RlZCBwYWdlLgorICAgICAgICAgLSBXZSBtaXhlZCB1cCBwcm9jZXNz
IGlkcyB3aGVuIGFkZGluZyBtZXNzYWdlIHJlY2VpdmVycy4KKyAgICAgICAgIC0gaW52YWxpZGF0
ZSgpIGlzIHJlLWVudHJhbnQsIGNhdXNpbmcgdXMgdG8gdHJ5IGFuZCBkb3VibGUtcmVtb3ZlIHRo
ZSBtZXNzYWdlIHJlY2VpdmVyLgorCisgICAgICAgIEZpeCB0aGlzIGJ5IHJlbW92aW5nIGFkZC9y
ZW1vdmUgb2YgbWVzc2FnZSByZWNpZXZlcnMgZm9yIHRoZSBpbnNwZWN0b3IgcGFnZSB3aGVuIHRo
ZW4KKyAgICAgICAgaW5zcGVjdGVkIHBhZ2UgaXMgaXRzZWxmIGFuIGluc3BlY3RvciBwYWdlLiBJ
biB0aGF0IGNhc2UsIHRoZSByZWNlaXZlcnMgYXJlIG1hbmFnZWQgYnkKKyAgICAgICAgdGhlIGlu
c3BlY3RvciBwYWdlJ3MgV2ViSW5zcGVjdG9yUHJveHkgaW5zdGFuY2UuCisKKyAgICAgICAgKiBV
SVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw
ZWN0b3JQcm94eTo6aW52YWxpZGF0ZSk6IFJlLWFycmFuZ2UgdG8gZ3VhcmQgYWdhaW5zdCB1c2Vs
ZXNzIHJlZW50cmFuY3kuCisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpkaWRS
ZWxhdW5jaEluc3BlY3RvclBhZ2VQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVj
dG9yUHJveHk6OmVhZ2VybHlDcmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAgICAgKFdlYktpdDo6
V2ViSW5zcGVjdG9yUHJveHk6OmRpZENsb3NlKToKKwogMjAxNS0xMi0yNSAgQW5keSBFc3RlcyAg
PGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCBtb3ZpbmcgbG9jYWwgb2JqZWN0cyBp
biByZXR1cm4gc3RhdGVtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz
L1dlYkluc3BlY3RvclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNw
ZWN0b3JQcm94eS5jcHAKaW5kZXggZjY1YzAyNTkxMzMwMGI0ODViMDA1ZjIzMTJmN2Q4ZjI2MzFl
N2I2ZC4uNDBlYzY1YzMzMjQwOGVmMmZmZjdkYmUzM2RmZmUxNTRhYjMzYWIxZSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcAorKysgYi9T
b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCkBAIC0xMDgsMTMg
KzEwOCwxNyBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjppbnZhbGlkYXRlKCkKICAgICAgICAg
V2ViSW5zcGVjdG9yU2VydmVyOjpzaW5nbGV0b24oKS51bnJlZ2lzdGVyUGFnZShtX3JlbW90ZUlu
c3BlY3Rpb25QYWdlSWQpOwogI2VuZGlmCiAKLSAgICBtX2luc3BlY3RlZFBhZ2UtPnByb2Nlc3Mo
KS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYkluc3BlY3RvclByb3h5OjptZXNz
YWdlUmVjZWl2ZXJOYW1lKCksIG1faW5zcGVjdGVkUGFnZS0+cGFnZUlEKCkpOworICAgIC8vIFdl
IGNhbiBiZSBjYWxsZWQgcmVlbnRyYW50bHkgdGhyb3VnaCBwbGF0Zm9ybUludmFsaWRhdGUoKSwg
aW4gd2hpY2ggY2FzZSBub3RoaW5nIG5lZWRzIHRvIGJlIGRvbmUuCisgICAgaWYgKCFtX2luc3Bl
Y3RlZFBhZ2UpCisgICAgICAgIHJldHVybjsKIAotICAgIGRpZENsb3NlKCk7Ci0gICAgcGxhdGZv
cm1JbnZhbGlkYXRlKCk7CisgICAgbV9pbnNwZWN0ZWRQYWdlLT5wcm9jZXNzKCkucmVtb3ZlTWVz
c2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JQcm94eTo6bWVzc2FnZVJlY2VpdmVy
TmFtZSgpLCBtX2luc3BlY3RlZFBhZ2UtPnBhZ2VJRCgpKTsKIAogICAgIHBhZ2VMZXZlbE1hcCgp
LnJlbW92ZShtX2luc3BlY3RlZFBhZ2UpOwogICAgIG1faW5zcGVjdGVkUGFnZSA9IG51bGxwdHI7
CisKKyAgICBkaWRDbG9zZSgpOworICAgIHBsYXRmb3JtSW52YWxpZGF0ZSgpOwogfQogCiAvLyBQ
dWJsaWMgQVBJcwpAQCAtMTgwLDcgKzE4NCw2IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OmNs
b3NlKCkKIAogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6ZGlkUmVsYXVuY2hJbnNwZWN0b3JQYWdl
UHJvY2VzcygpCiB7Ci0gICAgbV9pbnNwZWN0b3JQYWdlLT5wcm9jZXNzKCkuYWRkTWVzc2FnZVJl
Y2VpdmVyKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp
LCBtX2luc3BlY3RlZFBhZ2UtPnBhZ2VJRCgpLCAqdGhpcyk7CiAgICAgbV9pbnNwZWN0b3JQYWdl
LT5wcm9jZXNzKCkuYXNzdW1lUmVhZEFjY2Vzc1RvQmFzZVVSTChXZWJJbnNwZWN0b3JQcm94eTo6
aW5zcGVjdG9yQmFzZVVSTCgpKTsKIAogICAgIC8vIFdoZW4gZGlkUmVsYXVuY2hJbnNwZWN0b3JQ
YWdlUHJvY2VzcyBpcyBjYWxsZWQgd2UgY2FuIGFzc3VtZSBpdCBpcyBkdXJpbmcgYSBsb2FkIHJl
cXVlc3QuCkBAIC01MTAsNyArNTEzLDggQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6ZWFnZXJs
eUNyZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQodG9B
UEkobV9pbnNwZWN0b3JQYWdlKSwgJmxvYWRlckNsaWVudC5iYXNlKTsKICAgICBXS1BhZ2VTZXRQ
YWdlQ29udGV4dE1lbnVDbGllbnQodG9BUEkobV9pbnNwZWN0b3JQYWdlKSwgJmNvbnRleHRNZW51
Q2xpZW50LmJhc2UpOwogCi0gICAgbV9pbnNwZWN0b3JQYWdlLT5wcm9jZXNzKCkuYWRkTWVzc2Fn
ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFt
ZSgpLCBtX2luc3BlY3RlZFBhZ2UtPnBhZ2VJRCgpLCAqdGhpcyk7CisgICAgaWYgKGluc3BlY3Rp
b25MZXZlbCgpID09IDEpCisgICAgICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFkZE1l
c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZl
ck5hbWUoKSwgbV9pbnNwZWN0ZWRQYWdlLT5wYWdlSUQoKSwgKnRoaXMpOwogICAgIG1faW5zcGVj
dG9yUGFnZS0+cHJvY2VzcygpLmFzc3VtZVJlYWRBY2Nlc3NUb0Jhc2VVUkwoV2ViSW5zcGVjdG9y
UHJveHk6Omluc3BlY3RvckJhc2VVUkwoKSk7CiB9CiAKQEAgLTU3Miw3ICs1NzYsOSBAQCB2b2lk
IFdlYkluc3BlY3RvclByb3h5OjpkaWRDbG9zZSgpCiAgICAgaWYgKCFtX2luc3BlY3RvclBhZ2Up
CiAgICAgICAgIHJldHVybjsKIAotICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLnJlbW92
ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNl
aXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQYWdlLT5wYWdlSUQoKSk7CisgICAgaWYgKGluc3BlY3Rp
b25MZXZlbCgpID09IDEpCisgICAgICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLnJlbW92
ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNl
aXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQYWdlLT5wYWdlSUQoKSk7CisKICAgICBtX2luc3BlY3Rv
clBhZ2UgPSBudWxscHRyOwogCiAgICAgbV9pc1Zpc2libGUgPSBmYWxzZTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>268152</attachid>
            <date>2016-01-03 16:09:02 -0800</date>
            <delta_ts>2016-01-04 11:40:12 -0800</delta_ts>
            <desc>Proposed fix (v2.2)</desc>
            <filename>bug-152080-20160103160828.patch</filename>
            <type>text/plain</type>
            <size>4756</size>
            <attacher name="Blaze Burg">bburg</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTY4OGY0MjcyM2ZlM2I2
OGQ2N2Y2NWY4YmYzYTNkNTMzZmYxZWM0ZC4uYjE3YzRmNzg2MzMyZGU3YzhmMTZmYTE0NmI5MDFk
M2M3N2E0OTg0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTEyLTI4ICBCcmlh
biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlcHJv
ZHVjaWJsZSBkZWJ1ZyBBU1NFUlQgd2hlbiBpbnNwZWN0aW5nIHRoZSBpbnNwZWN0b3IgKFdLMikK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjA4MAor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhpdCBh
biBhc3NlcnQgdW5kZXJuZWF0aCBDaGlsZFByb2Nlc3NQcm94eTo6YWRkTWVzc2FnZVJlY2VpdmVy
IHdoZW4gb3BlbmluZyBJbnNwZWN0b3JbMl0KKyAgICAgICAgYmVjYXVzZSB3ZSB0cnkgdG8gYWRk
IFdlYklucGVjdG9yUHJveHkgYXMgYSBtZXNzYWdlIHJlY2VpdmVyIHR3aWNlIGZvciB0aGUgc2Ft
ZSBwcm9jZXNzLgorCisgICAgICAgIE9uIGludmVzdGlnYXRpbmcsIEkgZm91bmQgc2V2ZXJhbCBp
bnRlcnJlbGF0ZWQgaXNzdWVzIHRoYXQgY2F1c2VkIHRoaXMgc3RhdGUgb2YgYWZmYWlyczoKKwor
ICAgICAgICAgLSBXZWJJbnNwZWN0b3JQcm94eSBhZGRzIG1lc3NhZ2UgcmVjZWl2ZXJzIGZvciBp
bnNwZWN0b3IgcGFnZSdzIFdlYlByb2Nlc3MgYW5kIHRoZQorICAgICAgICBpbnNwZWN0ZWQgcGFn
ZSdzIFdlYlByb2Nlc3MuIFdoZW4gaW5zcGVjdGluZyB0aGUgaW5zcGVjdG9yLCB3ZSBtaXN0YWtl
bmx5IGFkZCBhIHJlY2VpdmVyCisgICAgICAgIGFnYWluIGJlY2F1c2UgdGhlIGluc3BlY3RvciBp
cyBub3cgdGhlIGluc3BlY3RlZCBwYWdlLgorICAgICAgICAgLSBXZSBtaXhlZCB1cCBwcm9jZXNz
IGlkcyB3aGVuIGFkZGluZyBtZXNzYWdlIHJlY2VpdmVycy4KKyAgICAgICAgIC0gaW52YWxpZGF0
ZSgpIGlzIHJlLWVudHJhbnQsIGNhdXNpbmcgdXMgdG8gdHJ5IGFuZCBkb3VibGUtcmVtb3ZlIHRo
ZSBtZXNzYWdlIHJlY2VpdmVyLgorCisgICAgICAgIEZpeCB0aGlzIGJ5IHJlbW92aW5nIGFkZC9y
ZW1vdmUgb2YgbWVzc2FnZSByZWNpZXZlcnMgZm9yIHRoZSBpbnNwZWN0b3IgcGFnZSB3aGVuIHRo
ZW4KKyAgICAgICAgaW5zcGVjdGVkIHBhZ2UgaXMgaXRzZWxmIGFuIGluc3BlY3RvciBwYWdlLiBJ
biB0aGF0IGNhc2UsIHRoZSByZWNlaXZlcnMgYXJlIG1hbmFnZWQgYnkKKyAgICAgICAgdGhlIGlu
c3BlY3RvciBwYWdlJ3MgV2ViSW5zcGVjdG9yUHJveHkgaW5zdGFuY2UuCisKKyAgICAgICAgKiBV
SVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw
ZWN0b3JQcm94eTo6aW52YWxpZGF0ZSk6IFJlLWFycmFuZ2UgdG8gZ3VhcmQgYWdhaW5zdCB1c2Vs
ZXNzIHJlZW50cmFuY3kuCisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpkaWRS
ZWxhdW5jaEluc3BlY3RvclBhZ2VQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVj
dG9yUHJveHk6OmVhZ2VybHlDcmVhdGVJbnNwZWN0b3JQYWdlKToKKyAgICAgICAgKFdlYktpdDo6
V2ViSW5zcGVjdG9yUHJveHk6OmRpZENsb3NlKToKKwogMjAxNi0wMS0wMyAgU2ltb24gRnJhc2Vy
ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgc2Nyb2xsUG9zaXRp
b24oU2Nyb2xsYmFyKikgdG8gc2Nyb2xsT2Zmc2V0KFNjcm9sbGJhck9yaWVudGF0aW9uKQpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcCBi
L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKaW5kZXggYzY0
MzNlYjg2YjYyODRhNzc5OThjNDQ3OTc4NTM3NWMyMzE2OWYyZC4uNmU1OTFmYzdiNmM5MTIzYWM4
ZjcyN2YzNWU4YzEwNzViYmZiZTEzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j
ZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv
V2ViSW5zcGVjdG9yUHJveHkuY3BwCkBAIC0xMDgsMTMgKzEwOCwxNyBAQCB2b2lkIFdlYkluc3Bl
Y3RvclByb3h5OjppbnZhbGlkYXRlKCkKICAgICAgICAgV2ViSW5zcGVjdG9yU2VydmVyOjpzaW5n
bGV0b24oKS51bnJlZ2lzdGVyUGFnZShtX3JlbW90ZUluc3BlY3Rpb25QYWdlSWQpOwogI2VuZGlm
CiAKLSAgICBtX2luc3BlY3RlZFBhZ2UtPnByb2Nlc3MoKS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIo
TWVzc2FnZXM6OldlYkluc3BlY3RvclByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1faW5z
cGVjdGVkUGFnZS0+cGFnZUlEKCkpOworICAgIC8vIFdlIGNhbiBiZSBjYWxsZWQgcmVlbnRyYW50
bHkgdGhyb3VnaCBwbGF0Zm9ybUludmFsaWRhdGUoKSwgaW4gd2hpY2ggY2FzZSBub3RoaW5nIG5l
ZWRzIHRvIGJlIGRvbmUuCisgICAgaWYgKCFtX2luc3BlY3RlZFBhZ2UpCisgICAgICAgIHJldHVy
bjsKIAotICAgIGRpZENsb3NlKCk7Ci0gICAgcGxhdGZvcm1JbnZhbGlkYXRlKCk7CisgICAgbV9p
bnNwZWN0ZWRQYWdlLT5wcm9jZXNzKCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpX
ZWJJbnNwZWN0b3JQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX2luc3BlY3RlZFBhZ2Ut
PnBhZ2VJRCgpKTsKIAogICAgIHBhZ2VMZXZlbE1hcCgpLnJlbW92ZShtX2luc3BlY3RlZFBhZ2Up
OwogICAgIG1faW5zcGVjdGVkUGFnZSA9IG51bGxwdHI7CisKKyAgICBkaWRDbG9zZSgpOworICAg
IHBsYXRmb3JtSW52YWxpZGF0ZSgpOwogfQogCiAvLyBQdWJsaWMgQVBJcwpAQCAtMTgwLDcgKzE4
NCw4IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OmNsb3NlKCkKIAogdm9pZCBXZWJJbnNwZWN0
b3JQcm94eTo6ZGlkUmVsYXVuY2hJbnNwZWN0b3JQYWdlUHJvY2VzcygpCiB7Ci0gICAgbV9pbnNw
ZWN0b3JQYWdlLT5wcm9jZXNzKCkuYWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJJbnNw
ZWN0b3JQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX2luc3BlY3RlZFBhZ2UtPnBhZ2VJ
RCgpLCAqdGhpcyk7CisgICAgaWYgKGluc3BlY3Rpb25MZXZlbCgpID09IDEpCisgICAgICAgIG1f
aW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2Vi
SW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQYWdlLT5w
YWdlSUQoKSwgKnRoaXMpOwogICAgIG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFzc3VtZVJl
YWRBY2Nlc3NUb0Jhc2VVUkwoV2ViSW5zcGVjdG9yUHJveHk6Omluc3BlY3RvckJhc2VVUkwoKSk7
CiAKICAgICAvLyBXaGVuIGRpZFJlbGF1bmNoSW5zcGVjdG9yUGFnZVByb2Nlc3MgaXMgY2FsbGVk
IHdlIGNhbiBhc3N1bWUgaXQgaXMgZHVyaW5nIGEgbG9hZCByZXF1ZXN0LgpAQCAtNTEwLDcgKzUx
NSw4IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OmVhZ2VybHlDcmVhdGVJbnNwZWN0b3JQYWdl
KCkKICAgICBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KHRvQVBJKG1faW5zcGVjdG9yUGFnZSks
ICZsb2FkZXJDbGllbnQuYmFzZSk7CiAgICAgV0tQYWdlU2V0UGFnZUNvbnRleHRNZW51Q2xpZW50
KHRvQVBJKG1faW5zcGVjdG9yUGFnZSksICZjb250ZXh0TWVudUNsaWVudC5iYXNlKTsKIAotICAg
IG1faW5zcGVjdG9yUGFnZS0+cHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6
V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pbnNwZWN0ZWRQYWdl
LT5wYWdlSUQoKSwgKnRoaXMpOworICAgIGlmIChpbnNwZWN0aW9uTGV2ZWwoKSA9PSAxKQorICAg
ICAgICBtX2luc3BlY3RvclBhZ2UtPnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2Fn
ZXM6OldlYkluc3BlY3RvclByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1faW5zcGVjdGVk
UGFnZS0+cGFnZUlEKCksICp0aGlzKTsKICAgICBtX2luc3BlY3RvclBhZ2UtPnByb2Nlc3MoKS5h
c3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JCYXNl
VVJMKCkpOwogfQogCkBAIC01NzIsNyArNTc4LDkgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6
ZGlkQ2xvc2UoKQogICAgIGlmICghbV9pbnNwZWN0b3JQYWdlKQogICAgICAgICByZXR1cm47CiAK
LSAgICBtX2luc3BlY3RvclBhZ2UtPnByb2Nlc3MoKS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVz
c2FnZXM6OldlYkluc3BlY3RvclByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1faW5zcGVj
dGVkUGFnZS0+cGFnZUlEKCkpOworICAgIGlmIChpbnNwZWN0aW9uTGV2ZWwoKSA9PSAxKQorICAg
ICAgICBtX2luc3BlY3RvclBhZ2UtPnByb2Nlc3MoKS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVz
c2FnZXM6OldlYkluc3BlY3RvclByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1faW5zcGVj
dG9yUGFnZS0+cGFnZUlEKCkpOworCiAgICAgbV9pbnNwZWN0b3JQYWdlID0gbnVsbHB0cjsKIAog
ICAgIG1faXNWaXNpYmxlID0gZmFsc2U7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>