security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

common: Fix logic for certain recsel conditions.

Browse Source 
* common/recsel.c (recsel_select): Change processing of NULL values.
* common/t-recsel.c (run_test_2): Adjust for this change.  Also a type
fix for s/"letter"/"letters"/.
--

The getval function may return NULL which indicates that there is no
useful value available.  For example because the propertyname is not
defined for some external context (e.g. in gpg the packet type).  This
also required to fix the test for boolean tests of a non existing
property name.

Reported-by: shniubobo at gnupg-users on 2025-04-18.
This commit is contained in:
Werner Koch 2025-04-30 15:13:11 +02:00
parent 9b7c067717
commit 3ea8cab6a4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/recsel.c
View File

@ -506,7 +506,11 @@ recsel_select (recsel_expr_t selector,
{
value = getval? getval (cookie, se->name) : NULL;
if (!value)
value = "";
{
se = se->next;
result = 0;
continue;
}
if (!*value)
{

6
common/t-recsel.c
View File

@ -306,7 +306,7 @@ run_test_2 (void)
FREEEXPR();
ADDEXPR ("nothing -z");
if (!recsel_select (se, test_2_getval, NULL))
if (recsel_select (se, test_2_getval, NULL))
fail (0, 0);
FREEEXPR();
ADDEXPR ("nothing -n");
@ -334,7 +334,7 @@ run_test_2 (void)
FREEEXPR();
ADDEXPR ("nothing -f");
if (!recsel_select (se, test_2_getval, NULL))
if (recsel_select (se, test_2_getval, NULL))
fail (0, 0);
FREEEXPR();
ADDEXPR ("nothing -t");
@ -369,7 +369,7 @@ run_test_2 (void)
fail (0, 0);
FREEEXPR();
ADDEXPR ("letter -f");
ADDEXPR ("letters -f");
if (!recsel_select (se, test_2_getval, NULL))
fail (0, 0);
FREEEXPR();