fix infinite loop with empty comma

diff --git a/MANIFEST b/MANIFEST
index 56c070aca648b19b3e85ef7c26c3ccffbee1763c..efc039b69c23053cbe4bdc1d41696a3855df4f77 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -906,6 +906,7 @@ t/010-modules/070-escape.t
 t/010-modules/080-cfg.t
 t/010-modules/090-subcalc.t
 t/010-modules/100-password-validate.t
 t/010-modules/080-cfg.t
 t/010-modules/090-subcalc.t
 t/010-modules/100-password-validate.t

+t/010-modules/110-number.t

 t/020-templater/000-load.t
 t/020-templater/010-token.t
 t/020-templater/020-parse.t
 t/020-templater/000-load.t
 t/020-templater/010-token.t
 t/020-templater/020-parse.t

diff --git a/site/cgi-bin/modules/BSE/Util/Format.pm b/site/cgi-bin/modules/BSE/Util/Format.pm
index 7e5c3ad0876791307c08795780ece6c12435a35f..8bb5949cb909194ebfea3ae74f4abaca497e8839 100644 (file)
--- a/site/cgi-bin/modules/BSE/Util/Format.pm
+++ b/site/cgi-bin/modules/BSE/Util/Format.pm
@@ -1,7 +1,7 @@
 package BSE::Util::Format;
 use strict;
 
 package BSE::Util::Format;
 use strict;
 

-our $VERSION = "1.001";
+our $VERSION = "1.002";

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -85,7 +85,7 @@ sub bse_number {
   my $formatted = $places < 0 ? $div_value : sprintf("%.*f", $places, $div_value);
 
   my ($int, $frac) = split /\./, $formatted;
   my $formatted = $places < 0 ? $div_value : sprintf("%.*f", $places, $div_value);
 
   my ($int, $frac) = split /\./, $formatted;

-  if ($commify && $int >= $comma_limit) {
+  if ($commify && $int >= $comma_limit && $comma_sep ne "") {

     1 while $int =~ s/([0-9])([0-9][0-9][0-9]\b)/$1$comma_sep$2/;
   }
 
     1 while $int =~ s/([0-9])([0-9][0-9][0-9]\b)/$1$comma_sep$2/;
   }
 

diff --git a/t/010-modules/110-number.t b/t/010-modules/110-number.t
new file mode 100644 (file)
index 0000000..5ec245d
--- /dev/null
+++ b/t/010-modules/110-number.t
@@ -0,0 +1,27 @@
+#!perl
+use strict;
+use BSE::Util::Format qw(bse_number);
+use BSE::Cfg;
+use Test::More;
+
+{
+  my $cfg = BSE::Cfg->new_from_text(text => <<CFG);
+[number money]
+comma=,
+divisor=100
+places=2
+CFG
+  is(BSE::Util::Format::bse_number("money", 1_000_000, $cfg), "10,000.00",
+     "smoke test the basics");
+}
+
+{
+  my $cfg = BSE::Cfg->new_from_text(text => <<CFG);
+[number emptycomma]
+comma=""
+CFG
+  is(BSE::Util::Format::bse_number("emptycomma", 10000000, $cfg), "10000000",
+     "check empty comma doesn't infinite loop");
+}
+
+done_testing();