From 383b5b8f7e629475e5f22445167aaa7669c5cdd6 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 26 Oct 2023 09:26:16 +0400 Subject: [PATCH] Make TextUtilities::CutPart more strict. --- ui/text/text_entity.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp index 9d25dd6..5adfe7c 100644 --- a/ui/text/text_entity.cpp +++ b/ui/text/text_entity.cpp @@ -1424,7 +1424,11 @@ QStringList PrepareSearchWords( } bool CutPart(TextWithEntities &sending, TextWithEntities &left, int32 limit) { - if (left.text.isEmpty() || !limit) return false; + Expects(limit > 0); + + if (left.text.isEmpty()) { + return false; + } int32 currentEntity = 0, goodEntity = currentEntity, entityCount = left.entities.size(); bool goodInEntity = false, goodCanBreakEntity = false; @@ -1533,10 +1537,7 @@ bool CutPart(TextWithEntities &sending, TextWithEntities &left, int32 limit) { return true; } } - sending.text = left.text; - left.text = QString(); - sending.entities = left.entities; - left.entities = EntitiesInText(); + sending = base::take(left); return true; }