diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2008-12-19 15:05:29 +0100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-12-27 12:46:58 +1100 |
| commit | bdee116d08e9ed9c5efcf94a92709c061a8b43c2 (patch) | |
| tree | 487e3f7155ca420238d5b8ae19a63f22919394a9 /lib/puppet/parser | |
| parent | d69abfeaade452845924a0d4446dc1ea85637fc7 (diff) | |
| download | puppet-bdee116d08e9ed9c5efcf94a92709c061a8b43c2.tar.gz puppet-bdee116d08e9ed9c5efcf94a92709c061a8b43c2.tar.xz puppet-bdee116d08e9ed9c5efcf94a92709c061a8b43c2.zip | |
Fix #1828 - Scope.number? wasn't strict enough and could produce wrong results
Some invalid numbers were treated as numbers and conversion to Integer
was failing returning 0 (for instance 0.24.7).
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/scope.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 4acdf41c9..77e7b0cfd 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -52,11 +52,11 @@ class Puppet::Parser::Scope if value.is_a?(String) if value =~ /^-?\d+(:?\.\d+|(:?\.\d+)?e\d+)$/ return value.to_f - elsif value =~ /^0x\d+/i + elsif value =~ /^0x[0-9a-f]+$/i return value.to_i(16) - elsif value =~ /^0\d+/i + elsif value =~ /^0[0-7]+$/ return value.to_i(8) - elsif value =~ /^-?\d+/ + elsif value =~ /^-?\d+$/ return value.to_i else return nil |