From 64cb68af560ce4a66cb6962853707188b34b287e Mon Sep 17 00:00:00 2001 From: Alex Luccisano Date: Fri, 31 Jan 2025 14:12:59 -0500 Subject: [PATCH] bpm: Fix potential null-pointer dereference `update_metrics()` in `bpm.c` is checking for null pointer arguments, and there was a very minor chance of dereferencing a null-pointer in the logged message. Correct the logic to prevent this from happening. --- shared/bpm/bpm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shared/bpm/bpm.c b/shared/bpm/bpm.c index e2d17b70f..4440c7d65 100644 --- a/shared/bpm/bpm.c +++ b/shared/bpm/bpm.c @@ -16,7 +16,12 @@ static void render_metrics_time(struct metrics_time *m_time) static bool update_metrics(obs_output_t *output, const struct encoder_packet *pkt, const struct encoder_packet_time *ept, struct metrics_data *m_track) { - if (!output || !pkt || !ept || !m_track) { + if (!pkt) { + blog(LOG_DEBUG, "%s: Null encoder_packet pointer", __FUNCTION__); + return false; + } + + if (!output || !ept || !m_track) { blog(LOG_DEBUG, "%s: Null arguments for track %lu", __FUNCTION__, pkt->track_idx); return false; }