db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-06 08:49:29 +02:00
Code Issues Releases Activity

Add cfgOptionValid() check to assert in cfgOptionIdxTest().

Browse Source 
Skip the rest of the assert if the option is not valid since this function is intended to work with invalid options.
This commit is contained in:
David Steele
2021-01-15 08:59:16 -05:00
parent 7f263dceb7
commit 38583b6414
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/config/config.c
View File

@@ -1206,9 +1206,10 @@ cfgOptionIdxTest(ConfigOption optionId, unsigned int optionIdx)
ASSERT(optionId < CFG_OPTION_TOTAL);
ASSERT(configLocal != NULL);
ASSERT(
(!configLocal->option[optionId].group && optionIdx == 0) ||
(configLocal->option[optionId].group && optionIdx <
configLocal->optionGroup[configLocal->option[optionId].groupId].indexTotal));
!cfgOptionValid(optionId) ||
((!configLocal->option[optionId].group && optionIdx == 0) ||
(configLocal->option[optionId].group && optionIdx <
configLocal->optionGroup[configLocal->option[optionId].groupId].indexTotal)));
FUNCTION_TEST_RETURN(cfgOptionValid(optionId) && configLocal->option[optionId].index[optionIdx].value != NULL);
}