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

server: Hide assumptions about alignment inside the read_process_memory function.

This commit is contained in:
Alexandre Julliard 2006-04-07 19:43:44 +02:00
parent 959bbf8b75
commit 0b492c708f
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
server/process.c
View File

@ -709,27 +709,50 @@ void enum_processes( int (*cb)(struct process*, void*), void *user )
} }
} }
/* read data from a process memory space */ /* read data from a process memory space */
/* len is the total size (in ints) */ static int read_process_memory( struct process *process, const void *ptr, size_t size, char *dest )
static int read_process_memory( struct process *process, const int *addr, size_t len, int *dest )
{ {
struct thread *thread = get_process_first_thread( process ); struct thread *thread = get_process_first_thread( process );
unsigned int first_offset, last_offset, len;
assert( !((unsigned int)addr % sizeof(int)) ); /* address must be aligned */ int data, *addr;
if (!thread) /* process is dead */ if (!thread) /* process is dead */
{ {
set_error( STATUS_ACCESS_DENIED ); set_error( STATUS_ACCESS_DENIED );
return 0; return 0;
} }
first_offset = (unsigned long)ptr % sizeof(int);
last_offset = (size + first_offset) % sizeof(int);
if (!last_offset) last_offset = sizeof(int);
addr = (int *)((char *)ptr - first_offset);
len = (size + first_offset + sizeof(int) - 1) / sizeof(int);
if (suspend_for_ptrace( thread )) if (suspend_for_ptrace( thread ))
{ {
while (len > 0) if (len > 1)
{ {
if (read_thread_int( thread, addr++, dest++ ) == -1) break; if (read_thread_int( thread, addr++, &data ) == -1) goto done;
memcpy( dest, (char *)&data + first_offset, sizeof(int) - first_offset );
dest += sizeof(int) - first_offset;
first_offset = 0;
len--; len--;
} }
while (len > 1)
{
if (read_thread_int( thread, addr++, &data ) == -1) goto done;
memcpy( dest, &data, sizeof(int) );
dest += sizeof(int);
len--;
}
if (read_thread_int( thread, addr++, &data ) == -1) goto done;
memcpy( dest, (char *)&data + first_offset, last_offset - first_offset );
len--;
done:
resume_after_ptrace( thread ); resume_after_ptrace( thread );
} }
return !len; return !len;
@ -1071,19 +1094,13 @@ DECL_HANDLER(read_process_memory)
if (len) if (len)
{ {
unsigned int start_offset = (unsigned int)req->addr % sizeof(int); char *buffer = mem_alloc( len );
unsigned int nb_ints = (len + start_offset + sizeof(int) - 1) / sizeof(int);
const int *start = (int *)((char *)req->addr - start_offset);
int *buffer = mem_alloc( nb_ints * sizeof(int) );
if (buffer) if (buffer)
{ {
if (read_process_memory( process, start, nb_ints, buffer )) if (read_process_memory( process, req->addr, len, buffer ))
{
/* move start of requested data to start of buffer */
if (start_offset) memmove( buffer, (char *)buffer + start_offset, len );
set_reply_data_ptr( buffer, len ); set_reply_data_ptr( buffer, len );
} else
else free( buffer ); free( buffer );
} }
} }
release_object( process ); release_object( process );