From da6cd47eb59a5852f0cff4e65096d2ab8a22fef9 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Mon, 10 Jul 2017 23:17:36 +1000
Subject: [PATCH] Fix ImageMetaData test

---
 src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs | 9 ++++++---
 src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs   | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
index fc77765b12..be4201c722 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
@@ -84,8 +84,11 @@ namespace ImageSharp
                 }
             }
 
-            this.data = new byte[other.data.Length];
-            Buffer.BlockCopy(other.data, 0, this.data, 0, other.data.Length);
+            if (other.data != null)
+            {
+                this.data = new byte[other.data.Length];
+                Buffer.BlockCopy(other.data, 0, this.data, 0, other.data.Length);
+            }
         }
 
         /// <summary>
@@ -131,7 +134,7 @@ namespace ImageSharp
                 return null;
             }
 
-            if (this.data.Length < (this.thumbnailOffset + this.thumbnailLength))
+            if (this.data == null || this.data.Length < (this.thumbnailOffset + this.thumbnailLength))
             {
                 return null;
             }
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
index d96bcb589a..1393afa62c 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccProfile.cs
@@ -59,8 +59,11 @@ namespace ImageSharp
             Guard.NotNull(other, nameof(other));
 
             // TODO: Do we need to copy anything else?
-            this.data = new byte[other.data.Length];
-            Buffer.BlockCopy(other.data, 0, this.data, 0, other.data.Length);
+            if (other.data != null)
+            {
+                this.data = new byte[other.data.Length];
+                Buffer.BlockCopy(other.data, 0, this.data, 0, other.data.Length);
+            }
         }
 
         /// <summary>