MCorange/cinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash when decoding malformed urls (#1865)

Browse Source
This commit is contained in:
Ajay Bura
2024-08-04 11:08:20 +05:30
committed by GitHub
parent 8ed78d48fb
commit 581211f13e
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/plugins/react-custom-html-parser.tsx
View File

@@ -26,6 +26,7 @@ import {
testMatrixTo,
} from './matrix-to';
import { onEnterOrSpace } from '../utils/keyboard';
import { tryDecodeURIComponent } from '../utils/dom';
const ReactPrism = lazy(() => import('./react-prism/ReactPrism'));
@@ -134,8 +135,8 @@ export const factoryRenderLinkifyWithMention = (
attributes,
content,
}) => {
if (tagName === 'a' && testMatrixTo(decodeURIComponent(attributes.href))) {
const mention = mentionRender(decodeURIComponent(attributes.href));
if (tagName === 'a' && testMatrixTo(tryDecodeURIComponent(attributes.href))) {
const mention = mentionRender(tryDecodeURIComponent(attributes.href));
if (mention) return mention;
}
@@ -325,11 +326,11 @@ export const getReactCustomHtmlParser = (
}
}
if (name === 'a' && testMatrixTo(decodeURIComponent(props.href))) {
if (name === 'a' && testMatrixTo(tryDecodeURIComponent(props.href))) {
const mention = renderMatrixMention(
mx,
roomId,
decodeURIComponent(props.href),
tryDecodeURIComponent(props.href),
makeMentionCustomProps(params.handleMentionClick)
);
if (mention) return mention;