mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-04-03 18:11:06 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: cfgcond: always set the error string on openssl_version checks

Browse Source 
Using openssl_version_before() with an invalid argument results in "(null)"
appearing in the error message due to -1 being returned without the error
message being filled. Let's always fill the error message on error.

This was introduced in 2.5 with commit 3aeb3f9347 ("MINOR: cfgcond:
implements openssl_version_atleast and openssl_version_before"), and
this fix must be backported to 2.6.
This commit is contained in:
Willy Tarreau 2026-04-03 08:56:54 +02:00
parent 3608374d6d
commit bf04e64f2c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cfgcond.c
View File

@ -272,8 +272,10 @@ int cfg_eval_cond_term(const struct cfg_cond_term *term, char **err)
case CFG_PRED_OSSL_VERSION_ATLEAST: { // checks if the current openssl version is at least this one
int opensslret = openssl_compare_current_version(term->args[0].data.str.area);
if (opensslret < -1) /* can't parse the string or no openssl available */
if (opensslret < -1) { /* can't parse the string or no openssl available */
memprintf(err, "invalid argument to conditional expression predicate '%s': '%s'", term->pred->word, term->args[0].data.str.area);
ret = -1;
}
else
ret = opensslret <= 0;
break;
@ -281,8 +283,10 @@ int cfg_eval_cond_term(const struct cfg_cond_term *term, char **err)
case CFG_PRED_OSSL_VERSION_BEFORE: { // checks if the current openssl version is older than this one
int opensslret = openssl_compare_current_version(term->args[0].data.str.area);
if (opensslret < -1) /* can't parse the string or no openssl available */
if (opensslret < -1) { /* can't parse the string or no openssl available */
memprintf(err, "invalid argument to conditional expression predicate '%s': '%s'", term->pred->word, term->args[0].data.str.area);
ret = -1;
}
else
ret = opensslret > 0;
break;