[SCM] Samba Shared Repository - branch master updated - 98bf3ee2f614cf89ab4920c69d2872b6d786c4b0

[Jeremy Allison]

The branch, master has been updated
       via  98bf3ee2f614cf89ab4920c69d2872b6d786c4b0 (commit)
      from  53903d9eb1e50a98ff5fae305a1f74fc9ae73143 (commit)

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


- Log -----------------------------------------------------------------
commit 98bf3ee2f614cf89ab4920c69d2872b6d786c4b0
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Thu Nov 20 10:56:14 2008 -0800

    Second part of fix for bug #5891 - smbd crashed when viewing the eventlog 
exported by "eventlog list". Don't leak memory on error paths.
    Jeremy.

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

Summary of changes:
 source3/rpc_server/srv_eventlog_nt.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_eventlog_nt.c 
b/source3/rpc_server/srv_eventlog_nt.c
index 612db1c..4ff1039 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -433,7 +433,7 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
 
        if ( !info->etdb ) {
                DEBUG( 4, ( "No open tdb! (%s)\n", info->logname ) );
-               return False;
+               goto done;
        }
        /* set resonable defaults.  512Kb on size and 1 week on time */
 
@@ -447,7 +447,7 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
 
        path = talloc_asprintf(ctx, "%s/%s", KEY_EVENTLOG, elogname );
        if (!path) {
-               return false;
+               goto done;
        }
 
        wresult = reg_open_path(ctx, path, REG_KEY_READ, get_root_nt_token(),
@@ -457,14 +457,13 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
                DEBUG( 4,
                       ( "sync_eventlog_params: Failed to open key [%s] (%s)\n",
                         path, win_errstr( wresult ) ) );
-               return false;
+               goto done;
        }
 
        wresult = reg_queryvalue(key, key, "Retention", &value);
        if (!W_ERROR_IS_OK(wresult)) {
                DEBUG(4, ("Failed to query value \"Retention\": %s\n",
                          win_errstr(wresult)));
-               ret = false;
                goto done;
        }
        uiRetention = value->v.dword;
@@ -473,7 +472,6 @@ static bool sync_eventlog_params( EVENTLOG_INFO *info )
        if (!W_ERROR_IS_OK(wresult)) {
                DEBUG(4, ("Failed to query value \"MaxSize\": %s\n",
                          win_errstr(wresult)));
-               ret = false;
                goto done;
        }
        uiMaxSize = value->v.dword;


-- 
Samba Shared Repository