Merge from emacs-24; up to 2012-12-20T16:09:05Z!dmantipov@yandex.ru

3 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e945e221593..ff059cf1a3c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32proc.c (new_child): Avoid leaking handles if the subprocess
+        resources were not orderly released.
+
 2013-02-17  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (x_draw_vertical_border): For a window that is neither
diff --git a/src/w32proc.c b/src/w32proc.c
index 3f3e97c77a0..961791a40ed 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -849,6 +849,12 @@ new_child (void)
   cp = &child_procs[child_proc_count++];
 
  Initialize:
+  /* Last opportunity to avoid leaking handles before we forget them
+     for good.  */
+  if (cp->procinfo.hProcess)
+    CloseHandle (cp->procinfo.hProcess);
+  if (cp->procinfo.hThread)
+    CloseHandle (cp->procinfo.hThread);
   memset (cp, 0, sizeof (*cp));
   cp->fd = -1;
   cp->pid = -1;
diff --git a/src/xdisp.c b/src/xdisp.c
index 08958f44575..f32b88f3027 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28244,7 +28244,7 @@ x_draw_vertical_border (struct window *w)
   if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
     return;
 
-  /* Note: It is necessary to redraw bot the left and the right
+  /* Note: It is necessary to redraw both the left and the right
      borders, for when only this single window W is being
      redisplayed.  */
   if (!WINDOW_RIGHTMOST_P (w)