diff options
| author | Mark Michelson <mmichelson@digium.com> | 2015-09-10 09:49:45 -0500 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2015-09-10 09:55:00 -0500 |
| commit | f1a2e82d49813b83ca9577938305ee6ccbb0c9c5 (patch) | |
| tree | 3a5710c747ab1596c8af8d1585dc1ce3fa90b3c0 /include | |
| parent | be3f52a1227bf9cd4dbbb2553661ff6ed1d95c9c (diff) | |
res_pjsip: Copy default_from_user to avoid crash.
The default_from_user retrieval function was pulling the
default_from_user from the global configuration struct in an unsafe way.
If using a database as a backend configuration store, the global
configuration struct is short-lived, so grabbing a pointer from it
results in referencing freed memory.
The fix here is to copy the default_from_user value out of the global
configuration struct.
Thanks go to John Hardin for discovering this problem and proposing the
patch on which this fix is based.
ASTERISK-25390 #close
Reported by Mark Michelson
Change-Id: I6b96067a495c1259da768f4012d44e03e7c6148c
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/res_pjsip.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index b7b875d0f..29edbd230 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -2025,9 +2025,11 @@ char *ast_sip_get_endpoint_identifier_order(void); * is no better option (such as an endpoint-configured from_user or * caller ID number). * - * \retval The global default_from_user value. + * \param[out] from_user The default from user + * \param size The buffer size of from_user + * \return nothing */ -const char *ast_sip_get_default_from_user(void); +void ast_sip_get_default_from_user(char *from_user, size_t size); /*! \brief Determines whether the res_pjsip module is loaded */ #define CHECK_PJSIP_MODULE_LOADED() \ |