Better error handling for dragMouse.

octalmage · octalmage · commit 93417d3f93fa · 2016-01-08T10:41:11.000-06:00
diff --git a/src/robotjs.cc b/src/robotjs.cc
@@ -52,7 +52,7 @@ int CheckMouseButton(const char * const b, MMMouseButton * const button)
 
 NAN_METHOD(dragMouse)
 {
-	if (info.Length() < 2)
+	if (info.Length() < 2 || info.Length() > 3)
 	{
 		return Nan::ThrowError("Invalid number of arguments.");
 	}
@@ -61,7 +61,7 @@ NAN_METHOD(dragMouse)
 	const size_t y = info[1]->Int32Value();
 	MMMouseButton button = LEFT_BUTTON;
 
-	if (info.Length() >= 3)
+	if (info.Length() == 3)
 	{
 		Nan::Utf8String bstr(info[2]);
 		const char * const b = *bstr;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ int CheckMouseButton(const char * const b, MMMouseButton * const button)`
`52`	`52`
`53`	`53`	`NAN_METHOD(dragMouse)`
`54`	`54`	`{`
`55`		`- if (info.Length() < 2)`
	`55`	`+ if (info.Length() < 2 \|\| info.Length() > 3)`
`56`	`56`	`{`
`57`	`57`	`return Nan::ThrowError("Invalid number of arguments.");`
`58`	`58`	`}`
`@@ -61,7 +61,7 @@ NAN_METHOD(dragMouse)`
`61`	`61`	`const size_t y = info[1]->Int32Value();`
`62`	`62`	`MMMouseButton button = LEFT_BUTTON;`
`63`	`63`
`64`		`- if (info.Length() >= 3)`
	`64`	`+ if (info.Length() == 3)`
`65`	`65`	`{`
`66`	`66`	`Nan::Utf8String bstr(info[2]);`
`67`	`67`	`const char * const b = *bstr;`