sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sscanf() bug fixes from David Sidrane

Browse Source
This commit is contained in:
Gregory Nutt 2014-02-18 14:14:07 -06:00
parent 662622b5dc
commit 927ec9c792
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libc/stdio/lib_sscanf.c
View File

@ -51,11 +51,19 @@
#include <debug.h>
/****************************************************************************
* Definitions
* Pre-processor Definitions
****************************************************************************/
#define MAXLN 128
#ifndef MIN
# define MIN(a,b) (a < b ? a : b)
#endif
#ifndef MAX
# define MAX(a,b) (a > b ? a : b)
#endif
/****************************************************************************
* Private Type Declarations
****************************************************************************/
@ -287,14 +295,19 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
{
/* No... Guess a field width using some heuristics */
width = findwidth(buf, fmt);
int tmpwidth = findwidth(buf, fmt);
width = MIN(sizeof(tmp) - 1, tmpwidth);
}
/* Copy the string (if we are making an assignment) */
if (!noassign)
{
strncpy(tv, buf, width);
if (width > 0)
{
strncpy(tv, buf, width);
}
tv[width] = '\0';
}
@ -425,7 +438,8 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
{
/* No... Guess a field width using some heuristics */
width = findwidth(buf, fmt);
int tmpwidth = findwidth(buf, fmt)
width = MIN(sizeof(tmp) - 1, tmpwidth);
}
/* Copy the numeric string into a temporary working