Skip to content
Permalink
Browse files

[common] obey the destination buffer size

  • Loading branch information...
gnif committed Oct 14, 2019
1 parent 9377fdf commit e1bfb1234b6cf5527afe3db762c3a64023adf547
Showing with 12 additions and 4 deletions.
  1. +1 −1 VERSION
  2. +11 −3 common/src/framebuffer.c
@@ -1 +1 @@
B1-11-g5f1d17ba1f+1
B1-12-g9377fdfc37+1
@@ -40,9 +40,13 @@ bool framebuffer_read(const FrameBuffer frame, void * dst, size_t size)

/* copy what we can */
uint64_t avail = frame->wp - rp;
avail = avail > size ? size : avail;

memcpy(d, frame->data + rp, avail);
rp += avail;
d += avail;

rp += avail;
d += avail;
size -= avail;
}
return true;
}
@@ -57,9 +61,13 @@ bool framebuffer_read_fn(const FrameBuffer frame, FrameBufferReadFn fn, size_t s

/* copy what we can */
uint64_t avail = frame->wp - rp;
avail = avail > size ? size : avail;

if (!fn(opaque, frame->data + rp, avail))
return false;
rp += avail;

rp += avail;
size -= avail;
}

return true;

0 comments on commit e1bfb12

Please sign in to comment.
You can’t perform that action at this time.