Attachment 2062 Details for Bug 3962 – Patch

[patch] Patch

look (text/plain), 2.79 KB, created by Jeremy Allison on 2006-07-25 16:21:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2006-07-25 16:21:00 UTC

Size: 2.79 KB

patch

obsolete

>Index: rpc_server/srv_spoolss_nt.c
>===================================================================
>--- rpc_server/srv_spoolss_nt.c	(revision 17233)
>+++ rpc_server/srv_spoolss_nt.c	(working copy)
>@@ -441,7 +441,7 @@
> 	const char *servername;
> 	fstring sname;
> 	BOOL found=False;
>-	NT_PRINTER_INFO_LEVEL *printer;
>+	NT_PRINTER_INFO_LEVEL *printer = NULL;
> 	WERROR result;
> 	
> 	DEBUG(4,("Setting printer name=%s (len=%lu)\n", handlename, (unsigned long)strlen(handlename)));
>@@ -532,6 +532,7 @@
> 		printername++;
> 		
> 		if ( strequal(printername, aprinter) ) {
>+			free_a_printer( &printer, 2);
> 			found = True;
> 			break;
> 		}
>@@ -541,6 +542,8 @@
> 		free_a_printer( &printer, 2);
> 	}
> 
>+	free_a_printer( &printer, 2);
>+
> 	if ( !found ) {
> 		DEBUGADD(4,("Printer not found\n"));
> 		return False;
>@@ -3551,6 +3554,7 @@
> 
> 		if((info->data=SMB_REALLOC_ARRAY(info->data, SPOOL_NOTIFY_INFO_DATA, info->count+1)) == NULL) {
> 			DEBUG(2,("construct_notify_printer_info: failed to enlarge buffer info->data!\n"));
>+			free_a_printer(&printer, 2);
> 			return False;
> 		}
> 
>@@ -4181,6 +4185,7 @@
> 	*pp_printer = NULL;
> 	if ((printer = SMB_MALLOC_P(PRINTER_INFO_3)) == NULL) {
> 		DEBUG(2,("construct_printer_info_3: malloc fail.\n"));
>+		free_a_printer(&ntprinter, 2);
> 		return False;
> 	}
> 
>@@ -4983,8 +4988,10 @@
> 	if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_const_servicename(snum))))
> 		return WERR_INVALID_PRINTER_NAME;
> 
>-	if (!W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture, version)))
>+	if (!W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture, version))) {
>+		free_a_printer(&printer, 2);
> 		return WERR_UNKNOWN_PRINTER_DRIVER;
>+	}
> 
> 	fill_printer_driver_info_1(info, driver, servername, architecture);
> 
>@@ -5043,8 +5050,10 @@
> 	if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_const_servicename(snum))))
> 		return WERR_INVALID_PRINTER_NAME;
> 
>-	if (!W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture, version)))
>+	if (!W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, printer->info_2->drivername, architecture, version))) {
>+		free_a_printer(&printer, 2);
> 		return WERR_UNKNOWN_PRINTER_DRIVER;
>+	}
> 
> 	fill_printer_driver_info_2(info, driver, servername);
> 
>@@ -6611,22 +6620,24 @@
> 
> 	if (*returned == 0) {
> 		SAFE_FREE(queue);
>+		free_a_printer(&ntprinter, 2);
> 		return WERR_OK;
> 	}
> 
> 	switch (level) {
> 	case 1:
> 		wret = enumjobs_level1(queue, snum, ntprinter, buffer, offered, needed, returned);
>-		return wret;
>+		break;
> 	case 2:
> 		wret = enumjobs_level2(queue, snum, ntprinter, buffer, offered, needed, returned);
>-		return wret;
>+		break;
> 	default:
>-		SAFE_FREE(queue);
> 		*returned=0;
> 		wret = WERR_UNKNOWN_LEVEL;
>+		break;
> 	}
> 	
>+	SAFE_FREE(queue);
> 	free_a_printer( &ntprinter, 2 );
> 	return wret;
> }

Actions: View

Attachments on bug 3962: 2062 | 2063 | 2065