OptRegexp specs

Author: David Maloney

lib/msf/core/option_container.rb

@@ -487,7 +487,7 @@ def valid?(value)
 			Regexp.compile(value)
 
 			return true
-		rescue RegexpError
+		rescue RegexpError, TypeError
 			return false
 		end
 	end

spec/lib/msf/core/options/opt_regexp_spec.rb

@@ -0,0 +1,17 @@
+# -*- coding:binary -*-
+
+require 'spec_helper'
+require 'msf/core/option_container'
+
+describe Msf::OptRegexp do
+
+  valid_values = [
+      { :value => '^foo$',    :normalized => /^foo$/ },
+  ]
+  invalid_values = [
+      { :value => 123 },
+      { :value => 'foo('}
+  ]
+
+  it_behaves_like "an option", valid_values, invalid_values, 'regexp'
+end