diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2014-07-09 20:25:47 +0400 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2014-07-09 20:25:47 +0400 |
| commit | 810a90ed273d07d8adff82187a07dc772d15104f (patch) | |
| tree | 39906a83cd90fe5a0dda04635642478655663948 /main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters | |
| parent | b6bf3eb04a4d84539b088dce60b34d67aee61471 (diff) | |
[Debugger] Check if TypeName is null when doing .EndsWith to prevent exceptions
Diffstat (limited to 'main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters')
| -rw-r--r-- | main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ColorsConverters.cs | 9 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ImageConverter.cs | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ColorsConverters.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ColorsConverters.cs index 6e606481ad..5625cbb7c1 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ColorsConverters.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ColorsConverters.cs @@ -35,10 +35,11 @@ namespace MonoDevelop.Debugger.Converters public override bool CanGetValue (ObjectValue val) { - return val.TypeName == "System.Drawing.Color" || - val.TypeName == "Gdk.Color" || - val.TypeName.EndsWith ("UIKit.UIColor") || - val.TypeName.EndsWith ("CoreGraphics.CGColor"); + return val.TypeName != null && ( + val.TypeName == "System.Drawing.Color" || + val.TypeName == "Gdk.Color" || + val.TypeName.EndsWith ("UIKit.UIColor") || + val.TypeName.EndsWith ("CoreGraphics.CGColor")); } public override Color GetValue (ObjectValue val) diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ImageConverter.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ImageConverter.cs index 24e1062704..8f470feeab 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ImageConverter.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/ImageConverter.cs @@ -36,8 +36,9 @@ namespace MonoDevelop.Debugger.Converters public override bool CanGetValue (ObjectValue val) { - return val.TypeName == "Gdk.Pixbuf" || - val.TypeName.EndsWith ("UIKit.UIImage"); + return val.TypeName != null && ( + val.TypeName == "Gdk.Pixbuf" || + val.TypeName.EndsWith ("UIKit.UIImage")); } public override Image GetValue (ObjectValue val) |