From: Jaroslav Kysela Date: Wed, 16 Nov 2016 16:31:56 +0000 (+0100) Subject: mpegs_pid_[rw]exists: fix possible null dereference, fixes #4081 X-Git-Tag: v4.2.1~220 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=242bee1c7670c5f3fe56a8ae7e35950e38b6bcb9;p=thirdparty%2Ftvheadend.git mpegs_pid_[rw]exists: fix possible null dereference, fixes #4081 --- diff --git a/src/input/mpegts.h b/src/input/mpegts.h index aa9a68b13..5672810cd 100644 --- a/src/input/mpegts.h +++ b/src/input/mpegts.h @@ -106,9 +106,9 @@ int mpegts_pid_del_group ( mpegts_apids_t *pids, mpegts_apids_t *vals ); int mpegts_pid_find_windex ( mpegts_apids_t *pids, uint16_t pid, uint16_t weight ); int mpegts_pid_find_rindex ( mpegts_apids_t *pids, uint16_t pid ); static inline int mpegts_pid_wexists ( mpegts_apids_t *pids, uint16_t pid, uint16_t weight ) - { return pids->all || mpegts_pid_find_windex(pids, pid, weight) >= 0; } + { return pids && (pids->all || mpegts_pid_find_windex(pids, pid, weight) >= 0); } static inline int mpegts_pid_rexists ( mpegts_apids_t *pids, uint16_t pid ) - { return pids->all || mpegts_pid_find_rindex(pids, pid) >= 0; } + { return pids && (pids->all || mpegts_pid_find_rindex(pids, pid) >= 0); } int mpegts_pid_copy ( mpegts_apids_t *dst, mpegts_apids_t *src ); int mpegts_pid_compare ( mpegts_apids_t *dst, mpegts_apids_t *src, mpegts_apids_t *add, mpegts_apids_t *del );