Merge branch 'master' into exception-python-type-name

den-run-ai · web-flow · commit 625f48fc15d1 · 2018-01-31T10:50:15.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Fixed conversion of 'float' and 'double' values (#486)
 -   Fixed 'clrmethod' for python 2 (#492)
 -   Fixed double calling of constructor when deriving from .NET class (#495)
+-   Fixed `clr.GetClrType` when iterating over `System` members (#607) 
 
 
 ## [2.3.0][] - 2017-03-11
diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Runtime.InteropServices;
 
 namespace Python.Runtime
@@ -34,6 +34,10 @@ internal static ManagedType GetManagedObject(IntPtr ob)
                     IntPtr op = tp == ob
                         ? Marshal.ReadIntPtr(tp, TypeOffset.magic())
                         : Marshal.ReadIntPtr(ob, ObjectOffset.magic(ob));
+                    if (op == IntPtr.Zero)
+                    {
+                        return null;
+                    }
                     var gc = (GCHandle)op;
                     return (ManagedType)gc.Target;
                 }
