diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f3d47e4c8..47bf78aa8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-30  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* exceptions.cc (try_to_debug): Avoid creating a huge buffer on the
+	stack.
+
 2008-12-25  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* mount.cc: Change comment.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 950ab86bc..4428d49e8 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -368,8 +368,6 @@ cygwin_stackdump ()
 extern "C" int
 try_to_debug (bool waitloop)
 {
-  WCHAR dbg_cmd[sizeof debugger_command];
-
   debug_printf ("debugger_command '%s'", debugger_command);
   if (*debugger_command == '\0')
     return 0;
@@ -421,7 +419,8 @@ try_to_debug (bool waitloop)
   console_printf ("*** starting debugger for pid %u, tid %u\n",
 		  cygwin_pid (GetCurrentProcessId ()), GetCurrentThreadId ());
   BOOL dbg;
-  sys_mbstowcs (dbg_cmd, sizeof debugger_command, debugger_command);
+  WCHAR dbg_cmd[strlen(debugger_command)];
+  sys_mbstowcs (dbg_cmd, strlen(debugger_command) + 1, debugger_command);
   dbg = CreateProcessW (NULL,
 			dbg_cmd,
 			NULL,