[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-495-gf289851

[Günther Deschner]

The branch, master has been updated
       via  f289851d70ea7a8f66a31e9af7d9fc6e16ebffef (commit)
      from  afa960cbbcd609123d710c301e7a9a070c1fed70 (commit)

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


- Log -----------------------------------------------------------------
commit f289851d70ea7a8f66a31e9af7d9fc6e16ebffef
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 5 16:36:44 2009 +0100

    s3-eventlog: fix Coverity #877.
    
    Guenther

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

Summary of changes:
 source3/rpc_server/srv_eventlog_lib.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 57b3be4..d8c5c3d 100644
--- a/source3/rpc_server/srv_eventlog_lib.c
+++ b/source3/rpc_server/srv_eventlog_lib.c
@@ -551,9 +551,11 @@ bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, struct eventlog_Record_tdb
 		entry->sid_length = rpcstr_push_talloc(mem_ctx,
 				&dummy,
 				stop);
+		if (entry->sid_length == (uint32_t)-1) {
+			return false;
+		}
 		entry->sid = data_blob_talloc(mem_ctx, dummy, entry->sid_length);
-		if (entry->sid_length == (uint32_t)-1 ||
-				entry->sid.data == NULL) {
+		if (entry->sid.data == NULL) {
 			return false;
 		}
 	} else if ( 0 == strncmp( start, "STR", stop - start ) ) {


-- 
Samba Shared Repository