From a6cb0b654006cd6862eac4505511bebdf7a3ac8f Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Fri, 28 Oct 2016 13:46:07 -0700 Subject: [PATCH] ObjectLoader: Added try/catch. See #9909. --- src/loaders/ObjectLoader.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/loaders/ObjectLoader.js b/src/loaders/ObjectLoader.js index 9a0eec3d7b..61e80cdd49 100644 --- a/src/loaders/ObjectLoader.js +++ b/src/loaders/ObjectLoader.js @@ -56,7 +56,19 @@ Object.assign( ObjectLoader.prototype, { var loader = new XHRLoader( scope.manager ); loader.load( url, function ( text ) { - var json = JSON.parse( text ); + var json = null; + + try { + + json = JSON.parse( text ); + + } catch ( error ) { + + console.error( 'THREE:ObjectLoader: Can\'t parse ' + url + '.', error.message ); + return; + + } + var metadata = json.metadata; if ( metadata === undefined || metadata.type === undefined || metadata.type.toLowerCase() === 'geometry' ) { -- GitLab