diff options
author | George Joseph <gjoseph@digium.com> | 2016-08-24 13:42:34 -0600 |
---|---|---|
committer | George Joseph <gjoseph@digium.com> | 2016-08-24 14:54:14 -0500 |
commit | e40aa40aca1a18538fe08267296ca9a2847ad63a (patch) | |
tree | 5e62414b297aca102ff86723e593a709073d63e5 /res/res_rtp_multicast.c | |
parent | ded22c712a6886b45758d79c750cad199135a72a (diff) |
res_rtp_multicast: Fix SEGV in ast_multicast_rtp_create_options
ast_multicast_rtp_create_options now checks for NULL or empty options
Change-Id: Ib845eae46a67a9787e89a87ebd1027344e5e0362
Diffstat (limited to 'res/res_rtp_multicast.c')
-rw-r--r-- | res/res_rtp_multicast.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/res/res_rtp_multicast.c b/res/res_rtp_multicast.c index 5a7b26b6a..fce492659 100644 --- a/res/res_rtp_multicast.c +++ b/res/res_rtp_multicast.c @@ -143,7 +143,7 @@ struct ast_multicast_rtp_options *ast_multicast_rtp_create_options(const char *t mcast_options = ast_calloc(1, sizeof(*mcast_options) + strlen(type) - + strlen(options) + 2); + + strlen(S_OR(options, "")) + 2); if (!mcast_options) { return NULL; } @@ -155,8 +155,9 @@ struct ast_multicast_rtp_options *ast_multicast_rtp_create_options(const char *t mcast_options->type = pos; pos += strlen(type) + 1; - /* Safe */ - strcpy(pos, options); + if (!ast_strlen_zero(options)) { + strcpy(pos, options); /* Safe */ + } mcast_options->options = pos; if (ast_app_parse_options(multicast_rtp_options, &mcast_options->opts, |