Merge pull request #367 from nico-izo/tinyFixSegfault

[core] Safer implementation
euroelessar · Aug 2, 2015 · b8f73a3 · b8f73a3
2 parents 40e9807 + 00f780e
commit b8f73a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lib/qutim/message.cpp b/src/lib/qutim/message.cpp
@@ -126,8 +126,8 @@ class MessagePrivate : public DynamicPropertyData
 	QVariant getText() const { return text; }
 	void setText(const QVariant &val) { text = val.toString(); }
 	QVariant getHtml() const {
+		QString mutableHtml = html;
 		if (html.isEmpty()) {
-			QString &mutableHtml = const_cast<QString&>(html);
 			mutableHtml = text.toHtmlEscaped();
 			// keep leading whitespaces
 			mutableHtml.replace(QLatin1String("\n "), QLatin1String("<br/>&nbsp;"));
@@ -137,7 +137,7 @@ class MessagePrivate : public DynamicPropertyData
 			// keep multiple whitespaces
 			mutableHtml.replace(QLatin1String("  "), QLatin1String(" &nbsp;"));
 		}
-		return html;
+		return mutableHtml;
 	}
 	void setHtml(const QVariant &val) { html = val.toString(); }
 	QVariant getTime() const { return time; }