aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-07-15 12:01:19 +0100
committerThomas Adam <thomas@xteddy.org>2020-07-15 12:01:19 +0100
commitc973801f922a99e479194f1fdaa1544ad00e6124 (patch)
treeadaa58438fc999ab6ae499edc866c2985c252ffc
parent405b71e0166aeb98741f7b507163134f427e9f1b (diff)
parent8f1179d65685b8f470f91194c685a008422d49e7 (diff)
downloadrtmux-c973801f922a99e479194f1fdaa1544ad00e6124.tar.gz
rtmux-c973801f922a99e479194f1fdaa1544ad00e6124.tar.bz2
rtmux-c973801f922a99e479194f1fdaa1544ad00e6124.zip
Merge branch 'obsd-master'
-rw-r--r--window-copy.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/window-copy.c b/window-copy.c
index 7b7ab72c..7103131d 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -2601,6 +2601,11 @@ window_copy_cellstring(const struct grid_line *gl, u_int px, size_t *size,
}
gce = &gl->celldata[px];
+ if (gce->flags & GRID_FLAG_PADDING) {
+ *size = 0;
+ *allocated = 0;
+ return (NULL);
+ }
if (~gce->flags & GRID_FLAG_EXTENDED) {
*size = 1;
*allocated = 0;