diff options
| author | Andreia Gaita <avidigal@novell.com> | 2006-12-02 01:06:28 +0300 |
|---|---|---|
| committer | Andreia Gaita <avidigal@novell.com> | 2006-12-02 01:06:28 +0300 |
| commit | b1dab8b8bef3f6ba081603c8af3977d08dc630c7 (patch) | |
| tree | 5a8d3730cebe55037b1a1d684727cd48bbc0d0cd /mcs/class/System.Drawing/System.Drawing.Printing | |
| parent | 4509ad843f4615d05160ff0ab019022d1fc32753 (diff) | |
Hopefully fixes #79835
* PrintingServicesUnix: check return value from cupsGetDefault.
2006-12-01 Andreia Gaita <avidigal@novell.com>
svn path=/trunk/mcs/; revision=68864
Diffstat (limited to 'mcs/class/System.Drawing/System.Drawing.Printing')
| -rw-r--r-- | mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog index cfd4ed9c945..292d4b142c7 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog +++ b/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog @@ -1,3 +1,8 @@ +2006-12-01 Andreia Gaita <avidigal@novell.com> + + * PrintingServicesUnix: check return value from cupsGetDefault. + Hopefully fixes #79835 + 2006-12-01 Jordi Mas i Hernandez <jordimash@gmail.com> * PrintingServicesWin32.cs: Fixes paper sizes reading. The POINT diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs index 67079518faa..afcf9b29c8d 100644 --- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs +++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs @@ -333,7 +333,9 @@ namespace System.Drawing.Printing return string.Empty; str = cupsGetDefault (); - return Marshal.PtrToStringAnsi (str); + if (str == IntPtr.Zero) + return Marshal.PtrToStringAnsi (str); + return String.Empty; } } |