JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2009-01-28 Jeff Johnston <jjohnstn@redhat.com>

Browse Source 
* libc/stdio/vfscanf.c (__SVFSCANF_R): Add additional check for
        inf and nan processing to not proceed if we have already collected
        zeroes.
This commit is contained in:
Jeff Johnston 2009-01-28 18:12:52 +00:00
parent 1ae0cd1335
commit 3e703e875a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@ -1,3 +1,9 @@
2009-01-28 Jeff Johnston <jjohnstn@redhat.com>
* libc/stdio/vfscanf.c (__SVFSCANF_R): Add additional check for
inf and nan processing to not proceed if we have already collected
zeroes.
2009-01-26 DJ Delorie <dj@redhat.com> 2009-01-26 DJ Delorie <dj@redhat.com>
* configure.host (m32c-*-*): Add long long I/O support by default. * configure.host (m32c-*-*): Add long long I/O support by default.

8
newlib/libc/stdio/vfscanf.c
View File

@ -489,6 +489,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
# define GET_ARG(n, ap, type) (va_arg (ap, type)) # define GET_ARG(n, ap, type) (va_arg (ap, type))
#endif #endif
__sfp_lock_acquire ();
_flockfile (fp); _flockfile (fp);
ORIENT (fp, -1); ORIENT (fp, -1);
@ -779,6 +780,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
*/ */
case '\0': /* compat */ case '\0': /* compat */
_funlockfile (fp); _funlockfile (fp);
__sfp_lock_release ();
return EOF; return EOF;
default: /* compat */ default: /* compat */
@ -1329,7 +1331,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
break; break;
case 'n': case 'n':
case 'N': case 'N':
if (nancount == 0 if (nancount == 0 && zeroes == 0
&& (flags & (NDIGITS | DPTOK | EXPOK)) == && (flags & (NDIGITS | DPTOK | EXPOK)) ==
(NDIGITS | DPTOK | EXPOK)) (NDIGITS | DPTOK | EXPOK))
{ {
@ -1358,7 +1360,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
break; break;
case 'i': case 'i':
case 'I': case 'I':
if (infcount == 0 if (infcount == 0 && zeroes == 0
&& (flags & (NDIGITS | DPTOK | EXPOK)) == && (flags & (NDIGITS | DPTOK | EXPOK)) ==
(NDIGITS | DPTOK | EXPOK)) (NDIGITS | DPTOK | EXPOK))
{ {
@ -1577,11 +1579,13 @@ input_failure:
invalid format string), return EOF if no matches yet, else number invalid format string), return EOF if no matches yet, else number
of matches made prior to failure. */ of matches made prior to failure. */
_funlockfile (fp); _funlockfile (fp);
__sfp_lock_release ();
return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF; return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF;
match_failure: match_failure:
all_done: all_done:
/* Return number of matches, which can be 0 on match failure. */ /* Return number of matches, which can be 0 on match failure. */
_funlockfile (fp); _funlockfile (fp);
__sfp_lock_release ();
return nassigned; return nassigned;
} }