From 4671a313775f052ae949ba441db7e0060bed0b75 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 21 Dec 2000 23:23:34 +0000
Subject: [PATCH] merge from appliance head

---
 source/rpc_server/srv_spoolss_nt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index 38a4b26a605..cd67a3b88a1 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -779,13 +779,16 @@ static BOOL convert_devicemode(const DEVICEMODE *devmode, NT_DEVICEMODE *nt_devm
 	nt_devmode->panningwidth=devmode->panningwidth;
 	nt_devmode->panningheight=devmode->panningheight;
 
+	safe_free(nt_devmode->private);
 	if (nt_devmode->driverextra != 0) {
 		/* if we had a previous private delete it and make a new one */
-		safe_free(nt_devmode->private);
 		if((nt_devmode->private=(uint8 *)malloc(nt_devmode->driverextra * sizeof(uint8))) == NULL)
 			return False;
 		memcpy(nt_devmode->private, devmode->private, nt_devmode->driverextra);
 	}
+	else {
+		nt_devmode->private = NULL;
+	}
 
 	return True;
 }
-- 
2.11.4.GIT