[sr-dev] git:master:919216d0: core: fixup helpers with option to check if variable is writable

Module: kamailio Branch: master Commit: 919216d051b8d459eb97f7ab0968d6bf0bead188 URL: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2024-03-22T10:18:23+01:00 core: fixup helpers with option to check if variable is writable --- Modified: src/core/mod_fix.c --- Diff: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Patch: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 520ed44708c..0947f788461 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -730,12 +730,21 @@ int fixup_free_spve_spve_igp(void **param, int param_no) /** * */ -int fixup_spve_n_pvar(void **param, int n, int param_no) +int fixup_spve_n_pvar(void **param, int n, int param_no, int pvmode) { + int ret = 0; if(param_no >= 1 && param_no <= n) return fixup_spve_null(param, 1); - if(param_no == n + 1) - return fixup_pvar_null(param, 1); + if(param_no == n + 1) { + ret = fixup_pvar_null(param, 1); + if((ret == 0) && (pvmode == 1)) { + if(((pv_spec_t *)(*param))->setf == NULL) { + LM_ERR("pvar is not writeble\n"); + return E_UNSPEC; + } + } + return ret; + } return E_UNSPEC; } @@ -756,7 +765,7 @@ int fixup_free_spve_n_pvar(void **param, int n, int param_no) */ int fixup_spve_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 1, param_no); + return fixup_spve_n_pvar(param, 1, param_no, 0); } /** @@ -772,7 +781,7 @@ int fixup_free_spve_pvar(void **param, int param_no) */ int fixup_spve2_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 2, param_no); + return fixup_spve_n_pvar(param, 2, param_no, 1); } /** @@ -788,7 +797,7 @@ int fixup_free_spve2_pvar(void **param, int param_no) */ int fixup_spve3_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 3, param_no); + return fixup_spve_n_pvar(param, 3, param_no, 1); } /** @@ -804,7 +813,7 @@ int fixup_free_spve3_pvar(void **param, int param_no) */ int fixup_spve4_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 4, param_no); + return fixup_spve_n_pvar(param, 4, param_no, 1); } /**