Fix reply to usernames containing HTML escape characters

element-hq · Jun 10, 2022 · 2103f1a · 2103f1a
1 parent 5d3e42b
commit 2103f1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -1995,7 +1995,7 @@ - (NSString*)renderReplyTo:(NSString*)htmlString withRoomState:(MXRoomState*)roo
 
         if (senderDisplayName)
         {
-            html = [html stringByReplacingCharactersInRange:userIdRange withString:senderDisplayName];
+            html = [html stringByReplacingCharactersInRange:userIdRange withString:senderDisplayName.stringByAddingHTMLEntities];
         }
     }
 

diff --git a/changelog.d/5526.bugfix b/changelog.d/5526.bugfix
@@ -0,0 +1 @@
+Fix reply to usernames containing HTML escape characters
-Original file line number
+Diff line change
@@ Expand Up @@
             if (senderDisplayName)
             {
-                html = [html stringByReplacingCharactersInRange:userIdRange withString:senderDisplayName];
+                html = [html stringByReplacingCharactersInRange:userIdRange withString:senderDisplayName.stringByAddingHTMLEntities];
             }
         }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix reply to usernames containing HTML escape characters