aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EphyWrapper.cpp6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a29efa4bb..fb9c82a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-05 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/EphyWrapper.cpp:
+
+ Add some missing NULL checks. Maybe fixes bug #128553.
+
2003-12-02 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-history.c: (ephy_history_load):
diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp
index e9805bb7b..63908dc5d 100644
--- a/embed/mozilla/EphyWrapper.cpp
+++ b/embed/mozilla/EphyWrapper.cpp
@@ -584,6 +584,7 @@ nsresult EphyWrapper::GetMainDocumentUrl (nsCString &url)
nsCOMPtr<nsIURI> uri;
doc->GetDocumentURL(getter_AddRefs(uri));
+ if (!uri) return NS_ERROR_FAILURE;
return uri->GetSpec (url);
}
@@ -602,10 +603,9 @@ nsresult EphyWrapper::GetDocumentUrl (nsCString &url)
nsCOMPtr<nsIURI> uri;
doc->GetDocumentURL(getter_AddRefs(uri));
+ if (!uri) return NS_ERROR_FAILURE;
- uri->GetSpec (url);
-
- return NS_OK;
+ return uri->GetSpec (url);
}
nsresult EphyWrapper::CopyHistoryTo (EphyWrapper *dest)