Commit df25c43c authored by valenting's avatar valenting Committed by Pier Angelo Vendrame
Browse files

Bug 2024760 - Handle WebSocketChannel::IsPersistentFramePtr correctly a=diannaS DONTBUILD 

Original Revision: https://phabricator.services.mozilla.com/D288874

Differential Revision: https://phabricator.services.mozilla.com/D290871
parent b58443b9

netwerk/protocol/websocket/WebSocketChannel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ void WebSocketChannel::BeginOpenInternal() { 
}



bool WebSocketChannel::IsPersistentFramePtr() {

  return (mFramePtr >= mBuffer && mFramePtr < mBuffer + mBufferSize);

  return (mFramePtr >= mBuffer && mFramePtr <= mBuffer + mBufferSize);

}



// Extends the internal buffer by count and returns the total
@@ -1462,7 +1462,7 @@ bool WebSocketChannel::UpdateReadBuffer(uint8_t* buffer, uint32_t count, 
    mFramePtr = mBuffer + frameIndex;

  }



  ::memcpy(mBuffer + mBuffered, buffer, count);

  ::memmove(mBuffer + mBuffered, buffer, count);

  mBuffered += count;



  if (available) *available = mBuffered - (mFramePtr - mBuffer);