From d6d6da4711ca1ad20e14386c4b29a955eb32322d Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Mon, 10 Dec 2018 22:09:54 +0100 Subject: stream_dvb: Correct range for dvbin-card option. Adapt documentation accordingly and also, fix an off-by-one check in the code. closes #6371 --- stream/stream_dvb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stream/stream_dvb.c') diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 02c5878ca9..3855ec93ce 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -73,7 +73,7 @@ static pthread_mutex_t global_dvb_state_lock = PTHREAD_MUTEX_INITIALIZER; const struct m_sub_options stream_dvb_conf = { .opts = (const m_option_t[]) { OPT_STRING("prog", cfg_prog, 0), - OPT_INTRANGE("card", cfg_devno, 0, 1, 4), + OPT_INTRANGE("card", cfg_devno, 0, 0, MAX_ADAPTERS-1), OPT_INTRANGE("timeout", cfg_timeout, 0, 1, 30), OPT_STRING("file", cfg_file, M_OPT_FILE), OPT_FLAG("full-transponder", cfg_full_transponder, 0), @@ -1157,7 +1157,7 @@ dvb_state_t *dvb_get_state(stream_t *stream) if (devno.len) { bstr r; priv->cfg_devno = bstrtoll(devno, &r, 0); - if (r.len || priv->cfg_devno < 0 || priv->cfg_devno > MAX_ADAPTERS) { + if (r.len || priv->cfg_devno < 0 || priv->cfg_devno >= MAX_ADAPTERS) { MP_ERR(stream, "invalid devno: '%.*s'\n", BSTR_P(devno)); return NULL; } -- cgit v1.2.3