aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-06-01 11:49:52 -0700
committerPaul Eggert2014-06-01 11:49:52 -0700
commitafca0e759015ebc753b0c343ac45ac476dd31e9d (patch)
tree1a143b788c8479667b331ef77b31040473e500c8
parenta3d0b7d19daf4b3f31105b80d4f35a1e7fe5b9c9 (diff)
downloademacs-afca0e759015ebc753b0c343ac45ac476dd31e9d.tar.gz
emacs-afca0e759015ebc753b0c343ac45ac476dd31e9d.zip
* frame.c (x_set_frame_parameters): Don't read uninitialized storage.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/frame.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 781e29dd308..07d2b5bd643 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-06-01 Paul Eggert <eggert@cs.ucla.edu>
2
3 * frame.c (x_set_frame_parameters): Don't read uninitialized storage.
4
12014-06-01 Jan Djärv <jan.h.d@swipnet.se> 52014-06-01 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * xterm.c (xg_scroll_callback): Remove position, for jump set portion 7 * xterm.c (xg_scroll_callback): Remove position, for jump set portion
diff --git a/src/frame.c b/src/frame.c
index c5a2f6ab245..35c926ce7ef 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2794,7 +2794,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
2794 /* If both of these parameters are present, it's more efficient to 2794 /* If both of these parameters are present, it's more efficient to
2795 set them both at once. So we wait until we've looked at the 2795 set them both at once. So we wait until we've looked at the
2796 entire list before we set them. */ 2796 entire list before we set them. */
2797 int width, height; 2797 int width = 0, height = 0;
2798 bool width_change = 0, height_change = 0; 2798 bool width_change = 0, height_change = 0;
2799 2799
2800 /* Same here. */ 2800 /* Same here. */