zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code securisation (#843) 

* Fix: securize convertToGroup method when manipulate element with no transform attribute
* Fix: securise getIntersectionListMethod method when manipulate element with no bbox (for example : defs element)
* Fix: securise resize method when there is no bbox (for example : defs element)
* Fix: securise recalculateDimensions to avoid to pass null to addSubCommand
master
cg-scorpio 2022-10-26 15:38:54 +02:00 committed by GitHub
parent 8350b97875
commit ae243ce906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 95 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/svgcanvas/recalculate.js
View File

@ -359,7 +359,10 @@ export const recalculateDimensions = (selected) => {
childTlist.appendItem(scale)
childTlist.appendItem(translateOrigin)
} // not rotated
batchCmd.addSubCommand(recalculateDimensions(child))
const recalculatedDimensions = recalculateDimensions(child)
if (recalculatedDimensions) {
batchCmd.addSubCommand(recalculatedDimensions)
}
svgCanvas.setStartTransform(oldStartTransform)
} // element
} // for each child
@ -420,7 +423,10 @@ export const recalculateDimensions = (selected) => {
} else {
childTlist.appendItem(newxlate)
}
batchCmd.addSubCommand(recalculateDimensions(child))
const recalculatedDimensions = recalculateDimensions(child)
if (recalculatedDimensions) {
batchCmd.addSubCommand(recalculatedDimensions)
}
// If any <use> have this group as a parent and are
// referencing this child, then impose a reverse translate on it
// so that when it won't get double-translated
@ -464,7 +470,10 @@ export const recalculateDimensions = (selected) => {
childTlist.clear()
childTlist.appendItem(e2m, 0)
batchCmd.addSubCommand(recalculateDimensions(child))
const recalculatedDimensions = recalculateDimensions(child)
if (recalculatedDimensions) {
batchCmd.addSubCommand(recalculatedDimensions)
}
svgCanvas.setStartTransform(oldStartTransform)
// Convert stroke
@ -544,7 +553,10 @@ export const recalculateDimensions = (selected) => {
childTlist.appendItem(newxlate)
}
batchCmd.addSubCommand(recalculateDimensions(child))
const recalculatedDimensions = recalculateDimensions(child)
if (recalculatedDimensions) {
batchCmd.addSubCommand(recalculatedDimensions)
}
svgCanvas.setStartTransform(oldStartTransform)
}
}

3
packages/svgcanvas/select.js
View File

@ -161,6 +161,7 @@ export class Selector {
}
}
if (bbox) {
// apply the transforms
const l = bbox.x; const t = bbox.y; const w = bbox.width; const h = bbox.height
// bbox = {x: l, y: t, width: w, height: h}; // Not in use
@ -246,7 +247,7 @@ export class Selector {
mgr.rotateGrip.setAttribute('cx', nbax + (nbaw) / 2)
mgr.rotateGrip.setAttribute('cy', nbay - (gripRadius * 5))
// }
}
}
// STATIC methods

2
packages/svgcanvas/selected-elem.js
View File

@ -972,7 +972,7 @@ const convertToGroup = elem => {
} else if (dataStorage.has($elem, 'symbol')) {
elem = dataStorage.get($elem, 'symbol')
ts = $elem.getAttribute('transform')
ts = $elem.getAttribute('transform') || ''
const pos = {
x: Number($elem.getAttribute('x')),
y: Number($elem.getAttribute('y'))

2
packages/svgcanvas/selection.js
View File

@ -324,7 +324,7 @@ const getIntersectionListMethod = (rect) => {
if (!rubberBBox.width) {
continue
}
if (rectsIntersect(rubberBBox, curBBoxes[i].bbox)) {
if (curBBoxes[i].bbox && rectsIntersect(rubberBBox, curBBoxes[i].bbox)) {
resultList.push(curBBoxes[i].elem)
}
}