GithubStar/Hippy
1
0
Fork 0
mirror of https://github.com/Tencent/Hippy.git synced 2026-10-29 14:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(vue): fix regular expressions catastrophic backtracking

Browse Source
This commit is contained in:
zoomchan-cxj
2022-09-14 10:43:06 +08:00
committed by Zoom Chan
parent 55174ed472
commit 1fe30eda6c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
driver/js/packages/hippy-react/src/dom/element-node.ts
+1 -1
View File
@@ -122,7 +122,7 @@ function convertToDegree(value: string, unit = DEGREE_UNIT.DEG): string {
*/
function getLinearGradientAngle(value: string): string | undefined {
const processedValue = (value || '').replace(/\s*/g, '').toLowerCase();
const reg = /^([+-]?\d+\.?\d*)+(deg|turn|rad)|(to\w+)$/g;
const reg = /^([+-]?(?=(?<digit>\d+))\k<digit>\.?\d*)+(deg|turn|rad)|(to\w+)$/g;
const valueList = reg.exec(processedValue);
if (!Array.isArray(valueList)) return;
// default direction is to bottom, i.e. 180degree
driver/js/packages/hippy-vue-css-loader/src/css-parser.js
+3 -3
View File
@@ -61,7 +61,7 @@ const commentRegexp = /\/\*[^*]*\*+([^/*][^*]*\*+)*\//g;
* Trim `str`.
*/
function trim(str) {
return str ? str.replace(/^\s+|\s+$/g, '') : '';
return str ? str.trim() : '';
}
@@ -297,7 +297,7 @@ function parseCSS(css, options) {
/* @fix Remove all comments from selectors
* http://ostermiller.org/findcomment.html */
return trim(m[0])
.replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, '')
.replace(/\/\*(?=(?<digit1>([^*]|[\r\n]|((?=(?<digit2>\*+))\k<digit2>([^*/]|[\r\n])))*))\k<digit1>\*\/+/g, '')
.replace(/"(?:\\"|[^"])*"|'(?:\\'|[^'])*'/g, m => m.replace(/,/g, '\u200C'))
.split(/\s*(?![^(]*\)),\s*/)
.map(s => s.replace(/\u200C/g, ','));
@@ -335,7 +335,7 @@ function parseCSS(css, options) {
*/
function getLinearGradientAngle(value) {
const processedValue = (value || '').replace(/\s*/g, '').toLowerCase();
const reg = /^([+-]?\d+\.?\d*)+(deg|turn|rad)|(to\w+)$/g;
const reg = /^([+-]?(?=(?<digit>\d+))\k<digit>\.?\d*)+(deg|turn|rad)|(to\w+)$/g;
const valueList = reg.exec(processedValue);
if (!Array.isArray(valueList)) return;
// default direction is to bottom, i.e. 180degree
driver/js/packages/hippy-vue/src/renderer/element-node.js
+1 -1
View File
@@ -92,7 +92,7 @@ function convertToDegree(value, unit = DEGREE_UNIT.DEG) {
*/
function getLinearGradientAngle(value) {
const processedValue = (value || '').replace(/\s*/g, '').toLowerCase();
const reg = /^([+-]?\d+\.?\d*)+(deg|turn|rad)|(to\w+)$/g;
const reg = /^([+-]?(?=(?<digit>\d+))\k<digit>\.?\d*)+(deg|turn|rad)|(to\w+)$/g;
const valueList = reg.exec(processedValue);
if (!Array.isArray(valueList)) return;
// if default direction is to bottom, i.e. 180degree