db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2026-04-28 21:04:55 +02:00
Code Issues Releases Activity

Throw errors on invalid StringIds in config/parse.c.

Browse Source 
Now that the StringIds are not stored in parse.auto.c.inc it may not be obvious if an invalid StringId is generated. By moving the encoding to after the value has been validated we can error if the StringId is invalid rather than throwing an error that the value does not exist in the allow list.
This commit is contained in:
David Steele
2026-01-10 15:52:06 +07:00
parent 5898806473
commit 85caeda4e5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/parse.c
+9 -7
View File
@@ -2594,13 +2594,8 @@ cfgParse(const Storage *const storage, const unsigned int argListSize, const cha
strZ(cfgParseOptionValueStr(optionType, optionalRules.allowRangeMaxIdx)));
}
}
// Else if StringId
else if (optionType == cfgOptTypeStringId)
{
configOptionValue->value.stringId = strIdFromZN(strZ(valueAllow), strSize(valueAllow), false);
}
// Else if string make sure it is valid
else
else if (optionType != cfgOptTypeStringId)
{
ASSERT(optionType == cfgOptTypePath || optionType == cfgOptTypeString);
@@ -2665,8 +2660,15 @@ cfgParse(const Storage *const storage, const unsigned int argListSize, const cha
switch (ruleOption->type)
{
case cfgOptTypeStringId:
allowListFound = strEq(PARSE_RULE_VAL_STR_IDX(valueIdx), configOptionValue->display);
{
if (strEq(PARSE_RULE_VAL_STR_IDX(valueIdx), configOptionValue->display))
{
allowListFound = true;
configOptionValue->value.stringId = strIdFromZ(strZ(configOptionValue->display));
}
break;
}
default:
allowListFound =