Index: xfa/fgas/crt/fgas_utils.h |
diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h |
index f01d115b3e00f394c773f3632f6514b668beb733..0cf853fa7005a18a51e26c28e70eeadbce3ba19a 100644 |
--- a/xfa/fgas/crt/fgas_utils.h |
+++ b/xfa/fgas/crt/fgas_utils.h |
@@ -378,7 +378,7 @@ class CFX_DiscreteArrayTemplate : public CFX_BaseDiscreteArray { |
: CFX_BaseDiscreteArray(iChunkSize, sizeof(baseType)) {} |
baseType& GetAt(int32_t index, const baseType& defValue) const { |
baseType* p = (baseType*)CFX_BaseDiscreteArray::GetAt(index); |
- return p == NULL ? (baseType&)defValue : *p; |
+ return p ? *p : (baseType&)defValue; |
} |
baseType* GetPtrAt(int32_t index) const { |
return (baseType*)CFX_BaseDiscreteArray::GetAt(index); |
@@ -447,7 +447,7 @@ class CFX_ObjectStackTemplate : public CFX_BaseStack { |
} |
void Pop() { |
baseType* p = (baseType*)CFX_BaseStack::GetTopElement(); |
- if (p != NULL) { |
+ if (p) { |
p->~baseType(); |
} |
CFX_BaseStack::Pop(); |