From 0fb89dc9a15cbb00c9690c4f58dfced558e9cda1 Mon Sep 17 00:00:00 2001 From: Kurt Kartaltepe Date: Thu, 2 Mar 2023 15:55:49 -0800 Subject: [PATCH] obs-ffmpeg: Fix crash during ratecontrol check When iterating over an array of structs we incorrectly check for a null pointer, but the actual sentinel value is the empty struct. --- plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c index f4dff74f7..9ae198ecc 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c @@ -186,11 +186,11 @@ static const rc_mode_t *get_rc_mode(const char *name) {.name = "CBR", .qp = false, .bitrate = true, .maxrate = false}, {.name = "CQP", .qp = true, .bitrate = false, .maxrate = false}, {.name = "VBR", .qp = false, .bitrate = true, .maxrate = true}, - NULL}; + {0}}; const rc_mode_t *rc_mode = RC_MODES; - while (!!rc_mode && strcmp(rc_mode->name, name) != 0) + while (!!rc_mode->name && strcmp(rc_mode->name, name) != 0) rc_mode++; return rc_mode ? rc_mode : RC_MODES;