diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-10-14 18:45:21 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-10-14 18:45:21 +0000 |
| commit | 0beb9543055b4149b0fee9bf2418ef2048eae4f9 (patch) | |
| tree | c9c47be9d588539d093a14922e17df64f4af65df | |
| parent | 163f8a8d714ec5a30696414e7f47db28cece461f (diff) | |
| download | epiphany-0beb9543055b4149b0fee9bf2418ef2048eae4f9.tar.gz | |
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-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -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; |