Skip to content

Commit

Permalink
fix: exception if on early adError (shaka-project#4362)
Browse files Browse the repository at this point in the history
If onAdError is called before onAdStart_ then onAdComplete_ uses
this.ad_ which is undefined.

This can happen if a VAST XML file contains no ads.

Fixes shaka-project#4004
  • Loading branch information
jukart committed Jul 19, 2022
1 parent 46b27f1 commit 3c92f05
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -43,6 +43,7 @@ Johan Sundström <oyasumi@gmail.com>
Jonas Birmé <jonas.birme@eyevinn.se>
Jozef Chúťka <jozefchutka@gmail.com>
Jun Hong Chong <chongjunhong@gmail.com>
Jürgen Kartnaller <kartnaller@lovelysystems.com>
JW Player <*@jwplayer.com>
Lucas Gabriel Sánchez <unkiwii@gmail.com>
Matthias Van Parijs <matvp91@gmail.com>
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS
Expand Up @@ -70,6 +70,7 @@ Jono Ward <jonoward@gmail.com>
Jozef Chúťka <jozefchutka@gmail.com>
Julian Domingo <juliandomingo@google.com>
Jun Hong Chong <chongjunhong@gmail.com>
Jürgen Kartnaller <kartnaller@lovelysystems.com>
Leandro Ribeiro Moreira <leandro.ribeiro.moreira@gmail.com>
Lucas Gabriel Sánchez <unkiwii@gmail.com>
Matias Russitto <russitto@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion lib/ads/client_side_ad_manager.js
Expand Up @@ -427,7 +427,7 @@ shaka.ads.ClientSideAdManager = class {
onAdComplete_(e) {
this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STOPPED,
(new Map()).set('originalEvent', e)));
if (this.ad_.isLinear()) {
if (this.ad_ && this.ad_.isLinear()) {
this.adContainer_.removeAttribute('ad-active');
this.video_.play();
}
Expand Down

0 comments on commit 3c92f05

Please sign in to comment.