From 745393012a1981101693f9dd0476ff1d15d7ea02 Mon Sep 17 00:00:00 2001 From: Daniel Silhavy Date: Mon, 22 Jan 2024 16:53:43 +0100 Subject: [PATCH] Add a try/catch around matchSettingsLang in case bcp47Normalize fails with an error (#4365) --- src/streaming/controllers/MediaController.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/streaming/controllers/MediaController.js b/src/streaming/controllers/MediaController.js index d009c3288f..de23384275 100644 --- a/src/streaming/controllers/MediaController.js +++ b/src/streaming/controllers/MediaController.js @@ -340,10 +340,14 @@ function MediaController() { } function matchSettingsLang(settings, track) { - return !settings.lang || - (settings.lang instanceof RegExp) ? - (track.lang.match(settings.lang)) : track.lang !== '' ? - (extendedFilter(track.lang, bcp47Normalize(settings.lang)).length > 0) : false; + try { + return !settings.lang || + (settings.lang instanceof RegExp) ? + (track.lang.match(settings.lang)) : track.lang !== '' ? + (extendedFilter(track.lang, bcp47Normalize(settings.lang)).length > 0) : false; + } catch (e) { + return false + } } function matchSettingsIndex(settings, track) {