Changeset 5581

Timestamp:

Apr 10, 2017 6:30:01 AM (8 years ago)

Author:

ming

Message:

Fixed #2011: Fixed crash when accessing video device info in pjsua2

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/media.hpp (modified) (1 diff)
• src/pjsua2/media.cpp (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua2/media.hpp

@@ -109 +109 @@
 
 /** Array of MediaFormat */
-typedef std::vector<MediaFormat*> MediaFormatVector;
+typedef std::vector<MediaFormat> MediaFormatVector;
 
 /**

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -599 +599 @@
 
     for (unsigned i=0; i<dev_info.ext_fmt_cnt;++i) {
-        MediaFormatAudio *format = new MediaFormatAudio;
-
-        format->fromPj(dev_info.ext_fmt[i]);
-        if (format->type == PJMEDIA_TYPE_AUDIO)
+        MediaFormatAudio format;
+        format.fromPj(dev_info.ext_fmt[i]);
+        if (format.type == PJMEDIA_TYPE_AUDIO)
             extFmt.push_back(format);
     }
@@ -609 +608 @@
 AudioDevInfo::~AudioDevInfo()
 {
-    for(unsigned i=0;i<extFmt.size();++i) {
-        delete extFmt[i];
-    }
-    extFmt.clear();
 }
 
@@ -1265 +1260 @@
 
     for (unsigned i = 0; i<dev_info.fmt_cnt;++i) {
-        MediaFormatVideo *format = new MediaFormatVideo;
-
-        format->fromPj(dev_info.fmt[i]);
-        if (format->type == PJMEDIA_TYPE_VIDEO)
+        MediaFormatVideo format;
+        format.fromPj(dev_info.fmt[i]);
+        if (format.type == PJMEDIA_TYPE_VIDEO)
             fmt.push_back(format);
     }
@@ -1278 +1272 @@
 VideoDevInfo::~VideoDevInfo()
 {
-#if PJSUA_HAS_VIDEO
-    for (unsigned i = 0;i<fmt.size();++i) {
-        delete fmt[i];
-    }
-    fmt.clear();
-#endif
 }