ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Properly handle embedded nulls in NTDLL_dbg_vprintf.

This commit is contained in:
Alexandre Julliard 2007-01-24 12:46:17 +01:00
parent fed5d9e1ff
commit 938e675860
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/ntdll/debugtools.c
View File

@ -121,7 +121,7 @@ static const char *NTDLL_dbgstr_wn( const WCHAR *src, int n )
static int NTDLL_dbg_vprintf( const char *format, va_list args )
{
struct debug_info *info = get_info();
char *p;
int end;
int ret = vsnprintf( info->out_pos, sizeof(info->output) - (info->out_pos - info->output),
format, args );
@ -138,16 +138,16 @@ static int NTDLL_dbg_vprintf( const char *format, va_list args )
abort();
}
p = strrchr( info->out_pos, '\n' );
if (!p) info->out_pos += ret;
for (end = ret; end > 0; end--) if (info->out_pos[end - 1] == '\n') break;
if (!end) info->out_pos += ret;
else
{
char *pos = info->output;
p++;
write( 2, pos, p - pos );
write( 2, pos, info->out_pos + end - pos );
/* move beginning of next line to start of buffer */
while ((*pos = *p++)) pos++;
info->out_pos = pos;
memmove( pos, info->out_pos + end, ret - end );
info->out_pos = pos + ret - end;
}
return ret;
}