aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-12-05 07:05:25 +0800
committerChristian Persch <chpe@src.gnome.org>2003-12-05 07:05:25 +0800
commit03d9a4160c0a00986d894ac7241f57509a6d80a6 (patch)
tree9944be8b8d210fddf0dd80890bbf841a0b42431d
parente465ffe1f5726b96f32207b092ea6033f195b779 (diff)
downloadgsoc2013-epiphany-03d9a4160c0a00986d894ac7241f57509a6d80a6.tar
gsoc2013-epiphany-03d9a4160c0a00986d894ac7241f57509a6d80a6.tar.gz
gsoc2013-epiphany-03d9a4160c0a00986d894ac7241f57509a6d80a6.tar.bz2
gsoc2013-epiphany-03d9a4160c0a00986d894ac7241f57509a6d80a6.tar.lz
gsoc2013-epiphany-03d9a4160c0a00986d894ac7241f57509a6d80a6.tar.xz
gsoc2013-epiphany-03d9a4160c0a00986d894ac7241f57509a6d80a6.tar.zst
gsoc2013-epiphany-03d9a4160c0a00986d894ac7241f57509a6d80a6.zip
Add some missing NULL checks. Maybe fixes bug #128553.
2003-12-05 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyWrapper.cpp: Add some missing NULL checks. Maybe fixes bug #128553.
-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)