From: Jim Meyering <jim@meyering.net>
Date: Wed, 2 May 2012 10:20:35 +0000 (+0800)
Subject: * src/xfns.c (x_window): Use xstrdup (Bug#11375).
X-Git-Tag: emacs-24.2.90~471^2~212
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7b8541ee7840221973a2b3908d5535c1d32598b;p=emacs.git

* src/xfns.c (x_window): Use xstrdup (Bug#11375).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 33d95c6c7c6..d621dcc8859 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
 	* xterm.c (x_term_init): Use memcpy instead of strncpy (Bug#11373).
 
+	* xfns.c (x_window): Use xstrdup (Bug#11375).
+
 2012-05-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (pos_visible_p): If already at a newline from the
diff --git a/src/xfns.c b/src/xfns.c
index df1b39b018f..510a66d6349 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2439,7 +2439,6 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
 
   /* Do some needed geometry management.  */
   {
-    ptrdiff_t len;
     char *tem, shell_position[sizeof "=x++" + 4 * INT_STRLEN_BOUND (int)];
     Arg gal[10];
     int gac = 0;
@@ -2508,13 +2507,11 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
         }
     }
 
-    len = strlen (shell_position) + 1;
     /* We don't free this because we don't know whether
        it is safe to free it while the frame exists.
        It isn't worth the trouble of arranging to free it
        when the frame is deleted.  */
-    tem = (char *) xmalloc (len);
-    strncpy (tem, shell_position, len);
+    tem = (char *) xstrdup (shell_position);
     XtSetArg (gal[gac], XtNgeometry, tem); gac++;
     XtSetValues (shell_widget, gal, gac);
   }