[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 2 commits: Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl, valentin

["Richard Pospesel \(@richard\) via tor-commits" <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

Title: GitLab

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

Commits:

• 03f8127e
  by Rob Wu at 2023-03-15T12:03:27+00:00

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

• 7ed39eac
  by Kash Shampur at 2023-03-15T12:03:27+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:

dom/fetch/FetchDriver.cpp

---

...	...	@@ -1178,14 +1178,6 @@ FetchDriver::OnStartRequest(nsIRequest* aRequest) {
1178	1178
1179	1179	response->InitChannelInfo(channel);
1180	1180
1181		- nsCOMPtr<nsIURI> channelURI;
1182		- rv = channel->GetURI(getter_AddRefs(channelURI));
1183		- if (NS_WARN_IF(NS_FAILED(rv))) {
1184		- FailWithNetworkError(rv);
1185		- // Cancel request.
1186		- return rv;
1187		- }
1188		-
1189	1181	nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo();
1190	1182	// Propagate any tainting from the channel back to our response here. This
1191	1183	// step is not reflected in the spec because the spec is written such that
...	...	@@ -1501,7 +1493,7 @@ FetchDriver::AsyncOnChannelRedirect(nsIChannel* aOldChannel,
1501	1493	// Response.redirected to true if an internal redirect occurs. These
1502	1494	// should be transparent to script.
1503	1495	nsCOMPtr<nsIURI> uri;
1504		- MOZ_ALWAYS_SUCCEEDS(aNewChannel->GetURI(getter_AddRefs(uri)));
	1496	+ MOZ_ALWAYS_SUCCEEDS(NS_GetFinalChannelURI(aNewChannel, getter_AddRefs(uri)));
1505	1497
1506	1498	nsCOMPtr<nsIURI> uriClone;
1507	1499	nsresult rv = NS_GetURIWithoutRef(uri, getter_AddRefs(uriClone));

mozglue/baseprofiler/public/ProfileChunkedBuffer.h

---

...	...	@@ -1088,6 +1088,12 @@ class ProfileChunkedBuffer {
1088	1088	MOZ_ASSERT(maybeEntryWriter->RemainingBytes() == blockBytes);
1089	1089	mRangeEnd += blockBytes;
1090	1090	mPushedBlockCount += aBlockCount;
	1091	+ } else if (blockBytes >= current->BufferBytes()) {
	1092	+ // Currently only two buffer chunks are held at a time and it is not
	1093	+ // possible to write an object that takes up more space than this. In
	1094	+ // this scenario, silently discard this block of data if it is unable
	1095	+ // to fit into the two reserved profiler chunks.
	1096	+ mFailedPutBytes += blockBytes;
1091	1097	} else {
1092	1098	// Block doesn't fit fully in current chunk, it needs to overflow into
1093	1099	// the next one.

—
View it on GitLab.
You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits