rtp_engine: Failed assertion and wrong name given for codec

Fixed an assert check that would trigger when the passed in value was negative.
The negative value was being cast to an unsigned value. This resulted in the
check failing.

Also fixed another problem when loading formats in the engine. When setting the
mime type the format's name was being passed in instead of the codec's name.

Change-Id: I1a201cd419ba4d8e9a40d337e36b6fbe1737192c

diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 8d46bfdcc91bb9133891efc8055e947d58fc1681..50398a5c6f4bcab081803280a02fde6e69cc5d97 100644 (file)
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -737,6 +737,7 @@ int ast_rtp_codecs_payloads_set_rtpmap_type_rate(struct ast_rtp_codecs *codecs,
                } else {
                        new_type->format = t->payload_type.format;
                }
+
                if (new_type->format) {
                        /* SDP parsing automatically increases the reference count */
                        new_type->format = ast_format_parse_sdp_fmtp(new_type->format, "");
@@ -1773,7 +1774,11 @@ static void add_static_payload(int map, struct ast_format *format, int rtp_code)
        int x;
        struct ast_rtp_payload_type *type;
 
-       ast_assert(map < ARRAY_LEN(static_RTP_PT));
+       /*
+        * ARRAY_LEN's result is cast to an int so 'map' is not autocast to a size_t,
+        * which if negative would cause an assertion.
+        */
+       ast_assert(map < (int)ARRAY_LEN(static_RTP_PT));
 
        ast_rwlock_wrlock(&static_RTP_PT_lock);
        if (map < 0) {
@@ -1784,6 +1789,7 @@ static void add_static_payload(int map, struct ast_format *format, int rtp_code)
                                break;
                        }
                }
+
                if (map < 0) {
                        if (format) {
                                ast_log(LOG_WARNING, "No Dynamic RTP mapping available for format %s\n",
@@ -1815,14 +1821,10 @@ static void add_static_payload(int map, struct ast_format *format, int rtp_code)
 
 int ast_rtp_engine_load_format(struct ast_format *format)
 {
-       char *codec_name = ast_strdupa(ast_format_get_name(format));
-
-       codec_name = ast_str_to_upper(codec_name);
-
        set_next_mime_type(format,
                0,
                ast_codec_media_type2str(ast_format_get_type(format)),
-               codec_name,
+               ast_format_get_codec_name(format),
                ast_format_get_sample_rate(format));
        add_static_payload(-1, format, 0);