2008-09-16 Daniel Morgan <monodanmorg@yahoo.com>

[mono.git] / mcs / class / System.Data.OracleClient / System.Data.OracleClient.Oci / OciDateTimeDescriptor.cs

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDateTimeDescriptor.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDateTimeDescriptor.cs
index 0918910700d4500cb415f8275dc06267724fad1e..1798c07dd2b4bde84eabd3f92b8694451d8cb406 100644 (file)
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDateTimeDescriptor.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciDateTimeDescriptor.cs
@@ -65,11 +65,12 @@ namespace System.Data.OracleClient.Oci {
                {
                        // Get size of buffer
                        int rsize = 0;
-                       OciCalls.OCIUnicodeToCharSet (handle, null, timezone, out rsize);
+                       int status = OciCalls.OCIUnicodeToCharSet (handle, null, timezone, out rsize);
 
                        // Fill buffer
                        byte[] bytes = new byte[rsize];
-                       OciCalls.OCIUnicodeToCharSet (handle, bytes, timezone, out rsize);
+                       if (status == 0 && rsize > 0)
+                               OciCalls.OCIUnicodeToCharSet (handle, bytes, timezone, out rsize);
 
                        if (fsec > 0)
                                fsec = fsec * 1000000;