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

cmd/tests: Rewrite replace_escaped_spaces to avoid overflows. 

Spotted by Marcus Meissner.
This commit is contained in:
Alexandre Julliard 2011-07-06 19:51:51 +02:00
parent 7a21d06295
commit 766dc67043
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
programs/cmd/tests/batch.c
View File

@ -29,29 +29,19 @@ static DWORD workdir_len;
static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size)
{
static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'};
const char *a, *b;
char *new_data;
DWORD len_space = sizeof(escaped_space) -1;
char *ptr, *new_data;
a = b = data;
*new_size = 0;
new_data = ptr = HeapAlloc(GetProcessHeap(), 0, size + 1);
memcpy( new_data, data, size );
new_data[size] = 0;
new_data = HeapAlloc(GetProcessHeap(), 0, size*sizeof(char));
ok(new_data != NULL, "HeapAlloc failed\n");
if(!new_data)
return NULL;
while( (b = strstr(a, escaped_space)) )
while ((ptr = strstr(ptr, escaped_space)))
{
strncpy(new_data + *new_size, a, b-a + 1);
*new_size += b-a + 1;
new_data[*new_size - 1] = ' ';
a = b + len_space;
char *end = ptr + sizeof(escaped_space) - 1;
*ptr++ = ' ';
memmove( ptr, end, strlen(end) + 1 );
}
strncpy(new_data + *new_size, a, strlen(a) + 1);
*new_size += strlen(a);
*new_size = strlen(new_data);
return new_data;
}