Fix avoiding crash if URL is invalid

toshi0123 · web-flow · commit eff6e04e2bf9 · 2019-04-18T19:10:46.000+09:00
Signed-off-by: toshi0123 &lt;7948737+toshi0123@users.noreply.github.com&gt;
diff --git a/lib/web/imageRouter/filesystem.js b/lib/web/imageRouter/filesystem.js
@@ -16,5 +16,12 @@ exports.uploadImage = function (imagePath, callback) {
     return
   }
 
-  callback(null, (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href)
+  let url
+  try {
+    url = (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href
+  } catch (e) {
+    url = config.serverURL + '/uploads/' + path.basename(imagePath)
+  }
+
+  callback(null, url)
 }

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,12 @@ exports.uploadImage = function (imagePath, callback) {`
`16`	`16`	`return`
`17`	`17`	`}`
`18`	`18`
`19`		`- callback(null, (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href)`
	`19`	`+ let url`
	`20`	`+ try {`
	`21`	`+ url = (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href`
	`22`	`+ } catch (e) {`
	`23`	`+ url = config.serverURL + '/uploads/' + path.basename(imagePath)`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ callback(null, url)`
`20`	`27`	`}`