--- a/xpcom/base/nsStackWalk.cpp
+++ b/xpcom/base/nsStackWalk.cpp
@@ -434,48 +434,50 @@ WalkStackThread(void* aData)
  * whose in memory address doesn't match its in-file address.
  */
 
 EXPORT_XPCOM_API(nsresult)
 NS_StackWalk(NS_WalkStackCallback aCallback, PRUint32 aSkipFrames,
              void *aClosure, uintptr_t aThread)
 {
     MOZ_ASSERT(gCriticalAddress.mInit);
-    HANDLE myProcess, myThread;
+    static HANDLE myProcess = NULL;
+    HANDLE myThread;
     DWORD walkerReturn;
     struct WalkStackData data;
 
     if (!EnsureImageHlpInitialized())
         return false;
 
     HANDLE targetThread = ::GetCurrentThread();
     data.walkCallingThread = true;
     if (aThread) {
         HANDLE threadToWalk = reinterpret_cast<HANDLE> (aThread);
         // walkCallingThread indicates whether we are walking the caller's stack
         data.walkCallingThread = (threadToWalk == targetThread);
         targetThread = threadToWalk;
     }
 
     // Have to duplicate handle to get a real handle.
-    if (!::DuplicateHandle(::GetCurrentProcess(),
-                           ::GetCurrentProcess(),
-                           ::GetCurrentProcess(),
-                           &myProcess,
-                           PROCESS_ALL_ACCESS, FALSE, 0)) {
-        PrintError("DuplicateHandle (process)");
-        return NS_ERROR_FAILURE;
+    if (!myProcess) {
+        if (!::DuplicateHandle(::GetCurrentProcess(),
+                               ::GetCurrentProcess(),
+                               ::GetCurrentProcess(),
+                               &myProcess,
+                               PROCESS_ALL_ACCESS, FALSE, 0)) {
+            PrintError("DuplicateHandle (process)");
+            return NS_ERROR_FAILURE;
+        }
     }
     if (!::DuplicateHandle(::GetCurrentProcess(),
                            targetThread,
                            ::GetCurrentProcess(),
                            &myThread,
                            THREAD_ALL_ACCESS, FALSE, 0)) {
         PrintError("DuplicateHandle (thread)");
-        ::CloseHandle(myProcess);
         return NS_ERROR_FAILURE;
     }
 
     data.skipFrames = aSkipFrames;
     data.thread = myThread;
     data.process = myProcess;
     void *local_pcs[1024];
     data.pcs = local_pcs;
@@ -509,17 +511,16 @@ NS_StackWalk(NS_WalkStackCallback aCallb
                 PrintError("SignalObjectAndWait (2)");
         }
 
         ::CloseHandle(data.eventStart);
         ::CloseHandle(data.eventEnd);
     }
 
     ::CloseHandle(myThread);
-    ::CloseHandle(myProcess);
 
     for (PRUint32 i = 0; i < data.pc_count; ++i)
         (*aCallback)(data.pcs[i], aClosure);
 
     if (data.pc_size > ArrayLength(local_pcs))
         free(data.pcs);
 
     return NS_OK;