Richard Pospesel pushed to branch base-browser-102.9.0esr-12.0-1 at The Tor Project / Applications / Tor Browser

Commits:

• 6b886676
  by Rob Wu at 2023-03-15T11:59:23+00:00

  Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl,valentin
  
  Depends on D164656
  
  Differential Revision: https://phabricator.services.mozilla.com/D166108
  

• 42680350
  by Kash Shampur at 2023-03-15T11:59:23+00:00

  Bug 1803109 - Discard blocks of data that are too big for two chunks. r=canaltinova
  
  Currently, `ReserveAndPutRaw` allocates a second span even if the data would be too big for the chunk.
  Here a second conditional is added to check if the block of data is too big in this scenario and silently discard the data if so.
  
  Differential Revision: https://phabricator.services.mozilla.com/D167167

2 changed files:

• dom/fetch/FetchDriver.cpp
• mozglue/baseprofiler/public/ProfileChunkedBuffer.h

Changes:

   response->InitChannelInfo(channel);

-  nsCOMPtr<nsIURI> channelURI;

-  rv = channel->GetURI(getter_AddRefs(channelURI));

-  if (NS_WARN_IF(NS_FAILED(rv))) {

-    FailWithNetworkError(rv);

-    // Cancel request.

-    return rv;

-  }

-

   nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo();

   // Propagate any tainting from the channel back to our response here.  This

   // step is not reflected in the spec because the spec is written such that

   // Response.redirected to true if an internal redirect occurs.  These

   // should be transparent to script.

   nsCOMPtr<nsIURI> uri;

-  MOZ_ALWAYS_SUCCEEDS(aNewChannel->GetURI(getter_AddRefs(uri)));

+  MOZ_ALWAYS_SUCCEEDS(NS_GetFinalChannelURI(aNewChannel, getter_AddRefs(uri)));

   nsCOMPtr<nsIURI> uriClone;

   nsresult rv = NS_GetURIWithoutRef(uri, getter_AddRefs(uriClone));

           MOZ_ASSERT(maybeEntryWriter->RemainingBytes() == blockBytes);

           mRangeEnd += blockBytes;

           mPushedBlockCount += aBlockCount;

+        } else if (blockBytes >= current->BufferBytes()) {

+          // Currently only two buffer chunks are held at a time and it is not

+          // possible to write an object that takes up more space than this. In

+          // this scenario, silently discard this block of data if it is unable

+          // to fit into the two reserved profiler chunks.

+          mFailedPutBytes += blockBytes;

         } else {

           // Block doesn't fit fully in current chunk, it needs to overflow into

           // the next one.