[Pkg-voip-commits] [asterisk] 04/10: AST-2017-010: backport and add

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch stretch
in repository asterisk.

commit 8537affc11628a96c9b13ce89c60ce5f87822ecf
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Dec 13 18:22:50 2017 +0200

    AST-2017-010: backport and add
    
    Backport patch AST-2017-010 to changes from the following upstream
    commits:
    
    Hunk 1: from commit 85723a9e506bda9e21dbf3c06d93d961f10c6b75
    Hunk 2: from commit e196190f118d12212311e79b27177484e8c0a472
---
 debian/patches/AST-2017-010.patch | 16 ++++++++--------
 debian/patches/series             |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/patches/AST-2017-010.patch b/debian/patches/AST-2017-010.patch
index b2fa73a..5ab3c8d 100644
--- a/debian/patches/AST-2017-010.patch
+++ b/debian/patches/AST-2017-010.patch
@@ -24,17 +24,17 @@ index 1424607c99..60532fe9fc 100644
 --- a/main/cdr.c
 +++ b/main/cdr.c
 @@ -3384,7 +3384,8 @@ static int cdr_object_update_party_b_userfield_cb(void *obj, void *arg, void *da
- 		ast_assert(cdr->party_b.snapshot
- 			&& !strcasecmp(cdr->party_b.snapshot->name, info->channel_name));
- 
--		strcpy(cdr->party_b.userfield, info->userfield);
-+		ast_copy_string(cdr->party_b.userfield, info->userfield,
-+			sizeof(cdr->party_b.userfield));
+ 		}
+ 		if (it_cdr->party_b.snapshot
+ 			&& !strcasecmp(it_cdr->party_b.snapshot->name, info->channel_name)) {
+-			strcpy(it_cdr->party_b.userfield, info->userfield);
++			ast_copy_string(it_cdr->party_b.userfield, info->userfield,
++				sizeof(it_cdr->party_b.userfield));
+ 		}
  	}
- 
  	return 0;
 @@ -3407,7 +3408,8 @@ void ast_cdr_setuserfield(const char *channel_name, const char *userfield)
- 			if (it_cdr->fn_table == &finalized_state_fn_table && it_cdr->next != NULL) {
+ 			if (it_cdr->fn_table == &finalized_state_fn_table) {
  				continue;
  			}
 -			ast_copy_string(it_cdr->party_a.userfield, userfield, AST_MAX_USER_FIELD);
diff --git a/debian/patches/series b/debian/patches/series
index 240b7c0..b378761 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,4 +51,5 @@ AST-2017-005-13.13.diff
 AST-2017-006-13.diff
 AST-2017-008-13.13.diff
 # AST-2017-009: irrelevant: a patch to pjproject
+AST-2017-010.patch
 AST-2017-012.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git