diff options
| author | Gerald Carter <jerry@samba.org> | 2000-12-21 23:38:47 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2000-12-21 23:38:47 +0000 |
| commit | 393c5f14e0858dcb3d6cb26eb5643b520c2c9686 (patch) | |
| tree | 96cd6cf530810cd47d91a44db28bb476ceeb924c | |
| parent | b4773618acb60b62b20b01ff7ba749984c1379fb (diff) | |
| download | samba-393c5f14e0858dcb3d6cb26eb5643b520c2c9686.tar.gz samba-393c5f14e0858dcb3d6cb26eb5643b520c2c9686.tar.xz samba-393c5f14e0858dcb3d6cb26eb5643b520c2c9686.zip | |
merge from appliance head
| -rw-r--r-- | source/printing/nt_printing.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c index c7781c6510c..91679235cd7 100644 --- a/source/printing/nt_printing.c +++ b/source/printing/nt_printing.c @@ -2067,6 +2067,11 @@ static int unpack_devicemode(NT_DEVICEMODE **nt_devmode, char *buf, int buflen) */ len += tdb_unpack(buf+len, buflen-len, "B", &extra_len, &devmode.private); devmode.driverextra=(uint16)extra_len; + + /* check to catch an invalid TDB entry so we don't segfault */ + if (devmode.driverextra == 0) { + devmode.private = NULL; + } } *nt_devmode = (NT_DEVICEMODE *)memdup(&devmode, sizeof(devmode)); |