Hopefully fixes #79835

* PrintingServicesUnix: check return value from cupsGetDefault.

2006-12-01  Andreia Gaita  <avidigal@novell.com>

svn path=/trunk/mcs/; revision=68864

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog
index cfd4ed9c945def5c2ad9a1f9db421143a97262fc..292d4b142c704067bd6bdcd842770ffdf06af84c 100644 (file)
--- 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 67079518faa2fa45fc5cc12e43b532cecf034ade..afcf9b29c8d22f5a95a02ccc738791d3c72a7671 100644 (file)
--- 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;
                        }
                }