diff options
| author | David Disseldorp <ddiss@suse.de> | 2011-11-13 20:40:56 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-01-23 21:29:58 +0100 |
| commit | f83cd0ae61ae4d5939c4e0904072f2860445294e (patch) | |
| tree | 94a0262cce86a9bf1b58e4c5e9e148c8750039be | |
| parent | a2fa0c0c90913a8a0b73d8785435f193f03e1e43 (diff) | |
| download | samba-f83cd0ae61ae4d5939c4e0904072f2860445294e.tar.gz | |
idl: add to_null attribute to the spoolss formname array
OpenPrinterEx requests have been observed in the wild carrying a device
mode formname "A4" followed by non-utf16 garbage after the null
terminator. Such requests currently fail during unmarshalling in the
ndr_pull_charset() codepath, causing intermittent print job failures.
This change ensures that garbage after the device mode formname null
terminator is not processed in unmarshalling.
https://bugzilla.samba.org/show_bug.cgi?id=8606
Signed-off-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 219d8c916fd890ca4b4eae77abd5a651aa37e4ff)
| -rw-r--r-- | librpc/idl/spoolss.idl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index 4599e3ac2e5..4b1f94f4a35 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -697,7 +697,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") uint16 yresolution; spoolss_DeviceModeTTOption ttoption; spoolss_DeviceModeCollate collate; - [charset(UTF16)] uint16 formname[MAXDEVICENAME]; + [charset(UTF16),to_null] uint16 formname[MAXDEVICENAME]; uint16 logpixels; /* reserved */ uint32 bitsperpel; /* reserved */ uint32 pelswidth; /* reserved */ |