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>

2 files changed, 17 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
diff --git a/spec/unit/parser/scope.rb b/spec/unit/parser/scope.rb
index fa76c4ff2..13559528b 100755
--- a/spec/unit/parser/scope.rb
+++ b/spec/unit/parser/scope.rb
@@ -81,7 +81,21 @@ describe Puppet::Parser::Scope do
             Puppet::Parser::Scope.number?("0755").should == 0755
         end
 
+        it "should return nil on malformed integers" do
+            Puppet::Parser::Scope.number?("0.24.5").should be_nil
+        end
+
+        it "should convert strings with leading 0 to integer if they are not octal" do
+            Puppet::Parser::Scope.number?("0788").should == 788
+        end
 
+        it "should convert strings of negative integers" do
+            Puppet::Parser::Scope.number?("-0788").should == -788
+        end
+
+        it "should return nil on malformed hexadecimal numbers" do
+            Puppet::Parser::Scope.number?("0x89g").should be_nil
+        end
     end
 
 end