diff options
| author | Günther Deschner <gd@samba.org> | 2010-04-23 02:34:43 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-06-18 08:33:33 +0200 |
| commit | 4ee20c7d5ff2f3f127b7a198e968d6539bcb5602 (patch) | |
| tree | eb7d805173207a71fe5e17e09f42b0b47bd30959 | |
| parent | 4d0c7560b1eb028ad653ca6928234c83238ae9ec (diff) | |
| download | samba-4ee20c7d5ff2f3f127b7a198e968d6539bcb5602.tar.gz | |
s3-spoolss: fix some crash bugs and missing error codes in AddDriver paths.
Found by torture test.
Guenther
(cherry picked from commit 413ffe9adb8eea488133da0249dcb2eca08fd69d)
Addresses bug #7459 (after upgrade to samba 3.4 and 3.5 lose ability to control duplex
for normal domain user).
(cherry picked from commit 286f4b53993fab0ffc53e5619e2987dfb13b0ec2)
| -rw-r--r-- | source3/printing/nt_printing.c | 10 | ||||
| -rw-r--r-- | 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 fdcf2d4ce07..200a51a897b 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 2b1a64fc8ea..66538bcc814 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; } |