diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 5a997883583..9a96521aa56 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -1795,7 +1795,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
   if (!pathAndFilename)
     mPluginStreamInfo->GetLocalCachedFile(getter_Copies(pathAndFilename));
 
-  if (!pathAndFilename) {
+  if (!pathAndFilename || 0 == *pathAndFilename) {
     // see if it is a file channel.
     nsCOMPtr<nsIFileChannel> fileChannel = do_QueryInterface(request);
     if (fileChannel)
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index 5a997883583..9a96521aa56 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -1795,7 +1795,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
   if (!pathAndFilename)
     mPluginStreamInfo->GetLocalCachedFile(getter_Copies(pathAndFilename));
 
-  if (!pathAndFilename) {
+  if (!pathAndFilename || 0 == *pathAndFilename) {
     // see if it is a file channel.
     nsCOMPtr<nsIFileChannel> fileChannel = do_QueryInterface(request);
     if (fileChannel)