[epiphany] uri-helpers: be robust to NULL SoupURIs
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] uri-helpers: be robust to NULL SoupURIs
- Date: Fri, 16 Dec 2016 18:29:13 +0000 (UTC)
commit 05d81a59835c5b2f25c4fe33cc9f5005b79fad87
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Fri Dec 16 12:10:51 2016 -0600
uri-helpers: be robust to NULL SoupURIs
This probably should never happen here, but there's no reason to crash
if it does.
lib/ephy-uri-helpers.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/lib/ephy-uri-helpers.c b/lib/ephy-uri-helpers.c
index 53e5dd1..5dd0205 100644
--- a/lib/ephy-uri-helpers.c
+++ b/lib/ephy-uri-helpers.c
@@ -274,7 +274,7 @@ ephy_uri_decode (const char *uri_string)
/* Process any punycode in the host portion of the URI. */
uri = soup_uri_new (uri_string);
- if (uri->host != NULL) {
+ if (uri != NULL && uri->host != NULL) {
/* Ideally this context object would be cached and reused across function
* calls. The object is itself threadsafe, but a mutex would still be needed
* to create it and assign it to a local variable, unless we use thread-
@@ -298,7 +298,7 @@ ephy_uri_decode (const char *uri_string)
}
/* Note: this also strips passwords from the display URI. */
- percent_encoded_uri = soup_uri_to_string (uri, FALSE);
+ percent_encoded_uri = uri != NULL ? soup_uri_to_string (uri, FALSE) : g_strdup (uri_string);
soup_uri_free (uri);
/* Now, decode any percent-encoded characters in the URI. If there are null
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]