config: fix flags in uint option handler

The configuration unsigned integer option handler sets flags for the
parser as if the option should be a signed integer (PARSE_INT32),
leading to errors on "out of range" values. Fix flags (PARSE_UINT32).

A fix to res_pjsip is also present which stops invalid flags from
being passed when registering sorcery object fields for qualify
status.

ASTERISK-25612 #close

Change-Id: I96b539336275e0e72a8e8033487d2c3344debd3e

diff --git a/apps/app_skel.c b/apps/app_skel.c
index 54ecbe1ecb7c4149a960421867b7dd0ca24183da..0f17d9bf3cd33f31d3d1495b0ed89e6a7fbe6cec 100644 (file)
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -739,7 +739,7 @@ static int load_module(void)
 
        /* Level options */
        aco_option_register(&cfg_info, "max_number", ACO_EXACT, level_options, NULL, OPT_UINT_T, 0, FLDSET(struct skel_level, max_num));
-       aco_option_register(&cfg_info, "max_guesses", ACO_EXACT, level_options, NULL, OPT_UINT_T, 1, FLDSET(struct skel_level, max_guesses));
+       aco_option_register(&cfg_info, "max_guesses", ACO_EXACT, level_options, NULL, OPT_UINT_T, 0, FLDSET(struct skel_level, max_guesses));
 
        if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) {
                goto error;

diff --git a/main/config_options.c b/main/config_options.c
index f8c7b0c6768b74343e7379bf9e7f355e7ec85f9f..e59e5cf7afcd71883f93ec68d803da0bab93e9db 100644 (file)
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -1346,7 +1346,7 @@ static int int_handler_fn(const struct aco_option *opt, struct ast_variable *var
  */
 static int uint_handler_fn(const struct aco_option *opt, struct ast_variable *var, void *obj) {
        unsigned int *field = (unsigned int *)(obj + opt->args[0]);
-       unsigned int flags = PARSE_INT32 | opt->flags;
+       unsigned int flags = PARSE_UINT32 | opt->flags;
        int res = 0;
        if (opt->flags & PARSE_IN_RANGE) {
                res = opt->flags & PARSE_DEFAULT ?

diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c
index aed9620303be7dfed3decd94d3e7e38a50550cd0..4cce558367800eddda55cda89866f73b0ee64267 100644 (file)
--- a/res/res_pjsip/pjsip_options.c
+++ b/res/res_pjsip/pjsip_options.c
@@ -1027,14 +1027,14 @@ int ast_sip_initialize_sorcery_qualify(void)
 
        snprintf(status_value_unknown, sizeof(status_value_unknown), "%u", UNKNOWN);
        ast_sorcery_object_field_register_nodoc(sorcery, CONTACT_STATUS, "last_status",
-               status_value_unknown, OPT_UINT_T, 1, FLDSET(struct ast_sip_contact_status, last_status));
+               status_value_unknown, OPT_UINT_T, 0, FLDSET(struct ast_sip_contact_status, last_status));
        snprintf(status_value_created, sizeof(status_value_created), "%u", CREATED);
        ast_sorcery_object_field_register_nodoc(sorcery, CONTACT_STATUS, "status",
-               status_value_created, OPT_UINT_T, 1, FLDSET(struct ast_sip_contact_status, status));
+               status_value_created, OPT_UINT_T, 0, FLDSET(struct ast_sip_contact_status, status));
        ast_sorcery_object_field_register_custom_nodoc(sorcery, CONTACT_STATUS, "rtt_start",
                "0.0", rtt_start_handler, rtt_start_to_str, NULL, 0, 0);
        ast_sorcery_object_field_register_nodoc(sorcery, CONTACT_STATUS, "rtt",
-               "0", OPT_UINT_T, 1, FLDSET(struct ast_sip_contact_status, rtt));
+               "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_contact_status, rtt));
 
        return 0;
 }