summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-10-20 14:02:02 +0000
committerGerald Carter <jerry@samba.org>2003-10-20 14:02:02 +0000
commit611b1987434579a843bc7b64c2fa04b60115cbbc (patch)
tree4cf46369fb2845914243e8998b2623426369b530 /source3
parentdf81637076fed4173d8900816c3ee3dfddc960a5 (diff)
downloadsamba-611b1987434579a843bc7b64c2fa04b60115cbbc.tar.gz
samba-611b1987434579a843bc7b64c2fa04b60115cbbc.tar.bz2
samba-611b1987434579a843bc7b64c2fa04b60115cbbc.zip
make sure we have a devmode before copying a string to the devicename; patch from metze
(This used to be commit 1700e83ac8035db7d22b8c64c10f63cb3e3b9eb7)
Diffstat (limited to 'source3')
-rw-r--r--source3/printing/nt_printing.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 9c95cf9085..5b5b5885ab 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -3306,10 +3306,11 @@ static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr, const char *sh
printername));
info.devmode = construct_nt_devicemode(printername);
}
-
- safe_strcpy(adevice, info.printername, sizeof(adevice)-1);
- fstrcpy(info.devmode->devicename, adevice);
+ safe_strcpy(adevice, info.printername, sizeof(adevice)-1);
+ if (info.devmode) {
+ fstrcpy(info.devmode->devicename, adevice);
+ }
len += unpack_values( &info.data, dbuf.dptr+len, dbuf.dsize-len );