[sr-dev] git:4.2:6edcfda1: kazoo : fix memset size error & includes

Module: kamailio Branch: 4.2 Commit: 6edcfda108524397302ca2d00c804ac21cd4a01e URL: https://github.com/kamailio/kamailio/commit/6edcfda108524397302ca2d00c804ac… Author: Luis Azedo &lt;luis(a)2600hz.com&gt; Committer: Luis Azedo &lt;luis(a)2600hz.com&gt; Date: 2015-02-06T16:09:51Z kazoo : fix memset size error & includes kz_trans was calling memset with wrong size of structure kx_amqp was including uuid.h from uuid directory (cherry picked from commit 5113c047d353724d1a6f5a204e5a895ff1dd519a) --- Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/6edcfda108524397302ca2d00c804ac… Patch: https://github.com/kamailio/kamailio/commit/6edcfda108524397302ca2d00c804ac… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 29028d4..4fba7fe 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -5,7 +5,7 @@ #include <amqp_framing.h> #include <amqp_tcp_socket.h> #include <json.h> -#include <uuid/uuid.h> +#include <uuid.h> #include "../../mem/mem.h" #include "../../timer_proc.h" #include "../../sr_module.h" diff --git a/modules/kazoo/kz_trans.c b/modules/kazoo/kz_trans.c index eb2ea64..e041ab0 100644 --- a/modules/kazoo/kz_trans.c +++ b/modules/kazoo/kz_trans.c @@ -172,7 +172,7 @@ void kz_free_pv_value(pv_value_t *val ) { pv_value_t* kz_alloc_pv_value() { pv_value_t* v = (pv_value_t*) pkg_malloc(sizeof(pv_value_t)); if(v != NULL) - memset(v, 0, sizeof(pv_value_t*)); + memset(v, 0, sizeof(pv_value_t)); return v; }