From 53ce0d1a31c8ebb54952887b8bcf769843d50d9c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 4 Mar 2015 09:33:42 -0800 Subject: QStringAlgorithms::simplified_helper: add missing check for detached Otherwise, we modify shared strings that happened to be rvalues. Task-number: QTBUG-44706 Change-Id: Ia0aac2f09e9245339951ffff13c85bfc912f03d1 Reviewed-by: Friedemann Kleint --- src/corelib/tools/qstringalgorithms_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qstringalgorithms_p.h b/src/corelib/tools/qstringalgorithms_p.h index 1481b194eb..b4be5c7ec7 100644 --- a/src/corelib/tools/qstringalgorithms_p.h +++ b/src/corelib/tools/qstringalgorithms_p.h @@ -114,7 +114,7 @@ template struct QStringAlgorithms return str; const Char *src = str.cbegin(); const Char *end = str.cend(); - NakedStringType result = isConst ? + NakedStringType result = isConst || !str.isDetached() ? StringType(str.size(), Qt::Uninitialized) : qMove(str); -- cgit v1.2.3