[sr-dev] git:master:90d5a98b: Revert "p_usrloc: str->s string NULL check before str_dup"

Module: kamailio Branch: master Commit: 90d5a98bb52a810e02f225e72faa1ab526b96bbb URL: https://github.com/kamailio/kamailio/commit/90d5a98bb52a810e02f225e72faa1ab… Author: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Committer: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Date: 2015-11-23T12:04:31+01:00 Revert "p_usrloc: str->s string NULL check before str_dup" This reverts commit d1c6dc67b222e05be1ff90be9b38846f63866839. --- Modified: modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/90d5a98bb52a810e02f225e72faa1ab… Patch: https://github.com/kamailio/kamailio/commit/90d5a98bb52a810e02f225e72faa1ab… --- diff --git a/modules/p_usrloc/ucontact.c b/modules/p_usrloc/ucontact.c index 72a5e65..651bac0 100644 --- a/modules/p_usrloc/ucontact.c +++ b/modules/p_usrloc/ucontact.c @@ -60,31 +60,20 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ } memset(c, 0, sizeof(ucontact_t)); - if (_contact->s && _contact->len > 0) { - if (shm_str_dup( &c->c, _contact) < 0) goto error; - } - - if (_ci->callid->s && _ci->callid->len > 0) { - if (shm_str_dup( &c->callid, _ci->callid) < 0) goto error; - } - - if (_ci->user_agent->s && _ci->user_agent->len > 0) { - if (shm_str_dup( &c->user_agent, _ci->user_agent) < 0) goto error; - } + if (shm_str_dup( &c->c, _contact) < 0) goto error; + if (shm_str_dup( &c->callid, _ci->callid) < 0) goto error; + if (shm_str_dup( &c->user_agent, _ci->user_agent) < 0) goto error; - if (_ci->received.s && _ci->received.len > 0) { + if (_ci->received.s && _ci->received.len) { if (shm_str_dup( &c->received, &_ci->received) < 0) goto error; } - - if (_ci->path && _ci->path->len > 0) { + if (_ci->path && _ci->path->len) { if (shm_str_dup( &c->path, _ci->path) < 0) goto error; } - - if (_ci->ruid.s && _ci->ruid.len > 0) { + if (_ci->ruid.s && _ci->ruid.len) { if (shm_str_dup( &c->ruid, &_ci->ruid) < 0) goto error; } - - if (_ci->instance.s && _ci->instance.len > 0) { + if (_ci->instance.s && _ci->instance.len) { if (shm_str_dup( &c->instance, &_ci->instance) < 0) goto error; }