From 1e82e21aa1bfcb24442e0000e94c062352b5fa82 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 3 Aug 2023 16:59:25 +0000 Subject: Avoid taking a reference to a nullptr --- searchsummary/src/vespa/juniper/sumdesc.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/searchsummary/src/vespa/juniper/sumdesc.cpp b/searchsummary/src/vespa/juniper/sumdesc.cpp index aa6aededa0c..e88f7971666 100644 --- a/searchsummary/src/vespa/juniper/sumdesc.cpp +++ b/searchsummary/src/vespa/juniper/sumdesc.cpp @@ -623,9 +623,8 @@ int SummaryDesc::complete_extended_token(unsigned char* start, ssize_t length, /* Return a highlight tagged summary string from this summary * description */ -std::string SummaryDesc::get_summary(const char* buffer, size_t bytes, - const SummaryConfig* sumconf, - size_t& char_size) +std::string +SummaryDesc::get_summary(const char* buffer, size_t bytes, const SummaryConfig* sumconf, size_t& char_size) { std::vector s; ssize_t prev_end = 0; @@ -759,7 +758,7 @@ std::string SummaryDesc::get_summary(const char* buffer, size_t bytes, s.size(), a.charLen()); _sumconf = NULL; // Not valid after this call. char_size = a.charLen(); - return std::string(&s[0], s.size()); + return std::string(s.begin(), s.end()); } -- cgit v1.2.3