oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/CdioParanoia: use std::min()

Browse Source
This commit is contained in:
Max Kellermann 2022-07-08 12:35:55 +02:00
parent 8eb3164878
commit 1080c917be
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/input/plugins/CdioParanoiaInputPlugin.cxx
View File

@ -35,6 +35,7 @@
#include "Log.hxx" #include "Log.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include <algorithm>
#include <cassert> #include <cassert>
#include <cstdint> #include <cstdint>
@ -328,7 +329,7 @@ CdioParanoiaInputStream::Read(std::unique_lock<Mutex> &,
assert(diff >= 0 && diff < CDIO_CD_FRAMESIZE_RAW); assert(diff >= 0 && diff < CDIO_CD_FRAMESIZE_RAW);
const size_t maxwrite = CDIO_CD_FRAMESIZE_RAW - diff; //# of bytes pending in current buffer const size_t maxwrite = CDIO_CD_FRAMESIZE_RAW - diff; //# of bytes pending in current buffer
const size_t len = (length < maxwrite? length : maxwrite); const size_t len = std::min(length, maxwrite);
//skip diff bytes from this lsn //skip diff bytes from this lsn
memcpy(wptr, ((const char *)rbuf) + diff, len); memcpy(wptr, ((const char *)rbuf) + diff, len);