Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-08-25 02:01:16 +01:00
commit 429f86397b

3
grid.c
View File

@ -652,7 +652,8 @@ grid_duplicate_lines(struct grid *dst, u_int dy, struct grid *src, u_int sy,
srcl->cellsize, sizeof *dstl->celldata); srcl->cellsize, sizeof *dstl->celldata);
memcpy(dstl->celldata, srcl->celldata, memcpy(dstl->celldata, srcl->celldata,
srcl->cellsize * sizeof *dstl->celldata); srcl->cellsize * sizeof *dstl->celldata);
} } else
dstl->celldata = NULL;
sy++; sy++;
dy++; dy++;