aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-10-15 02:45:21 +0800
committerChristian Persch <chpe@src.gnome.org>2005-10-15 02:45:21 +0800
commit0beb9543055b4149b0fee9bf2418ef2048eae4f9 (patch)
treec9c47be9d588539d093a14922e17df64f4af65df
parent163f8a8d714ec5a30696414e7f47db28cece461f (diff)
downloadgsoc2013-epiphany-0beb9543055b4149b0fee9bf2418ef2048eae4f9.tar
gsoc2013-epiphany-0beb9543055b4149b0fee9bf2418ef2048eae4f9.tar.gz
gsoc2013-epiphany-0beb9543055b4149b0fee9bf2418ef2048eae4f9.tar.bz2
gsoc2013-epiphany-0beb9543055b4149b0fee9bf2418ef2048eae4f9.tar.lz
gsoc2013-epiphany-0beb9543055b4149b0fee9bf2418ef2048eae4f9.tar.xz
gsoc2013-epiphany-0beb9543055b4149b0fee9bf2418ef2048eae4f9.tar.zst
gsoc2013-epiphany-0beb9543055b4149b0fee9bf2418ef2048eae4f9.zip
Work around mozilla bug
2005-10-14 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/mozilla-embed.cpp: Work around mozilla bug https://bugzilla.mozilla.org/show_bug.cgi?id=312241 .
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/mozilla-embed.cpp3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dbc70541d..fc9b1e1e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-14 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/mozilla-embed.cpp:
+
+ Work around mozilla bug
+ https://bugzilla.mozilla.org/show_bug.cgi?id=312241 .
+
2005-10-12 Philip Langdale <philipl@mail.utexas.edu>
* src/ephy-tab.c: (open_link_in_new_tab):
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 5a684a54e..daeb19eaf 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -587,7 +587,8 @@ impl_get_location (EphyEmbed *embed,
nsCOMPtr<nsIURI> furi;
rv = uri->Clone (getter_AddRefs (furi));
- if (NS_FAILED (rv)) return NULL;
+ /* Some nsIURI impls return NS_OK even though they didn't put anything in the outparam!! */
+ if (NS_FAILED (rv) || !furi) furi.swap(uri);
/* Hide password part */
nsEmbedCString user;