Guard against the xhr callback clearing segmentXr_ or pendingSegment_ when the c…

…allback is no longer valid
In XHR, aborts eventually cause timeouts which cause the callback to be issued again later. We would see that it was a timeout and clear two important state holding properties on the Hls object which could cause problems processing the current segment

@@ -984,17 +984,25 @@ videojs.HlsHandler.prototype.loadSegment = function(segmentInfo) {
     // decrease in network performance or a server issue.
     // decrease in network performance or a server issue.
     timeout: (segment.duration * 1.5) * 1000
     timeout: (segment.duration * 1.5) * 1000
   }, function(error, request) {
   }, function(error, request) {
-    // the segment request is no longer outstanding
-    self.segmentXhr_ = null;
+    // This is a timeout of a previously aborted segment request
+    // so simply ignore it
+    if (!self.segmentXhr_ || request !== self.segmentXhr_) {
+      return;
+    }
 
 
     // if a segment request times out, we may have better luck with another playlist
     // if a segment request times out, we may have better luck with another playlist
     if (request.timedout) {
     if (request.timedout) {
+      // the segment request is no longer outstanding
+      self.segmentXhr_ = null;
       self.bandwidth = 1;
       self.bandwidth = 1;
       return self.playlists.media(self.selectPlaylist());
       return self.playlists.media(self.selectPlaylist());
     }
     }
 
 
     // otherwise, trigger a network error
     // otherwise, trigger a network error
     if (!request.aborted && error) {
     if (!request.aborted && error) {
+      // the segment request is no longer outstanding
+      self.segmentXhr_ = null;
+
       self.pendingSegment_ = null;
       self.pendingSegment_ = null;
       return self.blacklistCurrentPlaylist_({
       return self.blacklistCurrentPlaylist_({
         status: request.status,
         status: request.status,
@@ -1005,6 +1013,8 @@ videojs.HlsHandler.prototype.loadSegment = function(segmentInfo) {
 
 
     // stop processing if the request was aborted
     // stop processing if the request was aborted
     if (!request.response) {
     if (!request.response) {
+      // the segment request is no longer outstanding
+      self.segmentXhr_ = null;
       return;
       return;
     }
     }
 
 
@@ -1016,10 +1026,15 @@ videojs.HlsHandler.prototype.loadSegment = function(segmentInfo) {
     } else {
     } else {
       segmentInfo.bytes = new Uint8Array(request.response);
       segmentInfo.bytes = new Uint8Array(request.response);
     }
     }
+
     self.pendingSegment_ = segmentInfo;
     self.pendingSegment_ = segmentInfo;
+
     self.tech_.trigger('progress');
     self.tech_.trigger('progress');
     self.drainBuffer();
     self.drainBuffer();
 
 
+    // the segment request is no longer outstanding
+    self.segmentXhr_ = null;
+
     // figure out what stream the next segment should be downloaded from
     // figure out what stream the next segment should be downloaded from
     // with the updated bandwidth information
     // with the updated bandwidth information
     self.playlists.media(self.selectPlaylist());
     self.playlists.media(self.selectPlaylist());