[sr-dev] git:5.5:42d4359e: uuid: use define for buffer size

Module: kamailio Branch: 5.5 Commit: 42d4359e6c3288fdfb705c5d0e38f47443048550 URL: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:10:24+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode (cherry picked from commit e81f2e318bc32802d152ef69d005b8194e17ca42) --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… Patch: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index a5aae589d8..247d5830ab 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -34,12 +34,18 @@ MODULE_VERSION +#ifdef UUID_LEN_STR +#define KSR_UUID_BSIZE (UUID_LEN_STR + 4) +#else +#define KSR_UUID_BSIZE 40 +#endif + static int mod_init(void); static int child_init(int); static void mod_destroy(void); static uuid_t _k_uuid_val; -static char _k_uuid_str[40]; +static char _k_uuid_str[KSR_UUID_BSIZE]; int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -162,8 +168,10 @@ int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, break; case 3: #ifndef __OS_darwin - if(uuid_generate_time_safe(_k_uuid_val)) + if(uuid_generate_time_safe(_k_uuid_val)!=0) { + LM_ERR("uuid not generated in a safe mode\n"); return pv_get_null(msg, param, res); + } #else uuid_generate_time(_k_uuid_val); #endif