diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-09-21 15:45:46 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-09-21 15:45:46 +0000 |
| commit | 4a356afb7defb1c6e8f1e1f307947785bb759093 (patch) | |
| tree | 5bf60365e0c39234fb9820c4095dd1ed8ba4aced /res | |
| parent | 9b4cfb0d28156f5aaca019a4d1cd97bcd6cf5820 (diff) | |
Merged revisions 287895 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r287895 | russell | 2010-09-21 10:43:33 -0500 (Tue, 21 Sep 2010) | 10 lines
Don't use ast_strdupa() from within the arguments to a function.
(closes issue #17902)
Reported by: afried
Patches:
issue_17902.rev1.txt uploaded by russell (license 2)
Tested by: russell
Review: https://reviewboard.asterisk.org/r/927/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_rtp_asterisk.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 6ddd33902..643794890 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -2012,9 +2012,12 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc ast_sockaddr_copy(&rtp->strict_rtp_address, &addr); } else { + const char *real_addr = ast_strdupa(ast_sockaddr_stringify(&addr)); + const char *expected_addr = ast_strdupa(ast_sockaddr_stringify(&rtp->strict_rtp_address)); + ast_debug(1, "Received RTP packet from %s, dropping due to strict RTP protection. Expected it to be from %s\n", - ast_strdupa(ast_sockaddr_stringify(&addr)), - ast_strdupa(ast_sockaddr_stringify(&rtp->strict_rtp_address))); + real_addr, expected_addr); + return &ast_null_frame; } } |