[DML EP] Fix GetInputTensor crash when accessing null tensor (#14811)

microsoft · Feb 24, 2023 · 8f90066 · 8f90066
1 parent 3e4a471
commit 8f90066
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/MLOperatorAuthorImpl.cpp b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/MLOperatorAuthorImpl.cpp
@@ -1827,9 +1827,8 @@ namespace Windows::AI::MachineLearning::Adapter
             ML_CHECK_BOOL(inputIndex < m_inputTensors.size());
 
             auto opKernelContextWrapper = const_cast<OpKernelContextWrapper*>(this);
-            if (m_inputTensors[inputIndex][0]->GetInterface() == nullptr)
+            if (m_inputTensors[inputIndex][0] == nullptr)
             {
-                assert(m_impl->InputType(gsl::narrow_cast<int>(inputIndex))->IsTensorType());
                 auto inputTensor = m_impl->Input<onnxruntime::Tensor>(gsl::narrow_cast<int>(inputIndex));
                 if (inputTensor != nullptr)
                 {
@@ -1867,9 +1866,8 @@ namespace Windows::AI::MachineLearning::Adapter
                 opKernelContextWrapper->m_inputTensors[inputIndex].resize(sequenceIndex+1);
             }
 
-            if (m_inputTensors[inputIndex][sequenceIndex]->GetInterface() == nullptr)
+            if (m_inputTensors[inputIndex][sequenceIndex] == nullptr)
             {
-                assert(m_impl->InputType(gsl::narrow_cast<int>(inputIndex))->IsTensorSequenceType());
                 auto inputTensorSeq = m_impl->Input<onnxruntime::TensorSeq>(gsl::narrow_cast<int>(inputIndex));
                 ML_CHECK_BOOL(inputTensorSeq != nullptr);
 
@@ -1918,7 +1916,7 @@ namespace Windows::AI::MachineLearning::Adapter
             }
 
             // Verify that the provided shape matches the shape determined using the kernel's shape inference function.
-            if (m_outputTensors[outputIndex][sequenceIndex]->GetInterface() == nullptr)
+            if (m_outputTensors[outputIndex][sequenceIndex] == nullptr)
             {
                 auto outputTensorSeq = m_impl->Output<onnxruntime::TensorSeq>(gsl::narrow_cast<int>(outputIndex));
                 ML_CHECK_BOOL(outputTensorSeq != nullptr);
@@ -2026,7 +2024,7 @@ namespace Windows::AI::MachineLearning::Adapter
             ML_CHECK_BOOL(outputIndex < m_outputTensors.size());
 
             // Verify that the provided shape matches the shape determined using the kernel's shape inference function.
-            if (m_outputTensors[outputIndex][0]->GetInterface() == nullptr)
+            if (m_outputTensors[outputIndex][0] == nullptr)
             {
                 if (m_outputShapes)
                 {