[SCM] Samba Shared Repository - branch master updated - caf0c17e247b7c66051abc9ed239506a4be6aecc

[Günther Deschner]

The branch, master has been updated
       via  caf0c17e247b7c66051abc9ed239506a4be6aecc (commit)
      from  df21095ce8981827767e8646b6aefb053beb29a8 (commit)

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


- Log -----------------------------------------------------------------
commit caf0c17e247b7c66051abc9ed239506a4be6aecc
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 15 02:23:31 2008 +0100

    s3-spoolss: fix enumports segfault (another malloc vs. talloc candidate).
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 577f7f1..59c1323 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7482,11 +7482,11 @@ WERROR enumports_hook(TALLOC_CTX *ctx, int *count, char ***lines )
 	/* if no hook then just fill in the default port */
 
 	if ( !*cmd ) {
-		if (!(qlines = SMB_MALLOC_ARRAY( char*, 2 ))) {
+		if (!(qlines = TALLOC_ARRAY( NULL, char*, 2 ))) {
 			return WERR_NOMEM;
 		}
-		if (!(qlines[0] = SMB_STRDUP( SAMBA_PRINTER_PORT_NAME ))) {
-			SAFE_FREE(qlines);
+		if (!(qlines[0] = talloc_strdup(qlines, SAMBA_PRINTER_PORT_NAME ))) {
+			TALLOC_FREE(qlines);
 			return WERR_NOMEM;
 		}
 		qlines[1] = NULL;


-- 
Samba Shared Repository