Changeset 2520 for pjproject/trunk

Timestamp:

Mar 17, 2009 5:35:27 PM (16 years ago)

Author:

bennylp

Message:

Part of APS-Direct (ticket #738): crash in stream.c when stream_info->param is NULL

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1598 +1598 @@
     stream->port.info.clock_rate = info->fmt.clock_rate;
     stream->port.info.channel_count = info->fmt.channel_cnt;
-    stream->port.info.format.id = info->param->info.fmt_id;
     stream->port.port_data.pdata = stream;
-    if (stream->port.info.format.id == PJMEDIA_FORMAT_L16) {
+    if (info->param==NULL || info->param->info.fmt_id == PJMEDIA_FORMAT_L16) {
+        stream->port.info.format.id = PJMEDIA_FORMAT_L16;
+
         stream->port.put_frame = &put_frame;
         stream->port.get_frame = &get_frame;
     } else {
+        stream->port.info.format.id = info->param->info.fmt_id;
         stream->port.info.format.bitrate = info->param->info.avg_bps;
         stream->port.info.format.vad = (info->param->setting.vad != 0);