diff options
| author | David Schmitt <david.schmitt@puppetlabs.com> | 2015-05-27 20:05:01 +0100 |
|---|---|---|
| committer | David Schmitt <david.schmitt@puppetlabs.com> | 2015-05-27 20:05:05 +0100 |
| commit | cf9f7a6b7e4ede7edd612fde33f7149f9c7f3385 (patch) | |
| tree | 45e3ea607843a0ec02670cb5172d2951ac46dc50 /lib/puppet/parser/functions | |
| parent | b4090184c76666e58694aa4f09a39be009a42f5f (diff) | |
| download | puppet-stdlib-cf9f7a6b7e4ede7edd612fde33f7149f9c7f3385.tar.gz puppet-stdlib-cf9f7a6b7e4ede7edd612fde33f7149f9c7f3385.tar.bz2 | |
validate_integer, validate_numeric: explicitely reject hashes in arrays
Without this patch, Ruby 1.8's Hash#to_s behaviour causes [{1=>2}] to be
treated as "12" when validating values.
Diffstat (limited to 'lib/puppet/parser/functions')
| -rw-r--r-- | lib/puppet/parser/functions/validate_integer.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/validate_numeric.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/parser/functions/validate_integer.rb b/lib/puppet/parser/functions/validate_integer.rb index 995f8db..95da0c4 100644 --- a/lib/puppet/parser/functions/validate_integer.rb +++ b/lib/puppet/parser/functions/validate_integer.rb @@ -109,6 +109,7 @@ module Puppet::Parser::Functions # check every element of the array input.each_with_index do |arg, pos| begin + raise TypeError if arg.is_a?(Hash) arg = Integer(arg.to_s) validator.call(arg) rescue TypeError, ArgumentError diff --git a/lib/puppet/parser/functions/validate_numeric.rb b/lib/puppet/parser/functions/validate_numeric.rb index d2e4d16..3a14443 100644 --- a/lib/puppet/parser/functions/validate_numeric.rb +++ b/lib/puppet/parser/functions/validate_numeric.rb @@ -71,6 +71,7 @@ module Puppet::Parser::Functions # check every element of the array input.each_with_index do |arg, pos| begin + raise TypeError if arg.is_a?(Hash) arg = Float(arg.to_s) validator.call(arg) rescue TypeError, ArgumentError |