[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-139-g8b80407

[Volker Lendecke]

The branch, master has been updated
       via  8b804077128cd981bf238b2506c589dff3bf8ff4 (commit)
      from  c23f0f13b42745a7b9f7c0a5b37f1ad521f886df (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8b804077128cd981bf238b2506c589dff3bf8ff4
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 24 15:08:14 2009 +0100

    Fix a segfault in parse_logentry
    
    entry->data_record.strings is type smb_ucs2, so the pointer arithmetic
    increments by two :-)

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/srv_eventlog_lib.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_eventlog_lib.c b/source3/rpc_server/srv_eventlog_lib.c
index aa75fb1..8cbb319 100644
--- a/source3/rpc_server/srv_eventlog_lib.c
+++ b/source3/rpc_server/srv_eventlog_lib.c
@@ -715,7 +715,7 @@ bool parse_logentry( char *line, Eventlog_entry * entry, bool * eor )
 		if (!entry->data_record.strings) {
 			return false;
 		}
-		memcpy(entry->data_record.strings + old_len,
+		memcpy(((char *)entry->data_record.strings) + old_len,
 				temp,
 				tmp_len);
 		entry->data_record.strings_len += tmp_len;


-- 
Samba Shared Repository