Ticket #1479: patch.diff.1479

Index: stream/asf_mmst_streaming.c
===================================================================
--- stream/asf_mmst_streaming.c (Revision 29358)
+++ stream/asf_mmst_streaming.c (Arbeitskopie)
@@ -104,7 +104,7 @@
   return ret;
 }
 
-static void send_command (int s, int command, uint32_t switches,
+static int send_command (int s, int command, uint32_t switches,
                          uint32_t extra, int length,
                          char *data)
 {
@@ -135,7 +135,9 @@
 
   if (send (s, cmd.buf, len8*8+48, 0) != (len8*8+48)) {
     mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_WriteError);
+    return -1;
   }
+  return 1;
 }
 
 #ifdef CONFIG_ICONV
@@ -172,7 +174,7 @@
 #endif
 }
 
-static void get_answer (int s)
+static int get_answer (int s)
 {
   char  data[BUF_SIZE];
   int   command = 0x1b;
@@ -181,16 +183,21 @@
     int len;
 
     len = recv (s, data, BUF_SIZE, 0) ;
-    if (!len) {
+    if (len <= 0) {
       mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_EOFAlert);
-      return;
+      return len;
     }
 
     command = get_32 (data, 36) & 0xFFFF;
 
-    if (command == 0x1b)
-      send_command (s, 0x1b, 0, 0, 0, data);
+    if (command == 0x1b) {
+      len = send_command (s, 0x1b, 0, 0, 0, data);
+      if (len < 0) {
+       return len;
+      }
+    }
   }
+  return 1;
 }
 
 static int get_data (int s, char *buf, size_t count)
@@ -296,7 +303,8 @@
 //      mp_msg(MSGT_NETWORK,MSGL_INFO,"command: %02x\n", command);
 
       if (command == 0x1b)
-       send_command (s, 0x1b, 0, 0, 0, data);
+       if (send_command (s, 0x1b, 0, 0, 0, data) < 0)
+         return 0;
 
     }
 
@@ -526,7 +534,7 @@
   char                 data[BUF_SIZE];
   uint8_t              asf_header[HDR_BUF_SIZE];
   int                  asf_header_len;
-  int                  len, i, packet_length;
+  int                  i, packet_length;
   char                *path, *unescpath;
   URL_t *url1 = stream->streaming_ctrl->url;
   int s = stream->fd;
@@ -577,9 +585,13 @@
   snprintf (str, 1023, "\034\003NSPlayer/7.0.0.1956; {33715801-BAB3-9D85-24E9-03B90328270A}; Host: %s", url1->hostname);
   string_utf16 (data, str, strlen(str));
 // send_command(s, commandno ....)
-  send_command (s, 1, 0, 0x0004000b, strlen(str)*2+2, data);
+  if (send_command (s, 1, 0, 0x0004000b, strlen(str)*2+2, data) < 0) {
+    goto err_out;
+  }
 
-  len = recv (s, data, BUF_SIZE, 0) ;
+  if (recv (s, data, BUF_SIZE, 0) <= 0) {
+    goto err_out;
+  }
 
   /*This sends details of the local machine IP address to a Funnel system at the server.
   * Also, the TCP or UDP transport selection is sent.
@@ -591,19 +603,29 @@
 
   string_utf16 (&data[8], "\002\000\\\\192.168.0.1\\TCP\\1037", 24);
   memset (data, 0, 8);
-  send_command (s, 2, 0, 0, 24*2+10, data);
+  if (send_command (s, 2, 0, 0, 24*2+10, data) < 0) {
+    goto err_out;
+  }
 
-  len = recv (s, data, BUF_SIZE, 0) ;
+  if (recv (s, data, BUF_SIZE, 0) <= 0) {
+    goto err_out;
+  }
 
   /* This command sends file path (at server) and file name request to the server.
   * 0x5 */
 
   string_utf16 (&data[8], path, strlen(path));
   memset (data, 0, 8);
-  send_command (s, 5, 0, 0, strlen(path)*2+10, data);
+  if (send_command (s, 5, 0, 0, strlen(path)*2+10, data) < 0) {
+    goto err_out;
+  }
+
   free(path);
+  path = NULL;
 
-  get_answer (s);
+  if (get_answer (s) <= 0) {
+    goto err_out;
+  }
 
   /* The ASF header chunk request. Includes ?session' variable for pre header value.
   * After this command is sent,
@@ -613,7 +635,9 @@
   memset (data, 0, 40);
   data[32] = 2;
 
-  send_command (s, 0x15, 1, 0, 40, data);
+  if (send_command (s, 0x15, 1, 0, 40, data) < 0) {
+    goto err_out;
+  }
 
   num_stream_ids = 0;
   /* get_headers(s, asf_header);  */
@@ -643,7 +667,9 @@
     data[2] = 0xFF;
     data[3] = 0xFF;
     data[4] = audio_id;
-    send_command(s, 0x33, num_stream_ids, 0xFFFF | audio_id << 16, 8, data);
+    if (send_command(s, 0x33, num_stream_ids, 0xFFFF | audio_id << 16, 8, data) < 0) {
+      goto err_out;
+    }
   } else {
   for (i=1; i<num_stream_ids; i++) {
     data [ (i-1) * 6 + 2 ] = 0xFF;
@@ -652,10 +678,14 @@
     data [ (i-1) * 6 + 5 ] = 0x00;
   }
 
-  send_command (s, 0x33, num_stream_ids, 0xFFFF | stream_ids[0] << 16, (num_stream_ids-1)*6+2 , data);
+  if (send_command (s, 0x33, num_stream_ids, 0xFFFF | stream_ids[0] << 16, (num_stream_ids-1)*6+2 , data) < 0) {
+    goto err_out;
   }
+  }
 
-  get_answer (s);
+  if (get_answer (s) <= 0) {
+    goto err_out;
+  }
 
   /* Start sending file from packet xx.
   * This command is also used for resume downloads or requesting a lost packet.
@@ -670,7 +700,9 @@
 
   data[20] = 0x04;
 
-  send_command (s, 0x07, 1, 0xFFFF | stream_ids[0] << 16, 24, data);
+  if (send_command (s, 0x07, 1, 0xFFFF | stream_ids[0] << 16, 24, data) < 0) {
+    goto err_out;
+  }
 
   stream->fd = s;
   stream->streaming_ctrl->streaming_read = asf_mmst_streaming_read;
@@ -687,4 +719,14 @@
 #endif
 
   return 0;
+
+ err_out:
+  if (s > 0)
+    closesocket(s);
+
+  if (path) {
+    free(path);
+  }
+  stream->fd = -1;
+  return -1;
 }