diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 240594ab122..eeed58a6311 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -845,6 +845,7 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
                                     nsEventStatus& aEventStatus)
 {
   nsresult mRet = NS_OK;
+  nsIDOMEvent* mDOMEvent = nsnull;
 
   if (DOM_EVENT_INIT == aFlags) {
     nsIEventStateManager *mManager;
@@ -853,7 +854,6 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
       NS_RELEASE(mManager);
     }
  
-    nsIDOMEvent* mDOMEvent = nsnull;
     aDOMEvent = &mDOMEvent;
   }
   
@@ -888,6 +888,7 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
         }
       }
     }
+    aDOMEvent = nsnull;
   }
 
   return mRet;
diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp
index 599041df2ca..035d2cabce3 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -822,6 +822,7 @@ nsresult GlobalWindowImpl::HandleDOMEvent(nsIPresContext& aPresContext,
                                     nsEventStatus& aEventStatus)
 {
   nsresult mRet = NS_OK;
+  nsIDOMEvent* mDOMEvent = nsnull;
 
   if (DOM_EVENT_INIT == aFlags) {
     nsIEventStateManager *mManager;
@@ -830,7 +831,6 @@ nsresult GlobalWindowImpl::HandleDOMEvent(nsIPresContext& aPresContext,
       NS_RELEASE(mManager);
     }
  
-    nsIDOMEvent* mDOMEvent = nsnull;
     aDOMEvent = &mDOMEvent;
   }
   
@@ -857,6 +857,7 @@ nsresult GlobalWindowImpl::HandleDOMEvent(nsIPresContext& aPresContext,
         }
       }
     }
+    aDOMEvent = nsnull;
   }
 
   return mRet;
diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp
index 240594ab122..eeed58a6311 100644
--- a/mozilla/layout/base/src/nsDocument.cpp
+++ b/mozilla/layout/base/src/nsDocument.cpp
@@ -845,6 +845,7 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
                                     nsEventStatus& aEventStatus)
 {
   nsresult mRet = NS_OK;
+  nsIDOMEvent* mDOMEvent = nsnull;
 
   if (DOM_EVENT_INIT == aFlags) {
     nsIEventStateManager *mManager;
@@ -853,7 +854,6 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
       NS_RELEASE(mManager);
     }
  
-    nsIDOMEvent* mDOMEvent = nsnull;
     aDOMEvent = &mDOMEvent;
   }
   
@@ -888,6 +888,7 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
         }
       }
     }
+    aDOMEvent = nsnull;
   }
 
   return mRet;
diff --git a/mozilla/layout/html/base/src/nsHTMLContent.cpp b/mozilla/layout/html/base/src/nsHTMLContent.cpp
index b7cef9104c3..0b273c6398b 100644
--- a/mozilla/layout/html/base/src/nsHTMLContent.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLContent.cpp
@@ -627,6 +627,7 @@ nsresult nsHTMLContent::HandleDOMEvent(nsIPresContext& aPresContext,
                                        nsEventStatus& aEventStatus)
 {  
   nsresult mRet = NS_OK;
+  nsIDOMEvent* mDOMEvent = nsnull;
 
   if (DOM_EVENT_INIT == aFlags) {
     nsIEventStateManager *mManager;
@@ -635,7 +636,6 @@ nsresult nsHTMLContent::HandleDOMEvent(nsIPresContext& aPresContext,
       NS_RELEASE(mManager);
     }
  
-    nsIDOMEvent* mDOMEvent = nsnull;
     aDOMEvent = &mDOMEvent;
   }
   
@@ -664,6 +664,7 @@ nsresult nsHTMLContent::HandleDOMEvent(nsIPresContext& aPresContext,
         }
       }
     }
+    aDOMEvent = nsnull;
   }
 
   return mRet;