Fix bug #18528 with crashes at startup during frameset restoration.

 src/w32term.c (w32_read_socket): Don't use frame dimensions for
 resizing if GetClientRect returned an empty (0, 0, 0, 0)
 rectangle.  Check the return value of GetClientRect, and don't use
 the results if it didn't succeed.
 src/dispnew.c (change_frame_size_1): Recompute the frame dimensions
 in columns and lines after correcting the pixel dimensions in
 check_frame_size.
 (adjust_decode_mode_spec_buffer): Add assertion to avoid passing
 negative values to xrealloc.

1 files changed, 35 insertions, 27 deletions

diff --git a/src/w32term.c b/src/w32term.c
index 5f15798eeeb..5a053b4fc0d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4754,34 +4754,42 @@ w32_read_socket (struct terminal *terminal,
               RECT rect;
               int rows, columns, width, height, text_width, text_height;
 
-              GetClientRect (msg.msg.hwnd, &rect);
-
-              height = rect.bottom - rect.top;
-              width = rect.right - rect.left;
-              text_width = FRAME_PIXEL_TO_TEXT_WIDTH (f, width);
-              text_height = FRAME_PIXEL_TO_TEXT_HEIGHT (f, height);
-              rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, height);
-              columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, width);
-
-              /* TODO: Clip size to the screen dimensions.  */
-
-              /* Even if the number of character rows and columns has
-                 not changed, the font size may have changed, so we need
-                 to check the pixel dimensions as well.  */
-
-              if (width != FRAME_PIXEL_WIDTH (f)
-                  || height != FRAME_PIXEL_HEIGHT (f)
-                  || text_width != FRAME_TEXT_WIDTH (f)
-                  || text_height != FRAME_TEXT_HEIGHT (f))
+              if (GetClientRect (msg.msg.hwnd, &rect)
+                  /* GetClientRect evidently returns (0, 0, 0, 0) if
+                     called on a minimized frame.  Such "dimensions"
+                     aren't useful anyway.  */
+                  && !(rect.bottom == 0
+                       && rect.top == 0
+                       && rect.left == 0
+                       && rect.right == 0))
                 {
-                  change_frame_size (f, text_width, text_height, 0, 1, 0, 1);
-                  SET_FRAME_GARBAGED (f);
-                  cancel_mouse_face (f);
-                  /* Do we want to set these here ????  */
-/**               FRAME_PIXEL_WIDTH (f) = width; **/
-/**               FRAME_TEXT_WIDTH (f) = text_width; **/
-/**               FRAME_PIXEL_HEIGHT (f) = height; **/
-                  f->win_gravity = NorthWestGravity;
+                  height = rect.bottom - rect.top;
+                  width = rect.right - rect.left;
+                  text_width = FRAME_PIXEL_TO_TEXT_WIDTH (f, width);
+                  text_height = FRAME_PIXEL_TO_TEXT_HEIGHT (f, height);
+                  rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, height);
+                  columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, width);
+
+                  /* TODO: Clip size to the screen dimensions.  */
+
+                  /* Even if the number of character rows and columns
+                     has not changed, the font size may have changed,
+                     so we need to check the pixel dimensions as well.  */
+
+                  if (width != FRAME_PIXEL_WIDTH (f)
+                      || height != FRAME_PIXEL_HEIGHT (f)
+                      || text_width != FRAME_TEXT_WIDTH (f)
+                      || text_height != FRAME_TEXT_HEIGHT (f))
+                    {
+                      change_frame_size (f, text_width, text_height, 0, 1, 0, 1);
+                      SET_FRAME_GARBAGED (f);
+                      cancel_mouse_face (f);
+                      /* Do we want to set these here ????  */
+                      /**               FRAME_PIXEL_WIDTH (f) = width; **/
+                      /**               FRAME_TEXT_WIDTH (f) = text_width; **/
+                      /**               FRAME_PIXEL_HEIGHT (f) = height; **/
+                      f->win_gravity = NorthWestGravity;
+                    }
                 }
             }