Merge pull request #6515 from vespa-engine/balder/do-not-follow-nullptr

Prevent following the nullptr.

1 files changed, 5 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
index 1c2406b2acf..dfe98b44adc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
@@ -37,11 +37,14 @@ FastAccessFeedView::updateAttributes(SerialNum serialNum, search::DocumentIdT li
 }
 
 void
-FastAccessFeedView::updateAttributes(SerialNum serialNum, Lid lid, FutureDoc doc,
+FastAccessFeedView::updateAttributes(SerialNum serialNum, Lid lid, FutureDoc futureDoc,
                                      bool immediateCommit, OnOperationDoneType onWriteDone)
 {
     if (_attributeWriter->hasStructFieldAttribute()) {
-        _attributeWriter->update(serialNum, *doc.get(), lid, immediateCommit, onWriteDone);
+        const std::unique_ptr<const Document> & doc = futureDoc.get();
+        if (doc) {
+            _attributeWriter->update(serialNum, *doc, lid, immediateCommit, onWriteDone);
+        }
     }
 }