Merged revisions 71915 via svnmerge from
authorJason Parker <jparker@digium.com>
Tue, 26 Jun 2007 20:36:50 +0000 (20:36 +0000)
committerJason Parker <jparker@digium.com>
Tue, 26 Jun 2007 20:36:50 +0000 (20:36 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r71915 | qwell | 2007-06-26 15:36:09 -0500 (Tue, 26 Jun 2007) | 4 lines

Don't dereference a pointer that may be NULL here.

Issue 10017.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71916 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/rtp.c

index 691d391..ca2b01c 100644 (file)
@@ -2709,6 +2709,9 @@ static int ast_rtcp_write(void *data)
        struct ast_rtp *rtp = data;
        int res;
        
+       if (!rtp || !rtp->rtcp)
+               return 0;
+
        if (rtp->txcount > rtp->rtcp->lastsrtxcount)
                res = ast_rtcp_write_sr(data);
        else