From c98b3e1795b97691726f704dcda68daa638e11e1 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Wed, 15 Nov 2017 13:25:01 -0800
Subject: [PATCH] Adding null check for implicit cast from array/arraysegment
 to Span (#15044)

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
---
 .../src/System.Private.CoreLib/shared/System/ReadOnlySpan.cs | 5 +++--
 src/Common/src/System.Private.CoreLib/shared/System/Span.cs  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Common/src/System.Private.CoreLib/shared/System/ReadOnlySpan.cs b/src/Common/src/System.Private.CoreLib/shared/System/ReadOnlySpan.cs
index 28fb2e33e052..7a8243d669a0 100644
--- a/src/Common/src/System.Private.CoreLib/shared/System/ReadOnlySpan.cs
+++ b/src/Common/src/System.Private.CoreLib/shared/System/ReadOnlySpan.cs
@@ -261,12 +261,13 @@ public override int GetHashCode()
         /// <summary>
         /// Defines an implicit conversion of an array to a <see cref="ReadOnlySpan{T}"/>
         /// </summary>
-        public static implicit operator ReadOnlySpan<T>(T[] array) => new ReadOnlySpan<T>(array);
+        public static implicit operator ReadOnlySpan<T>(T[] array) => array != null ? new ReadOnlySpan<T>(array) : default;
 
         /// <summary>
         /// Defines an implicit conversion of a <see cref="ArraySegment{T}"/> to a <see cref="ReadOnlySpan{T}"/>
         /// </summary>
-        public static implicit operator ReadOnlySpan<T>(ArraySegment<T> arraySegment) => new ReadOnlySpan<T>(arraySegment.Array, arraySegment.Offset, arraySegment.Count);
+        public static implicit operator ReadOnlySpan<T>(ArraySegment<T> arraySegment)
+            => arraySegment.Array != null ? new ReadOnlySpan<T>(arraySegment.Array, arraySegment.Offset, arraySegment.Count) : default;
 
         /// <summary>
         /// Forms a slice out of the given read-only span, beginning at 'start'.
diff --git a/src/Common/src/System.Private.CoreLib/shared/System/Span.cs b/src/Common/src/System.Private.CoreLib/shared/System/Span.cs
index 90ef2fca068f..ca146aef6597 100644
--- a/src/Common/src/System.Private.CoreLib/shared/System/Span.cs
+++ b/src/Common/src/System.Private.CoreLib/shared/System/Span.cs
@@ -342,12 +342,13 @@ public override int GetHashCode()
         /// <summary>
         /// Defines an implicit conversion of an array to a <see cref="Span{T}"/>
         /// </summary>
-        public static implicit operator Span<T>(T[] array) => new Span<T>(array);
+        public static implicit operator Span<T>(T[] array) => array != null ? new Span<T>(array) : default;
 
         /// <summary>
         /// Defines an implicit conversion of a <see cref="ArraySegment{T}"/> to a <see cref="Span{T}"/>
         /// </summary>
-        public static implicit operator Span<T>(ArraySegment<T> arraySegment) => new Span<T>(arraySegment.Array, arraySegment.Offset, arraySegment.Count);
+        public static implicit operator Span<T>(ArraySegment<T> arraySegment)
+            => arraySegment.Array != null ? new Span<T>(arraySegment.Array, arraySegment.Offset, arraySegment.Count) : default;
 
         /// <summary>
         /// Defines an implicit conversion of a <see cref="Span{T}"/> to a <see cref="ReadOnlySpan{T}"/>