Merge pull request #261 from webpack/bugfix/parse-crash

validate arguments to resolve and use callback for errors

Author: sokra

lib/Resolver.js

@@ -257,6 +257,15 @@ class Resolver {
 	 * @returns {void}
 	 */
 	resolve(context, path, request, resolveContext, callback) {
+		if (!context || typeof context !== "object")
+			return callback(new Error("context argument is not an object"));
+		if (typeof path !== "string")
+			return callback(new Error("path argument is not a string"));
+		if (typeof request !== "string")
+			return callback(new Error("path argument is not a string"));
+		if (!resolveContext)
+			return callback(new Error("resolveContext argument is not set"));
+
 		const obj = {
 			context: context,
 			path: path,

test/resolve.js

@@ -294,4 +294,25 @@ describe("resolve", function () {
 			done();
 		});
 	});
+
+	it("should not crash when passing undefined as path", done => {
+		resolve(fixtures, undefined, err => {
+			err.should.be.instanceof(Error);
+			done();
+		});
+	});
+
+	it("should not crash when passing undefined as context", done => {
+		resolve({}, undefined, "./test/resolve.js", err => {
+			err.should.be.instanceof(Error);
+			done();
+		});
+	});
+
+	it("should not crash when passing undefined everywere", done => {
+		resolve(undefined, undefined, undefined, undefined, err => {
+			err.should.be.instanceof(Error);
+			done();
+		});
+	});
 });