fix some bug of strtold by flyingfish89 · Pull Request #8495 · apache/nuttx

flyingfish89 · 2023-02-10T09:52:49Z

Summary

with the test of sim:lua ,I have fixed some bug of error output
1.input: " " and error output string is "NULL"
2.input: "1.2e+", error output string is "NULL"
3.input: "." error output string is "NULL"

Impact

Testing

  char *a = "    n";
  char *b;
  float number = strtof(a,&b);
  syslog(LOG_INFO,"string is %s\n number is %f and string is %s\n",a,number,b);

  a = " 10  nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "2nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);
  a = " 3e0 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "1.0e+nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "2 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "2nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "-2 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"astring is %s\nnumber is %f and string is %s\n",a,number,b);
  a = " -0xa nsh";
  number = strtof(a,&b);
  syslog(LOG_INFO,"astring is %s\n number is %f and string is %s\n",a,number,b);
  a = "+0.01 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"astring is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "+.01 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"astring is %s\nnumber is %f and string is %s\n",a,number,b);
  a = ".01 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"astring is %s\nnumber is %f and string is %s\n",a,number,b); 
 a = "-1. nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"astring is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "+1. nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"astring is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "+ 0.01 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"astring is %s\nnumber is %f and string is %s\n",a,number,b); 
 a = "+.e1 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);
  a = "1e nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "1.0e+ nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = ". nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "nan";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "-012 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "-1.2e2 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "e1 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0xffffffffffff nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "x";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0xffffffffffff nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0x3. nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0x0. nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "-0xfFfa nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0xffffFFFF nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0x.0p-3";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0ffffFFFF nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "+0x2 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "-0xaA nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "-0xffFFFfff nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0E+1 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0E+1 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0xe-1 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "  0x2.5 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "  -0x2.5 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0x0.51p nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0x.00000001 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0xA.a nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0xa.aP4 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0x4P-2 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0x1.1 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "1. nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = ".1 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "0.001e+3 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "1111111111111110 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "1111111111111111 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "+1.23E18 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = " 1.3e-2  nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = " -1.00000000000001 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "10 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);  a = "20 nsh";
  number = strtof(a,&b);
 syslog(LOG_INFO,"string is %s\nnumber is %f and string is %s\n",a,number,b);

with the test of sim:lua ,I have fixed some bug of error output 1.input: " " and error output string is "NULL" 2.input: "1.2e+", error output string is "NULL" 3.input: "." error output string is "NULL"

fjpanag · 2023-02-11T13:52:58Z

@flyingfish89 Thank you for this.

Just to provide some feedback, after this patch, all tests pass, apart from specifically the following:

assert(tonumber'+ 0.01' == nil and tonumber'+.e1' == nil and
       tonumber'1e' == nil     and tonumber'1.0e+' == nil and
       tonumber'.' == nil)

I think this is the only one left.

flyingfish89 · 2023-02-11T14:52:48Z

@flyingfish89 Thank you for this.

Just to provide some feedback, after this patch, all tests pass, apart from specifically the following:
assert(tonumber'+ 0.01' == nil and tonumber'+.e1' == nil and
       tonumber'1e' == nil     and tonumber'1.0e+' == nil and
       tonumber'.' == nil)
I think this is the only one left.

yes,i have tried these,and i have found if " '1.0e+' == nil " is wrong ,because it will return 1.0 and "+"

flyingfish89 · 2023-02-11T15:05:56Z

Oh, this "e" should be returned, coule you change the strtold.c like this and try again

fjpanag · 2023-02-11T15:22:30Z

Well... After applying this change, a get a previous test failing:

assert(0e12 == 0 and .0 == 0 and 0. == 0 and .2e2 == 20 and 2.E-1 == 0.2)

with:

math.lua:5: malformed number near '2.E-1'

flyingfish89 · 2023-02-11T15:39:22Z

ok,how about this

fjpanag · 2023-02-11T15:47:04Z

Unfortunatelly not...

assert(string.format("%+08d", 2^31 - 1) == "+2147483647")

fails with:

strings.lua:154: malformed number near '2'

flyingfish89 · 2023-02-11T16:17:41Z

i'm sorry.i have tried this and i couldn't found any question,could you please show me about it!

flyingfish89 · 2023-02-11T16:29:16Z

also,i have trid this

fjpanag · 2023-02-11T16:30:13Z

Maybe I did a typo? Can you please post as code, instead of a screenshot?

flyingfish89 · 2023-02-11T16:36:23Z

yes

and this is the return

flyingfish89 · 2023-02-11T16:43:24Z

em...,this mistake have no connection with what I just modified

fjpanag · 2023-02-21T10:54:21Z

@flyingfish89 sorry for the long delay, I was concentrating on other issues.

I applied your above change:

  if (((c | 32) == 'e' && isdigit(*f)) || ((*f == '+' || *f == '-') && (isdigit(*(f + 1)))))
    {
      num_decimal = scanexp(&f, 1) + num_decimal;
      if (num_decimal <= llong_min / 100)
        {
          ifexist(endptr, f);
          return zero;
        }
    }

And indeed I get:

strings.lua:154: malformed number near '2'

If I remove this change, this test passes. So the error is only triggered with this change.

I tried the same test with sim:lua.
The error remains identical:

flyingfish89 · 2023-02-21T11:17:48Z

if ((c | 32) == 'e' && (isdigit(*f) || ((*f == '+' || *f == '-') && (isdigit(*(f + 1))))))
how about this

fjpanag · 2023-02-21T11:32:31Z

@flyingfish89 Yes! That did the trick!
All tests now pass.

Can you please provide a PR for this?

flyingfish89 · 2023-02-21T11:35:01Z

ok.

fix some bug of strtold

ed474ef

with the test of sim:lua ,I have fixed some bug of error output 1.input: " " and error output string is "NULL" 2.input: "1.2e+", error output string is "NULL" 3.input: "." error output string is "NULL"

flyingfish89 force-pushed the fixbug_strtof branch from e6dc07e to ed474ef Compare February 10, 2023 09:55

xiaoxiang781216 approved these changes Feb 10, 2023

View reviewed changes

xiaoxiang781216 merged commit 2334484 into apache:master Feb 10, 2023

flyingfish89 mentioned this pull request Feb 21, 2023

fix a bug of strtof #8608

Merged

xiaoxiang781216 mentioned this pull request Mar 6, 2023

Adding sdr group with liquid-dsp library apache/nuttx-apps#1624

Merged

Conversation

flyingfish89 commented Feb 10, 2023 • edited by xiaoxiang781216 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Impact

Testing

Uh oh!

fjpanag commented Feb 11, 2023

Uh oh!

flyingfish89 commented Feb 11, 2023

Uh oh!

flyingfish89 commented Feb 11, 2023

Uh oh!

fjpanag commented Feb 11, 2023

Uh oh!

flyingfish89 commented Feb 11, 2023

Uh oh!

fjpanag commented Feb 11, 2023

Uh oh!

flyingfish89 commented Feb 11, 2023

Uh oh!

flyingfish89 commented Feb 11, 2023

Uh oh!

fjpanag commented Feb 11, 2023

Uh oh!

flyingfish89 commented Feb 11, 2023

Uh oh!

flyingfish89 commented Feb 11, 2023

Uh oh!

fjpanag commented Feb 21, 2023

Uh oh!

flyingfish89 commented Feb 21, 2023

Uh oh!

fjpanag commented Feb 21, 2023

Uh oh!

flyingfish89 commented Feb 21, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

flyingfish89 commented Feb 10, 2023 •

edited by xiaoxiang781216

Loading