Merge branch 'obsd-master'

Conflicts:
	server.c
	tmux.c

1 files changed, 1 insertions, 4 deletions

diff --git a/grid.c b/grid.c
index 36cde074..579eb966 100644
--- a/grid.c
+++ b/grid.c
@@ -368,11 +368,8 @@ grid_clear_lines(struct grid *gd, u_int py, u_int ny)
 	for (yy = py; yy < py + ny; yy++) {
 		gl = &gd->linedata[yy];
 		free(gl->celldata);
-		memset(gl, 0, sizeof *gl);
-
 		free(gl->extddata);
-		gl->extddata = NULL;
-		gl->extdsize = 0;
+		memset(gl, 0, sizeof *gl);
 	}
 }