merge fix, add test

@@ -204,14 +204,8 @@ var
   totalDuration = function(playlist) {
   totalDuration = function(playlist) {
     var
     var
       duration = 0,
       duration = 0,
-      i,
-      segment;
-
-    if (!playlist || !playlist.segments) {
-      return 0;
-    }
-
-    i = playlist.segments.length;
+      segment,
+      i = (playlist.segments || []).length;
 
 
     // if present, use the duration specified in the playlist
     // if present, use the duration specified in the playlist
     if (playlist.totalDuration) {
     if (playlist.totalDuration) {
@@ -386,10 +380,11 @@ var
      * Update the player duration
      * Update the player duration
      */
      */
     updateDuration = function(playlist) {
     updateDuration = function(playlist) {
+      var tech;
       // update the duration
       // update the duration
       player.duration(totalDuration(playlist));
       player.duration(totalDuration(playlist));
       // tell the flash tech of the new duration
       // tell the flash tech of the new duration
-      var tech = player.el().querySelector('.vjs-tech');
+      tech = player.el().querySelector('.vjs-tech');
       if(tech.vjs_setProperty) {
       if(tech.vjs_setProperty) {
         tech.vjs_setProperty('duration', player.duration());
         tech.vjs_setProperty('duration', player.duration());
       }
       }
@@ -601,7 +596,7 @@ var
       var
       var
         buffered = player.buffered(),
         buffered = player.buffered(),
         bufferedTime = 0,
         bufferedTime = 0,
-        segment = player.hls.media.segments[player.hls.mediaIndex],
+        segment,
         segmentUri,
         segmentUri,
         startTime;
         startTime;
 
 
@@ -610,7 +605,13 @@ var
         return;
         return;
       }
       }
 
 
+      // if no segments are available, do nothing
+      if (!player.hls.media.segments) {
+        return;
+      }
+
       // if the video has finished downloading, stop trying to buffer
       // if the video has finished downloading, stop trying to buffer
+      segment = player.hls.media.segments[player.hls.mediaIndex];
       if (!segment) {
       if (!segment) {
         return;
         return;
       }
       }

@@ -1109,4 +1109,28 @@ test('only reloads the active media playlist', function() {
               'refreshed the active playlist');
               'refreshed the active playlist');
 });
 });
 
 
+test('does not break if the playlist has no segments', function() {
+  window.XMLHttpRequest = function () {
+    this.open = function () {};
+    this.send = function () {
+      this.readyState = 4;
+      this.status = 200;
+      this.responseText = '#EXTM3U\n' +
+        '#EXT-X-PLAYLIST-TYPE:VOD\n' +
+        '#EXT-X-TARGETDURATION:10\n';
+      this.onreadystatechange();
+    };
+  };
+  player.hls('manifest/master.m3u8');
+  try {
+    videojs.mediaSources[player.currentSrc()].trigger({
+      type: 'sourceopen'
+    });
+  } catch(e) {
+    ok(false, 'an error was thrown');
+    throw e;
+  }
+  ok(true, 'no error was thrown');
+});
+
 })(window, window.videojs);
 })(window, window.videojs);