From af8ed1540118e61b7ed53547e564d839a1c8b2c6 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 3 Jan 2002 02:48:23 +0000 Subject: Fixed crash bug in display_print_info_1() (This used to be commit d1564fbf1f4950c12516470d4566efeca3ad79e5) --- source3/rpcclient/cmd_spoolss.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'source3/rpcclient') diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index f36669a777..74601563f2 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -184,9 +184,19 @@ static void display_print_info_1(PRINTER_INFO_1 *i1) fstring name; fstring comm; - rpcstr_pull(desc, i1->description.buffer, sizeof(desc), 0, STR_TERMINATE); - rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, STR_TERMINATE); - rpcstr_pull(comm, i1->comment.buffer, sizeof(comm), 0, STR_TERMINATE); + desc[0] = name[0] = comm[0] = 0; + + if (i1->description.buffer) + rpcstr_pull(desc, i1->description.buffer, sizeof(desc), 0, + STR_TERMINATE); + + if (i1->name.buffer) + rpcstr_pull(name, i1->name.buffer, sizeof(name), 0, + STR_TERMINATE); + + if (i1->comment.buffer) + rpcstr_pull(comm, i1->comment.buffer, sizeof(comm), 0, + STR_TERMINATE); printf("\tflags:[0x%x]\n", i1->flags); printf("\tname:[%s]\n", name); -- cgit