diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-06-22 10:40:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-22 10:40:19 +0200 |
commit | 3b7f3a0d41e9c9b0337caa69cd0cda995fb1a244 (patch) | |
tree | 424cf237874e4b2a6bfb710ff721c084d918a1c1 /document | |
parent | ce0e703fa64a8a0a0e5d356a532849d88b6ad954 (diff) | |
parent | 60e28dcd0b4c1ea9eff2e4f26da7ec53ed24e64a (diff) |
Merge pull request #23188 from vespa-engine/havardpe/avoid-nullptr-deref
avoid nullptr deref
Diffstat (limited to 'document')
-rw-r--r-- | document/src/tests/serialization/vespadocumentserializer_test.cpp | 2 | ||||
-rw-r--r-- | document/src/vespa/document/base/field.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/document/src/tests/serialization/vespadocumentserializer_test.cpp b/document/src/tests/serialization/vespadocumentserializer_test.cpp index 3db001e1732..40d78327ab4 100644 --- a/document/src/tests/serialization/vespadocumentserializer_test.cpp +++ b/document/src/tests/serialization/vespadocumentserializer_test.cpp @@ -812,7 +812,7 @@ DocumenttypesConfig getTensorDocTypesConfig() { const DocumentTypeRepo tensor_doc_repo(getTensorDocTypesConfig()); const FixedTypeRepo tensor_repo(tensor_doc_repo, - *tensor_doc_repo.getDocumentType(doc_type_id)); + *tensor_doc_repo.getDocumentType(tensor_doc_type_id)); const DocumentTypeRepo tensor_doc_repo1(getTensorDocTypesConfig("tensor(dimX{})")); diff --git a/document/src/vespa/document/base/field.h b/document/src/vespa/document/base/field.h index c80733dd5ff..dea7198015a 100644 --- a/document/src/vespa/document/base/field.h +++ b/document/src/vespa/document/base/field.h @@ -56,7 +56,7 @@ public: bool contains(const Set & field) const; size_t size() const { return _fields.size(); } bool empty() const { return _fields.empty(); } - const CPtr * begin() const { return &_fields[0]; } + const CPtr * begin() const { return _fields.data(); } const CPtr * end() const { return begin() + _fields.size(); } static Set emptySet() { return Builder().build(); } private: |