comparison libmpdemux/asf_mmst_streaming.c @ 14163:dd835e8f3698

fix a problem pointed out by iDEFENSE and several similar ones.

14162:5f24743d1fb8

#include "stream.h"

#include "network.h"

#define BUF_SIZE 102400

typedef struct 
{
  uint8_t buf[BUF_SIZE];
  int     num_bytes;

      
      packet_len = (pre_header[7] << 8 | pre_header[6]) - 8;

//      printf ("asf header packet detected, len=%d\n", packet_len);

      if (!get_data (s, &header[header_len], packet_len)) {
	printf ("header data read failed\n");
	return 0;
      }

      }
      
      packet_len = get_32 ((unsigned char*)&packet_len, 0) + 4;
      
//      printf ("command packet detected, len=%d\n", packet_len);
      
      if (!get_data (s, data, packet_len)) {
	printf ("command data read failed\n");
	return 0;
      }

    packet_len = (pre_header[7] << 8 | pre_header[6]) - 8;

//    printf ("asf media packet detected, len=%d\n", packet_len);

    if (!get_data (s, data, packet_len)) {
      printf ("media data read failed\n");
      return 0;
    }

      printf ("packet_len read failed\n");
      return 0;
    }

    packet_len = get_32 ((unsigned char*)&packet_len, 0) + 4;

    if (!get_data (s, data, packet_len)) {
      printf ("command data read failed\n");
      return 0;
    }

int asf_mmst_streaming_start(stream_t *stream)
{
  char                 str[1024];
  char                 data[BUF_SIZE];
  uint8_t              asf_header[8192];
  int                  asf_header_len;
  int                  len, i, packet_length;
  char                *path, *unescpath;
  URL_t *url1 = stream->streaming_ctrl->url;
  int s = stream->fd;

14163:dd835e8f3698

#include "stream.h"

#include "network.h"

#define BUF_SIZE 102400
#define HDR_BUF_SIZE 8192

typedef struct 
{
  uint8_t buf[BUF_SIZE];
  int     num_bytes;

      
      packet_len = (pre_header[7] << 8 | pre_header[6]) - 8;

//      printf ("asf header packet detected, len=%d\n", packet_len);

      if (packet_len < 0 || packet_len > HDR_BUF_SIZE - header_len) {
        mp_msg(MSGT_NETWORK, MSGL_FATAL, "Invalid header size, giving up\n");
        return 0;
      }

      if (!get_data (s, &header[header_len], packet_len)) {
	printf ("header data read failed\n");
	return 0;
      }

      }
      
      packet_len = get_32 ((unsigned char*)&packet_len, 0) + 4;
      
//      printf ("command packet detected, len=%d\n", packet_len);

      if (packet_len < 0 || packet_len > BUF_SIZE) {
        mp_msg(MSGT_NETWORK, MSGL_FATAL,
                "Invalid rtsp packet size, giving up\n");
        return 0;
      }
      
      if (!get_data (s, data, packet_len)) {
	printf ("command data read failed\n");
	return 0;
      }

    packet_len = (pre_header[7] << 8 | pre_header[6]) - 8;

//    printf ("asf media packet detected, len=%d\n", packet_len);

    if (packet_len < 0 || packet_len > BUF_SIZE) {
      mp_msg(MSGT_NETWORK, MSGL_FATAL,
              "Invalid rtsp packet size, giving up\n");
      return 0;
    }
      
    if (!get_data (s, data, packet_len)) {
      printf ("media data read failed\n");
      return 0;
    }

      printf ("packet_len read failed\n");
      return 0;
    }

    packet_len = get_32 ((unsigned char*)&packet_len, 0) + 4;

    if (packet_len < 0 || packet_len > BUF_SIZE) {
      mp_msg(MSGT_NETWORK, MSGL_FATAL,
              "Invalid rtsp packet size, giving up\n");
      return 0;
    }

    if (!get_data (s, data, packet_len)) {
      printf ("command data read failed\n");
      return 0;
    }

int asf_mmst_streaming_start(stream_t *stream)
{
  char                 str[1024];
  char                 data[BUF_SIZE];
  uint8_t              asf_header[HDR_BUF_SIZE];
  int                  asf_header_len;
  int                  len, i, packet_length;
  char                *path, *unescpath;
  URL_t *url1 = stream->streaming_ctrl->url;
  int s = stream->fd;