kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1688 in FS/freeswitch from fs-11691-fix-log-node-dup to master 

* commit '10f642249e13568d2e4412a4a4e962d1a8c900bf':
  FS-11691 [core] fix switch_log_node_dup() so that it completely duplicates log nodes
This commit is contained in:
Mike Jerris 2019-03-06 20:52:51 -06:00
parent 3d8e54e6f8 10f642249e
commit 2e319c41c0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/switch_log.c
View File

@ -108,15 +108,21 @@ SWITCH_DECLARE(switch_log_node_t *) switch_log_node_dup(const switch_log_node_t
switch_log_node_t *newnode = switch_log_node_alloc();
*newnode = *node;
newnode->content = NULL;
if (!zstr(node->data)) {
if (node->data) {
newnode->data = strdup(node->data);
switch_assert(node->data);
switch_assert(newnode->data);
// content is a pointer inside data; need to calculate the new pointer
if (node->content && node->content >= node->data) {
newnode->content = newnode->data + (node->content - node->data);
}
}
if (!zstr(node->userdata)) {
if (node->userdata) {
newnode->userdata = strdup(node->userdata);
switch_assert(node->userdata);
switch_assert(newnode->userdata);
}
return newnode;