Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some overruns with a not zero terminated string and a given precision specification.

Browse source 
svn path=/trunk/; revision=2630
This commit is contained in:
Hartmut Birr 2002-02-18 18:39:31 +00:00
parent d1cfd4ffdb
commit be9ed281e0
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/ntoskrnl/rtl/sprintf.c
View file

@ -1,4 +1,4 @@
/* $Id: sprintf.c,v 1.5 2001/05/30 14:36:52 ekohl Exp $ /* $Id: sprintf.c,v 1.6 2002/02/18 18:39:31 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -240,9 +240,7 @@ int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args)
if (sw == NULL) if (sw == NULL)
sw = L"<NULL>"; sw = L"<NULL>";
len = wcslen (sw); for (len = 0; (unsigned int)len < (unsigned int)precision && sw[len]; len++);
if ((unsigned int)len > (unsigned int)precision)
len = precision;
if (!(flags & LEFT)) if (!(flags & LEFT))
while (len < field_width--) while (len < field_width--)
@ -257,9 +255,7 @@ int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args)
if (s == NULL) if (s == NULL)
s = "<NULL>"; s = "<NULL>";
len = strlen (s); for (len = 0; (unsigned int)len < (unsigned int)precision && s[len]; len++);
if ((unsigned int)len > (unsigned int)precision)
len = precision;
if (!(flags & LEFT)) if (!(flags & LEFT))
while (len < field_width--) while (len < field_width--)
@ -278,9 +274,7 @@ int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args)
if (s == NULL) if (s == NULL)
s = "<NULL>"; s = "<NULL>";
len = strlen (s); for (len = 0; (unsigned int)len < (unsigned int)precision && s[len]; len++);
if ((unsigned int)len > (unsigned int)precision)
len = precision;
if (!(flags & LEFT)) if (!(flags & LEFT))
while (len < field_width--) while (len < field_width--)
@ -295,9 +289,7 @@ int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args)
if (sw == NULL) if (sw == NULL)
sw = L"<NULL>"; sw = L"<NULL>";
len = wcslen (sw); for (len = 0; (unsigned int)len < (unsigned int)precision && sw[len]; len++);
if ((unsigned int)len > (unsigned int)precision)
len = precision;
if (!(flags & LEFT)) if (!(flags & LEFT))
while (len < field_width--) while (len < field_width--)