===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/layout-custom.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/tmux/layout-custom.c	2019/10/03 10:24:06	1.16
--- src/usr.bin/tmux/layout-custom.c	2019/10/14 09:16:48	1.17
***************
*** 1,4 ****
! /* $OpenBSD: layout-custom.c,v 1.16 2019/10/03 10:24:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: layout-custom.c,v 1.17 2019/10/14 09:16:48 nicm Exp $ */
  
  /*
   * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 116,128 ****
  	return (0);
  }
  
  /* Parse a layout string and arrange window as layout. */
  int
  layout_parse(struct window *w, const char *layout)
  {
  	struct layout_cell	*lc, *lcchild;
  	struct window_pane	*wp;
! 	u_int			 npanes, ncells;
  	u_short			 csum;
  
  	/* Check validity. */
--- 116,164 ----
  	return (0);
  }
  
+ /* Check layout sizes fit. */
+ static int
+ layout_check(struct layout_cell *lc)
+ {
+ 	struct layout_cell	*lcchild;
+ 	u_int			 n = 0;
+ 
+ 	switch (lc->type) {
+ 	case LAYOUT_WINDOWPANE:
+ 		break;
+ 	case LAYOUT_LEFTRIGHT:
+ 		TAILQ_FOREACH(lcchild, &lc->cells, entry) {
+ 			if (lcchild->sy != lc->sy)
+ 				return (0);
+ 			if (!layout_check(lcchild))
+ 				return (0);
+ 			n += lcchild->sx + 1;
+ 		}
+ 		if (n - 1 != lc->sx)
+ 			return (0);
+ 		break;
+ 	case LAYOUT_TOPBOTTOM:
+ 		TAILQ_FOREACH(lcchild, &lc->cells, entry) {
+ 			if (lcchild->sx != lc->sx)
+ 				return (0);
+ 			if (!layout_check(lcchild))
+ 				return (0);
+ 			n += lcchild->sy + 1;
+ 		}
+ 		if (n - 1 != lc->sy)
+ 			return (0);
+ 		break;
+ 	}
+ 	return (1);
+ }
+ 
  /* Parse a layout string and arrange window as layout. */
  int
  layout_parse(struct window *w, const char *layout)
  {
  	struct layout_cell	*lc, *lcchild;
  	struct window_pane	*wp;
! 	u_int			 npanes, ncells, sx = 0, sy = 0;
  	u_short			 csum;
  
  	/* Check validity. */
***************
*** 152,157 ****
--- 188,224 ----
  		lcchild = layout_find_bottomright(lc);
  		layout_destroy_cell(w, lcchild, &lc);
  	}
+ 
+ 	/*
+ 	 * It appears older versions of tmux were able to generate layouts with
+ 	 * an incorrect top cell size - if it is larger than the top child then
+ 	 * correct that (if this is still wrong the check code will catch it).
+ 	 */
+ 	switch (lc->type) {
+ 	case LAYOUT_WINDOWPANE:
+ 		break;
+ 	case LAYOUT_LEFTRIGHT:
+ 		TAILQ_FOREACH(lcchild, &lc->cells, entry) {
+ 			sy = lcchild->sy + 1;
+ 			sx += lcchild->sx + 1;
+ 		}
+ 		break;
+ 	case LAYOUT_TOPBOTTOM:
+ 		TAILQ_FOREACH(lcchild, &lc->cells, entry) {
+ 			sx = lcchild->sx + 1;
+ 			sy += lcchild->sy + 1;
+ 		}
+ 		break;
+ 	}
+ 	if (lc->sx != sx || lc->sy != sy) {
+ 		log_debug("fix layout %u,%u to %u,%u", lc->sx, lc->sy, sx,sy);
+ 		layout_print_cell(lc, __func__, 0);
+ 		lc->sx = sx - 1; lc->sy = sy - 1;
+ 	}
+ 
+ 	/* Check the new layout. */
+ 	if (!layout_check(lc))
+ 		return (-1);
  
  	/* Resize to the layout size. */
  	window_resize(w, lc->sx, lc->sy);