Attachment 5792 Details for Bug 7459 – v3-5-test patch

[patch] v3-5-test patch

v3-5-test.patch (text/plain), 2.32 KB, created by Guenther Deschner on 2010-06-16 04:52:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2010-06-16 04:52:17 UTC

Size: 2.32 KB

patch

obsolete

>From 90ddfe11a8d83fe7d2c83e37eda76fbcdbe49605 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Fri, 23 Apr 2010 02:34:43 +0200
>Subject: [PATCH] s3-spoolss: fix some crash bugs and missing error codes in AddDriver paths.
>
>Found by torture test.
>
>Guenther
>(cherry picked from commit 413ffe9adb8eea488133da0249dcb2eca08fd69d)
>---
> source3/printing/nt_printing.c      |   10 ++++++++--
> source3/rpc_server/srv_spoolss_nt.c |    4 ++++
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
>index fdcf2d4..200a51a 100644
>--- a/source3/printing/nt_printing.c
>+++ b/source3/printing/nt_printing.c
>@@ -1604,7 +1604,7 @@ static uint32 get_correct_cversion(struct pipes_struct *p,
> ****************************************************************************/
> 
> #define strip_driver_path(_mem_ctx, _element) do { \
>-	if ((_p = strrchr((_element), '\\')) != NULL) { \
>+	if (_element && ((_p = strrchr((_element), '\\')) != NULL)) { \
> 		(_element) = talloc_asprintf((_mem_ctx), "%s", _p+1); \
> 		W_ERROR_HAVE_NO_MEMORY((_element)); \
> 	} \
>@@ -1625,6 +1625,10 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
> 	WERROR err;
> 	char *_p;
> 
>+	if (!*driver_path || !*data_file || !*config_file) {
>+		return WERR_INVALID_PARAM;
>+	}
>+
> 	/* clean up the driver name.
> 	 * we can get .\driver.dll
> 	 * or worse c:\windows\system\driver.dll !
>@@ -1634,7 +1638,9 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
> 	strip_driver_path(mem_ctx, *driver_path);
> 	strip_driver_path(mem_ctx, *data_file);
> 	strip_driver_path(mem_ctx, *config_file);
>-	strip_driver_path(mem_ctx, *help_file);
>+	if (help_file) {
>+		strip_driver_path(mem_ctx, *help_file);
>+	}
> 
> 	if (dependent_files && dependent_files->string) {
> 		for (i=0; dependent_files->string[i]; i++) {
>diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
>index 2b1a64f..66538bc 100644
>--- a/source3/rpc_server/srv_spoolss_nt.c
>+++ b/source3/rpc_server/srv_spoolss_nt.c
>@@ -7417,6 +7417,10 @@ WERROR _spoolss_AddPrinterDriverEx(pipes_struct *p,
> 	 * i.e. only copy files that are newer than existing ones
> 	 */
> 
>+	if (r->in.flags == 0) {
>+		return WERR_INVALID_PARAM;
>+	}
>+
> 	if (r->in.flags != APD_COPY_NEW_FILES) {
> 		return WERR_ACCESS_DENIED;
> 	}
>-- 
>1.6.6.1
>

Actions: View

Attachments on bug 7459: 5792