diff --git a/mozilla/browser/components/places/src/nsAnnoProtocolHandler.cpp b/mozilla/browser/components/places/src/nsAnnoProtocolHandler.cpp
index 01ba6633a0a..eac355303f2 100644
--- a/mozilla/browser/components/places/src/nsAnnoProtocolHandler.cpp
+++ b/mozilla/browser/components/places/src/nsAnnoProtocolHandler.cpp
@@ -119,6 +119,7 @@ nsAnnoProtocolHandler::NewURI(const nsACString& aSpec,
 NS_IMETHODIMP
 nsAnnoProtocolHandler::NewChannel(nsIURI *aURI, nsIChannel **_retval)
 {
+  NS_ENSURE_ARG_POINTER(aURI);
   nsresult rv;
 
   nsCAutoString path;
diff --git a/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp b/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp
index fccfbbd544c..204632bf22c 100644
--- a/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp
+++ b/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp
@@ -109,6 +109,7 @@ nsWyciwygProtocolHandler::NewURI(const nsACString &aSpec,
 NS_IMETHODIMP
 nsWyciwygProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result)
 {
+  NS_ENSURE_ARG_POINTER(url);
   nsresult rv;
     
   nsWyciwygChannel* channel = new nsWyciwygChannel();
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPProtocolHandler.cpp b/mozilla/directory/xpcom/base/src/nsLDAPProtocolHandler.cpp
index 87dfe6abf4c..7c7981df971 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPProtocolHandler.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPProtocolHandler.cpp
@@ -118,6 +118,7 @@ NS_IMETHODIMP
 nsLDAPProtocolHandler::NewChannel(nsIURI* uri, 
                                   nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(uri);
     nsresult rv;
     nsLDAPChannel *channel;
 
diff --git a/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp b/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp
index 68d039fda81..7b8434490d5 100644
--- a/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp
+++ b/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp
@@ -245,6 +245,7 @@ NS_IMETHODIMP GeckoProtocolHandlerImpl::NewURI(const nsACString & aSpec, const c
 /* nsIChannel newChannel (in nsIURI aURI); */
 NS_IMETHODIMP GeckoProtocolHandlerImpl::NewChannel(nsIURI *aURI, nsIChannel **_retval)
 {
+    NS_ENSURE_ARG_POINTER(aURI);
     GeckoProtocolChannel *channel = new GeckoProtocolChannel;
     if (!channel)
     {
diff --git a/mozilla/extensions/datetime/nsDateTimeHandler.cpp b/mozilla/extensions/datetime/nsDateTimeHandler.cpp
index 30a77c13e73..bfa11c4e401 100644
--- a/mozilla/extensions/datetime/nsDateTimeHandler.cpp
+++ b/mozilla/extensions/datetime/nsDateTimeHandler.cpp
@@ -125,6 +125,7 @@ NS_IMETHODIMP
 nsDateTimeHandler::NewProxiedChannel(nsIURI* url, nsIProxyInfo* proxyInfo,
                                      nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(url);
     nsresult rv;
     
     nsDateTimeChannel *chan = new nsDateTimeChannel();
diff --git a/mozilla/extensions/finger/nsFingerHandler.cpp b/mozilla/extensions/finger/nsFingerHandler.cpp
index 497ba13f7d4..90bfed5c0ba 100644
--- a/mozilla/extensions/finger/nsFingerHandler.cpp
+++ b/mozilla/extensions/finger/nsFingerHandler.cpp
@@ -127,6 +127,7 @@ NS_IMETHODIMP
 nsFingerHandler::NewProxiedChannel(nsIURI* url, nsIProxyInfo* proxyInfo,
                                    nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(url);
     nsresult rv;
     
     nsFingerChannel *chan = new nsFingerChannel();
diff --git a/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp b/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
index 7707785b7ad..d9ac4a7f04e 100644
--- a/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
+++ b/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
@@ -940,6 +940,7 @@ nsGnomeVFSProtocolHandler::NewURI(const nsACString &aSpec,
 NS_IMETHODIMP
 nsGnomeVFSProtocolHandler::NewChannel(nsIURI *aURI, nsIChannel **aResult)
 {
+  NS_ENSURE_ARG_POINTER(aURI);
   nsresult rv;
 
   nsCAutoString spec;
diff --git a/mozilla/mailnews/compose/src/nsSmtpService.cpp b/mozilla/mailnews/compose/src/nsSmtpService.cpp
index 80f7cb5269c..f92ed230264 100644
--- a/mozilla/mailnews/compose/src/nsSmtpService.cpp
+++ b/mozilla/mailnews/compose/src/nsSmtpService.cpp
@@ -345,6 +345,7 @@ NS_IMETHODIMP nsSmtpService::NewURI(const nsACString &aSpec,
 
 NS_IMETHODIMP nsSmtpService::NewChannel(nsIURI *aURI, nsIChannel **_retval)
 {
+  NS_ENSURE_ARG_POINTER(aURI);
   // create an empty pipe for use with the input stream channel.
   nsCOMPtr<nsIInputStream> pipeIn;
   nsCOMPtr<nsIOutputStream> pipeOut;
diff --git a/mozilla/mailnews/local/src/nsMailboxService.cpp b/mozilla/mailnews/local/src/nsMailboxService.cpp
index f1057e0ddfb..406d1523c39 100644
--- a/mozilla/mailnews/local/src/nsMailboxService.cpp
+++ b/mozilla/mailnews/local/src/nsMailboxService.cpp
@@ -562,6 +562,7 @@ NS_IMETHODIMP nsMailboxService::NewURI(const nsACString &aSpec,
 
 NS_IMETHODIMP nsMailboxService::NewChannel(nsIURI *aURI, nsIChannel **_retval)
 {
+  NS_ENSURE_ARG_POINTER(aURI);
   nsresult rv = NS_OK;
   nsMailboxProtocol * protocol = new nsMailboxProtocol(aURI);
   if (protocol)
diff --git a/mozilla/mailnews/local/src/nsPop3Service.cpp b/mozilla/mailnews/local/src/nsPop3Service.cpp
index dab3479eb69..6aead288c88 100644
--- a/mozilla/mailnews/local/src/nsPop3Service.cpp
+++ b/mozilla/mailnews/local/src/nsPop3Service.cpp
@@ -415,6 +415,7 @@ NS_IMETHODIMP nsPop3Service::NewURI(const nsACString &aSpec,
 
 NS_IMETHODIMP nsPop3Service::NewChannel(nsIURI *aURI, nsIChannel **_retval)
 {
+  NS_ENSURE_ARG_POINTER(aURI);
   nsresult rv = NS_OK;
   nsPop3Protocol * protocol = new nsPop3Protocol(aURI);
   if (protocol)
diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp
index 34d89bdcd22..e3d613db24c 100644
--- a/mozilla/mailnews/news/src/nsNntpService.cpp
+++ b/mozilla/mailnews/news/src/nsNntpService.cpp
@@ -24,7 +24,7 @@
  *   Scott MacGregor <mscott@netscape.com>
  *   Pierre Phaneuf <pp@ludusdesign.com>
  *   Håkan Waara <hwaara@chello.se>
- *   David Bienvenu < bienvenu@nventure.com>
+ *   David Bienvenu <bienvenu@nventure.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -1416,11 +1416,12 @@ NS_IMETHODIMP nsNntpService::NewURI(const nsACString &aSpec,
 
 NS_IMETHODIMP nsNntpService::NewChannel(nsIURI *aURI, nsIChannel **_retval)
 {
+  NS_ENSURE_ARG_POINTER(aURI);
   nsresult rv = NS_OK;
   nsCOMPtr <nsINNTPProtocol> nntpProtocol;
   rv = GetProtocolForUri(aURI, nsnull, getter_AddRefs(nntpProtocol));
   if (NS_SUCCEEDED(rv))
-	  rv = nntpProtocol->Initialize(aURI, nsnull);
+    rv = nntpProtocol->Initialize(aURI, nsnull);
   if (NS_FAILED(rv)) return rv;
 
   return CallQueryInterface(nntpProtocol, _retval);
diff --git a/mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp b/mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp
index c8b160ae8a1..dde4c55b379 100644
--- a/mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp
+++ b/mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp
@@ -106,6 +106,7 @@ NS_IMETHODIMP nsIconProtocolHandler::NewURI(const nsACString &aSpec,
 
 NS_IMETHODIMP nsIconProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result)
 {
+  NS_ENSURE_ARG_POINTER(url);
   nsIconChannel* channel = new nsIconChannel;
   if (!channel)
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
index 5571a3ab999..c7e2ed2e03a 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
@@ -49,6 +49,7 @@ static const char kBlankPage[] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01
 NS_IMETHODIMP
 nsAboutBlank::NewChannel(nsIURI *aURI, nsIChannel **result)
 {
+    NS_ENSURE_ARG_POINTER(aURI);
     nsresult rv;
     nsIChannel* channel;
 
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp
index 84509c42189..d827d581192 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp
@@ -60,6 +60,7 @@ NS_IMPL_ISUPPORTS1(nsAboutBloat, nsIAboutModule)
 NS_IMETHODIMP
 nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result)
 {
+    NS_ENSURE_ARG_POINTER(aURI);
     nsresult rv;
     nsCAutoString path;
     rv = aURI->GetPath(path);
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp
index 5f46634b993..12795afd2da 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp
@@ -75,6 +75,7 @@ NS_IMPL_ISUPPORTS2(nsAboutCache, nsIAboutModule, nsICacheVisitor)
 NS_IMETHODIMP
 nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result)
 {
+    NS_ENSURE_ARG_POINTER(aURI);
     nsresult rv;
     PRUint32 bytesWritten;
 
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp
index a3ffc8b1903..f1a8b6743e4 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutCacheEntry.cpp
@@ -60,6 +60,7 @@ NS_IMPL_ISUPPORTS2(nsAboutCacheEntry,
 NS_IMETHODIMP
 nsAboutCacheEntry::NewChannel(nsIURI *uri, nsIChannel **result)
 {
+    NS_ENSURE_ARG_POINTER(uri);
     nsresult rv;
 
     nsCOMPtr<nsIInputStream> stream;
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
index 02e4a7e268f..06055891d53 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
@@ -136,6 +136,7 @@ nsAboutProtocolHandler::NewURI(const nsACString &aSpec,
 NS_IMETHODIMP
 nsAboutProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(uri);
     // about:what you ask?
     nsresult rv;
     nsCAutoString contractID;
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
index 80f69951ada..d2372f1168c 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
@@ -76,7 +76,7 @@ static const int kRedirTotal = NS_ARRAY_LENGTH(kRedirMap);
 NS_IMETHODIMP
 nsAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result)
 {
-    NS_ASSERTION(aURI, "must not be null");
+    NS_ENSURE_ARG_POINTER(aURI);
     NS_ASSERTION(result, "must not be null");
 
     nsresult rv;
diff --git a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
index 69dc5f1c0e5..dfeae3d9cc2 100644
--- a/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
+++ b/mozilla/netwerk/protocol/data/src/nsDataHandler.cpp
@@ -117,6 +117,7 @@ nsDataHandler::NewURI(const nsACString &aSpec,
 NS_IMETHODIMP
 nsDataHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(uri);
     nsDataChannel* channel = new nsDataChannel(uri);
     if (!channel)
         return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
index 50aa98df22f..efa771e4c58 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
@@ -213,6 +213,7 @@ nsFtpProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result)
 NS_IMETHODIMP
 nsFtpProtocolHandler::NewProxiedChannel(nsIURI* url, nsIProxyInfo* proxyInfo, nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(url);
     nsFTPChannel *channel = new nsFTPChannel();
     if (!channel)
         return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
index ce0b52a7fae..54493dcfa55 100644
--- a/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
+++ b/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
@@ -100,6 +100,7 @@ NS_IMETHODIMP
 nsGopherHandler::NewProxiedChannel(nsIURI *uri, nsIProxyInfo *proxyInfo,
                                    nsIChannel **result)
 {
+    NS_ENSURE_ARG_POINTER(uri);
     nsGopherChannel *chan = new nsGopherChannel(uri, proxyInfo);
     if (!chan)
         return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
index 01b93d8630b..237d05d469d 100644
--- a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
@@ -164,6 +164,7 @@ nsKeywordProtocolHandler::NewURI(const nsACString &aSpec,
 NS_IMETHODIMP
 nsKeywordProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(uri);
     nsresult rv;
     nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
     if (NS_FAILED(rv)) return rv;
diff --git a/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp b/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp
index 8ed83982ed4..dc2a2cb9913 100644
--- a/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/res/src/nsResProtocolHandler.cpp
@@ -236,6 +236,7 @@ nsResProtocolHandler::NewURI(const nsACString &aSpec,
 NS_IMETHODIMP
 nsResProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(uri);
     nsresult rv;
     nsCAutoString spec;
 
diff --git a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
index d776d053691..c416ddebffc 100644
--- a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
+++ b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
@@ -115,6 +115,7 @@ nsViewSourceHandler::NewURI(const nsACString &aSpec,
 NS_IMETHODIMP
 nsViewSourceHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
 {
+    NS_ENSURE_ARG_POINTER(uri);
     nsViewSourceChannel *channel = new nsViewSourceChannel();
     if (!channel)
         return NS_ERROR_OUT_OF_MEMORY;