wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1122532 - ensure making new URIs actually succeeds. r=mcmanus

Browse Source 
--HG--
extra : rebase_source : b45ac17e073bb9751f49d85e39f184687f04e274
This commit is contained in:
Nicholas Hurley 2015-01-16 07:32:26 -08:00
parent d9efaa7f1f
commit be0e7c45ad
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
netwerk/base/src/Predictor.cpp
View File

@ -136,14 +136,15 @@ const char PREDICTOR_ORIGIN_EXTENSION[] = "predictor-origin";
// Get the full origin (scheme, host, port) out of a URI (maybe should be part
// of nsIURI instead?)
static void
static nsresult
ExtractOrigin(nsIURI *uri, nsIURI **originUri, nsIIOService *ioService)
{
nsAutoCString s;
s.Truncate();
nsContentUtils::GetASCIIOrigin(uri, s);
nsresult rv = nsContentUtils::GetASCIIOrigin(uri, s);
NS_ENSURE_SUCCESS(rv, rv);
NS_NewURI(originUri, s, nullptr, nullptr, ioService);
return NS_NewURI(originUri, s, nullptr, nullptr, ioService);
}
// All URIs we get passed *must* be http or https if they're not null. This
@ -837,7 +838,8 @@ Predictor::Predict(nsIURI *targetURI, nsIURI *sourceURI,
// Now we do the origin-only (and therefore predictor-only) entry
nsCOMPtr<nsIURI> targetOrigin;
ExtractOrigin(uriKey, getter_AddRefs(targetOrigin), mIOService);
nsresult rv = ExtractOrigin(uriKey, getter_AddRefs(targetOrigin), mIOService);
NS_ENSURE_SUCCESS(rv, rv);
if (!originKey) {
originKey = targetOrigin;
}
@ -1226,13 +1228,15 @@ Predictor::Learn(nsIURI *targetURI, nsIURI *sourceURI,
nsCOMPtr<nsIURI> sourceOrigin;
nsCOMPtr<nsIURI> uriKey;
nsCOMPtr<nsIURI> originKey;
nsresult rv;
switch (reason) {
case nsINetworkPredictor::LEARN_LOAD_TOPLEVEL:
if (!targetURI || sourceURI) {
return NS_ERROR_INVALID_ARG;
}
ExtractOrigin(targetURI, getter_AddRefs(targetOrigin), mIOService);
rv = ExtractOrigin(targetURI, getter_AddRefs(targetOrigin), mIOService);
NS_ENSURE_SUCCESS(rv, rv);
uriKey = targetURI;
originKey = targetOrigin;
break;
@ -1240,7 +1244,8 @@ Predictor::Learn(nsIURI *targetURI, nsIURI *sourceURI,
if (!targetURI || sourceURI) {
return NS_ERROR_INVALID_ARG;
}
ExtractOrigin(targetURI, getter_AddRefs(targetOrigin), mIOService);
rv = ExtractOrigin(targetURI, getter_AddRefs(targetOrigin), mIOService);
NS_ENSURE_SUCCESS(rv, rv);
uriKey = mStartupURI;
originKey = mStartupURI;
break;
@ -1249,8 +1254,10 @@ Predictor::Learn(nsIURI *targetURI, nsIURI *sourceURI,
if (!targetURI || !sourceURI) {
return NS_ERROR_INVALID_ARG;
}
ExtractOrigin(targetURI, getter_AddRefs(targetOrigin), mIOService);
ExtractOrigin(sourceURI, getter_AddRefs(sourceOrigin), mIOService);
rv = ExtractOrigin(targetURI, getter_AddRefs(targetOrigin), mIOService);
NS_ENSURE_SUCCESS(rv, rv);
rv = ExtractOrigin(sourceURI, getter_AddRefs(sourceOrigin), mIOService);
NS_ENSURE_SUCCESS(rv, rv);
uriKey = sourceURI;
originKey = sourceOrigin;
break;