Catch more errors (#498)

index.js

@@ -144,6 +144,13 @@ function requestAsEventEmitter(opts) {
 
 				redirectUrl = urlLib.resolve(urlLib.format(opts), bufferString);
 
+				try {
+					decodeURI(redirectUrl);
+				} catch (err) {
+					ee.emit('error', err);
+					return;
+				}
+
 				redirects.push(redirectUrl);
 
 				const redirectOpts = {
@@ -161,8 +168,8 @@ function requestAsEventEmitter(opts) {
 			setImmediate(() => {
 				try {
 					getResponse(res, opts, ee, redirects);
-				} catch (e) {
-					ee.emit('error', e);
+				} catch (err) {
+					ee.emit('error', err);
 				}
 			});
 		});
@@ -191,7 +198,13 @@ function requestAsEventEmitter(opts) {
 				const backoff = opts.retries(++retryCount, err);
 
 				if (backoff) {
-					setTimeout(get, backoff, opts);
+					setTimeout(opts => {
+						try {
+							get(opts);
+						} catch (e) {
+							ee.emit('error', e);
+						}
+					}, backoff, opts);
 					return;
 				}
 

test/redirects.js

@@ -123,6 +123,13 @@ test.before('setup', async () => {
 		res.end();
 	});
 
+	http.on('/malformedRedirect', (req, res) => {
+		res.writeHead(302, {
+			location: '/%D8'
+		});
+		res.end();
+	});
+
 	await http.listen(http.port);
 	await https.listen(https.port);
 });
@@ -210,3 +217,8 @@ test('redirect response contains old url', async t => {
 test('redirect response contains utf8 with binary encoding', async t => {
 	t.is((await got(`${http.url}/redirect-with-utf8-binary`)).body, 'reached');
 });
+
+test('throws on malformed redirect URI', async t => {
+	const err = await t.throws(got(`${http.url}/malformedRedirect`));
+	t.is(err.name, 'URIError');
+});