Add null check to Tensor indexer and change which ToSpan method to ca…

…ll. (#2121)
dotnet · Feb 14, 2018 · 3243d04 · 3243d04
1 parent c176739
commit 3243d04
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/System.Numerics.Tensors/System/Numerics/Tensor.cs b/src/System.Numerics.Tensors/System/Numerics/Tensor.cs
@@ -750,12 +750,20 @@ public virtual T this[params int[] indices]
         {
             get
             {
+                if (indices == null)
+                {
+                    throw new ArgumentNullException(nameof(indices));
+                }
                 var span = new Span<int>(indices);
                 return this[span];
             }
 
             set
             {
+                if (indices == null)
+                {
+                    throw new ArgumentNullException(nameof(indices));
+                }
                 var span = new Span<int>(indices);
                 this[span] = value;
             }

diff --git a/src/System.Text.Http.Parser/HttpParser.cs b/src/System.Text.Http.Parser/HttpParser.cs
@@ -63,7 +63,7 @@ public unsafe bool ParseRequestLine<T>(T handler, in ReadOnlySequence<byte> buff
             {
                 if (TryGetNewLineSpan(buffer, out SequencePosition found))
                 {
-                    span = Sequence.ToSpan(buffer.Slice(consumed, found));
+                    span = PipelineExtensions.ToSpan(buffer.Slice(consumed, found));
                     consumed = found;
                 }
                 else
@@ -102,7 +102,7 @@ public unsafe bool ParseRequestLine<T>(ref T handler, in ReadOnlySequence<byte>
                     return false;
                 }
 
-                span = Sequence.ToSpan(buffer.Slice(0, eol + s_Eol.Length));
+                span = PipelineExtensions.ToSpan(buffer.Slice(0, eol + s_Eol.Length));
             }
 
             // Fix and parse the span
@@ -335,7 +335,7 @@ public unsafe bool ParseHeaders<T>(T handler, in ReadOnlySequence<byte> buffer,
 
                                 // Make sure LF is included in lineEnd
                                 lineEnd = subBuffer.GetPosition(lineEnd.Value, 1);
-                                var headerSpan = Sequence.ToSpan(subBuffer.Slice(current, lineEnd.Value));
+                                var headerSpan = PipelineExtensions.ToSpan(subBuffer.Slice(current, lineEnd.Value));
                                 length = headerSpan.Length;
 
                                 fixed (byte* pHeader = &MemoryMarshal.GetReference(headerSpan))
@@ -451,7 +451,7 @@ public unsafe bool ParseHeaders<T>(ref T handler, ReadOnlySequence<byte> buffer,
                                 return false;
                             }
 
-                            var headerSpan = Sequence.ToSpan(buffer.Slice(index, end - index + 1));
+                            var headerSpan = PipelineExtensions.ToSpan(buffer.Slice(index, end - index + 1));
                             length = headerSpan.Length;
 
                             fixed (byte* pHeader = &MemoryMarshal.GetReference(headerSpan))

diff --git a/tests/System.Numerics.Tensors.Tests/TensorSliceTests.cs b/tests/System.Numerics.Tensors.Tests/TensorSliceTests.cs
@@ -322,6 +322,7 @@ public void SliceIndexOutOfRange(TensorConstructor constructor)
         {
             var slice = Get3DSlice(constructor);
 
+            Assert.Throws<ArgumentNullException>(() => slice[(int[])null]);
             Assert.Throws<ArgumentException>(() => slice[new int[] { }]);
             Assert.Throws<ArgumentException>(() => slice[default(ReadOnlySpan<int>)]);
             Assert.Throws<ArgumentException>(() => slice[2, 0]);