diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 01:34:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:48 -0500 |
| commit | 79de0ad9463a5cd64978beae37df79fbb4f74632 (patch) | |
| tree | feb1638b81ac49909465456163e70cf4e57dc3a9 /source3/rpc_server | |
| parent | 1e362c0e7fff603cffa32863a5b07ecbc50f8a2d (diff) | |
| download | samba-79de0ad9463a5cd64978beae37df79fbb4f74632.tar.gz samba-79de0ad9463a5cd64978beae37df79fbb4f74632.tar.xz samba-79de0ad9463a5cd64978beae37df79fbb4f74632.zip | |
r22588: Make all uses of TALLOC_MEMDUP consistent.
Jeremy.
(This used to be commit 8ad13718af0ba1fcb10a6f1631b1ed3cb8d11175)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 08c3a46133e..abe944322e6 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -1416,11 +1416,15 @@ static DEVICEMODE* dup_devicemode(TALLOC_CTX *ctx, DEVICEMODE *devmode) return NULL; } - d->dev_private = (uint8 *)TALLOC_MEMDUP(ctx, devmode->dev_private, + if (devmode->driverextra) { + d->dev_private = (uint8 *)TALLOC_MEMDUP(ctx, devmode->dev_private, devmode->driverextra); - if (!d->dev_private) { - return NULL; - } + if (!d->dev_private) { + return NULL; + } + } else { + d->dev_private = NULL; + } return d; } |