jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1391 from Dmitry-Me/fixPotentialNullDeref01 

UI: Check pointer before the first dereference
master
Jim 2018-07-31 22:37:12 -07:00 committed by GitHub
parent 2e18745c37 69f217003b
commit 6905b22c5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/window-basic-settings.cpp
View File

@ -4185,6 +4185,9 @@ void OBSBasicSettings::AdvReplayBufferChanged()
int vbitrate = (int)obs_data_get_int(settings, "bitrate"); int vbitrate = (int)obs_data_get_int(settings, "bitrate");
const char *rateControl = obs_data_get_string(settings, "rate_control"); const char *rateControl = obs_data_get_string(settings, "rate_control");
if (!rateControl)
rateControl = "";
bool lossless = strcmp(rateControl, "lossless") == 0 || bool lossless = strcmp(rateControl, "lossless") == 0 ||
ui->advOutRecType->currentIndex() == 1; ui->advOutRecType->currentIndex() == 1;
bool replayBufferEnabled = ui->advReplayBuf->isChecked(); bool replayBufferEnabled = ui->advReplayBuf->isChecked();
@ -4210,9 +4213,6 @@ void OBSBasicSettings::AdvReplayBufferChanged()
if (memMB < 1) if (memMB < 1)
memMB = 1; memMB = 1;
if (!rateControl)
rateControl = "";
bool varRateControl = (astrcmpi(rateControl, "CBR") == 0 || bool varRateControl = (astrcmpi(rateControl, "CBR") == 0 ||
astrcmpi(rateControl, "VBR") == 0 || astrcmpi(rateControl, "VBR") == 0 ||
astrcmpi(rateControl, "ABR") == 0); astrcmpi(rateControl, "ABR") == 0);