From 82ab2bce5ad50834afc3fdff00a4df46d4b99049 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 8 Mar 2006 06:42:39 +0000
Subject: r14023: My last bug fix still left a potential null deref. C- "must
 try harder" :-). Jeremy. (This used to be commit
 9c55bf74ca28530045c5cb3cbfffad242039ca75)

---
 source3/printing/print_generic.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'source3/printing')

diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index cb1c951ff7..e445bc3ce0 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -200,16 +200,17 @@ static int generic_queue_get(const char *printer_name,
 			*q = NULL;
 			return 0;
 		}
+		memset(queue, '\0', sizeof(print_queue_struct)*(numlines+1));
+
+		for (i=0; i<numlines; i++) {
+			/* parse the line */
+			if (parse_lpq_entry(printing_type,qlines[i],
+					    &queue[qcount],status,qcount==0)) {
+				qcount++;
+			}
+		}		
 	}
 
-	memset(queue, '\0', sizeof(print_queue_struct)*(numlines+1));
-	for (i=0; i<numlines; i++) {
-		/* parse the line */
-		if (parse_lpq_entry(printing_type,qlines[i],
-				    &queue[qcount],status,qcount==0)) {
-			qcount++;
-		}
-	}		
 	file_lines_free(qlines);
         *q = queue;
 	return qcount;
-- 
cgit