[Emacs-diffs] /srv/bzr/emacs/trunk r108095: * src/xfns.c (x_window): Use xstrdup (Bug#11375).

[Chong Yidong]

------------------------------------------------------------
revno: 108095
fixes bug(s): http://debbugs.gnu.org/11375
author: Jim Meyering <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-02 18:20:35 +0800
message:
  * src/xfns.c (x_window): Use xstrdup (Bug#11375).
modified:
  src/ChangeLog
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-02 10:17:03 +0000
+++ b/src/ChangeLog     2012-05-02 10:20:35 +0000
@@ -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  <address@hidden>
 
        * xdisp.c (pos_visible_p): If already at a newline from the

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2012-04-09 13:05:48 +0000
+++ b/src/xfns.c        2012-05-02 10:20:35 +0000
@@ -2439,7 +2439,6 @@
 
   /* 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 @@
         }
     }
 
-    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);
   }