Changeset 5190 for pjproject/trunk/pjmedia/src/pjmedia/sdp.c

Timestamp:

Oct 23, 2015 9:45:48 AM (9 years ago)

Author:

nanang

Message:

Misc (re #1882): Added array length check before inserting parsed bandwidth & attribute info to SDP structure (thanks Fredrik Hansson for the patch).

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -1243 +1243 @@
                     if (attr) {
                         if (media) {
-                            pjmedia_sdp_media_add_attr(media, attr);
+                            if (media->attr_count < PJMEDIA_MAX_SDP_ATTR)
+                                pjmedia_sdp_media_add_attr(media, attr);
+                            else
+                                PJ_PERROR(2, (THIS_FILE, PJ_ETOOMANY,
+                                              "Error adding media attribute, "
+                                              "attribute is ignored"));
                         } else {
-                            pjmedia_sdp_session_add_attr(session, attr);
+                            if (session->attr_count < PJMEDIA_MAX_SDP_ATTR)
+                                pjmedia_sdp_session_add_attr(session, attr);
+                            else
+                                PJ_PERROR(2, (THIS_FILE, PJ_ETOOMANY,
+                                              "Error adding session attribute"
+                                              ", attribute is ignored"));
                         }
                     }
@@ -1295 +1305 @@
                     parse_bandwidth_info(&scanner, bandw, &ctx);
                     if (media) {
-                        media->bandw[media->bandw_count++] = bandw;
+                        if (media->bandw_count < PJMEDIA_MAX_SDP_BANDW)
+                            media->bandw[media->bandw_count++] = bandw;
+                        else
+                            PJ_PERROR(2, (THIS_FILE, PJ_ETOOMANY,
+                                          "Error adding media bandwidth "
+                                          "info, info is ignored"));
                     } else {
-                        session->bandw[session->bandw_count++] = bandw;
+                        if (session->bandw_count < PJMEDIA_MAX_SDP_BANDW)
+                            session->bandw[session->bandw_count++] = bandw;
+                        else
+                            PJ_PERROR(2, (THIS_FILE, PJ_ETOOMANY,
+                                          "Error adding session bandwidth "
+                                          "info, info is ignored"));
                     }
                     break;