procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jim Meyering 2012-05-02 18:20:35 +08:00 • committed by Chong Yidong
parent 3f83ace849
commit c7b8541ee7
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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

5
src/xfns.c
View file

@ -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);
}