From 91c51368833fb04b32f478f3af65179de6551ff7 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 21 Nov 2017 10:58:33 -0600 Subject: [PATCH] Test for missing "attribute" array in NTNDArray --- src/ntndarray.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ntndarray.cpp b/src/ntndarray.cpp index df92697..c2d88e2 100644 --- a/src/ntndarray.cpp +++ b/src/ntndarray.cpp @@ -350,10 +350,10 @@ bool NTNDArray::isCompatible(StructureConstPtr const &structure) StructureArrayConstPtr attributeField = structure->getField( "attribute"); + if (!attributeField) + return false; - StructureConstPtr attributeElementStruc = attributeField->getStructure(); - - if (!NTNDArrayAttribute::isCompatible(attributeElementStruc)) + if (!NTNDArrayAttribute::isCompatible(attributeField->getStructure())) return false; @@ -361,7 +361,7 @@ bool NTNDArray::isCompatible(StructureConstPtr const &structure) if (field.get()) { ScalarConstPtr descriptorField = structure->getField("descriptor"); - if (!descriptorField.get() || descriptorField->getScalarType() != pvString) + if (!descriptorField || descriptorField->getScalarType() != pvString) return false; }