Skip to content

Fix _Bool functions that silently discard -1 error returns #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thegushi merged 1 commit into from
Jul 22, 2026
Merged

Fix _Bool functions that silently discard -1 error returns #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libopendkim/dkim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ dkim_key_hashesok(DKIM_LIB *lib, u_char *hashlist)
** -1 on error
*/

static _Bool
static int
dkim_sig_hdrlistok(DKIM *dkim, u_char *hdrlist)
{
_Bool in = FALSE;
Expand Down
45 changes: 23 additions & 22 deletions opendkim/opendkim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6338,10 +6338,11 @@ dkimf_config_free(struct dkimf_config *conf)
** errlen -- bytes available at "err"
**
** Return value:
** TRUE if no error, FALSE if error.
** TRUE if no error, FALSE if unknown handling key, -1 if invalid
** handling value.
*/

static _Bool
static int
dkimf_parsehandler(struct config *cfg, char *name, struct handling *hndl,
char *err, size_t errlen)
{
Expand Down Expand Up @@ -6623,28 +6624,28 @@ dkimf_config_load(struct config *data, struct dkimf_config *conf,
sizeof conf->conf_modestr);
}

if (!dkimf_parsehandler(data, "On-Default",
&conf->conf_handling, err, errlen) ||
!dkimf_parsehandler(data, "On-BadSignature",
&conf->conf_handling, err, errlen) ||
!dkimf_parsehandler(data, "On-DNSError",
&conf->conf_handling, err, errlen) ||
!dkimf_parsehandler(data, "On-KeyNotFound",
&conf->conf_handling, err, errlen) ||
!dkimf_parsehandler(data, "On-InternalError",
&conf->conf_handling, err, errlen) ||
!dkimf_parsehandler(data, "On-NoSignature",
&conf->conf_handling, err, errlen) ||
!dkimf_parsehandler(data, "On-PolicyError",
&conf->conf_handling, err, errlen) ||
if (dkimf_parsehandler(data, "On-Default",
&conf->conf_handling, err, errlen) != TRUE ||
dkimf_parsehandler(data, "On-BadSignature",
&conf->conf_handling, err, errlen) != TRUE ||
dkimf_parsehandler(data, "On-DNSError",
&conf->conf_handling, err, errlen) != TRUE ||
dkimf_parsehandler(data, "On-KeyNotFound",
&conf->conf_handling, err, errlen) != TRUE ||
dkimf_parsehandler(data, "On-InternalError",
&conf->conf_handling, err, errlen) != TRUE ||
dkimf_parsehandler(data, "On-NoSignature",
&conf->conf_handling, err, errlen) != TRUE ||
dkimf_parsehandler(data, "On-PolicyError",
&conf->conf_handling, err, errlen) != TRUE ||
#ifdef _FFR_REPUTATION
!dkimf_parsehandler(data, "On-ReptuationError",
&conf->conf_handling, err, errlen) ||
dkimf_parsehandler(data, "On-ReptuationError",
&conf->conf_handling, err, errlen) != TRUE ||
#endif /* _FFR_REPUTATION */
!dkimf_parsehandler(data, "On-Security",
&conf->conf_handling, err, errlen) ||
!dkimf_parsehandler(data, "On-SignatureError",
&conf->conf_handling, err, errlen))
dkimf_parsehandler(data, "On-Security",
&conf->conf_handling, err, errlen) != TRUE ||
dkimf_parsehandler(data, "On-SignatureError",
&conf->conf_handling, err, errlen) != TRUE)
return -1;

(void) config_get(data, "RemoveARAll", &conf->conf_remarall,
Expand Down
Loading