summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-01-24 02:10:47 +0100
committerKarolin Seeger <kseeger@samba.org>2009-01-26 09:01:39 +0100
commit49aa7c46f0a8d49bc88298b1de4c963d7014211c (patch)
tree24f3581f10891c99cf1eecb4b345adbd76f194a3
parent0deec6d94965e5bf833007401075820db0703ae7 (diff)
downloadsamba-49aa7c46f0a8d49bc88298b1de4c963d7014211c.tar.gz
s3-eventlog: fix various invalid memcpy in read_package_entry().
Guenther (cherry picked from commit 75fff603625e0259f187e0fa47efd85887092fae)
-rw-r--r--source/rpc_server/srv_eventlog_nt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/rpc_server/srv_eventlog_nt.c b/source/rpc_server/srv_eventlog_nt.c
index 54d9dae8280..7c7d53fad59 100644
--- a/source/rpc_server/srv_eventlog_nt.c
+++ b/source/rpc_server/srv_eventlog_nt.c
@@ -542,30 +542,30 @@ static Eventlog_entry *read_package_entry( prs_struct * ps,
return NULL;
}
offset = entry->data;
- memcpy( offset, &( entry->data_record.source_name ),
+ memcpy( offset, entry->data_record.source_name,
entry->data_record.source_name_len );
offset += entry->data_record.source_name_len;
- memcpy( offset, &( entry->data_record.computer_name ),
+ memcpy( offset, entry->data_record.computer_name,
entry->data_record.computer_name_len );
offset += entry->data_record.computer_name_len;
/* SID needs to be DWORD-aligned */
offset += entry->data_record.sid_padding;
entry->record.user_sid_offset =
sizeof( Eventlog_record ) + ( offset - entry->data );
- memcpy( offset, &( entry->data_record.sid ),
+ memcpy( offset, entry->data_record.sid,
entry->record.user_sid_length );
offset += entry->record.user_sid_length;
/* Now do the strings */
entry->record.string_offset =
sizeof( Eventlog_record ) + ( offset - entry->data );
- memcpy( offset, &( entry->data_record.strings ),
+ memcpy( offset, entry->data_record.strings,
entry->data_record.strings_len );
offset += entry->data_record.strings_len;
/* Now do the data */
entry->record.data_length = entry->data_record.user_data_len;
entry->record.data_offset =
sizeof( Eventlog_record ) + ( offset - entry->data );
- memcpy( offset, &( entry->data_record.user_data ),
+ memcpy( offset, entry->data_record.user_data,
entry->data_record.user_data_len );
offset += entry->data_record.user_data_len;