kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-03 09:14:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1232 from ispyisail/fix/symbol-preview-size-limit

Browse Source 
Fix a huge symbol size crashing QElectroTech while drawing its icon
This commit is contained in:
ispyisail
2026-10-02 17:00:21 +13:00
committed by GitHub
parent c3774e4037 1002b269ac
commit 6c8fb720c1
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/factory/elementpicturefactory.cpp
+18 -2
View File
@@ -135,14 +135,29 @@ QPixmap ElementPictureFactory::pixmap(const ElementsLocation &location)
{
auto doc = location.pugiXml();
//size
int w = doc.document_element().attribute("width").as_int();
int h = doc.document_element().attribute("height").as_int();
//Bounded first, so the rounding below cannot overflow on a
//crafted file.
int w = qBound(0, doc.document_element().attribute("width").as_int(), 1000000);
int h = qBound(0, doc.document_element().attribute("height").as_int(), 1000000);
while (w % 10) ++ w;
while (h % 10) ++ h;
//hotspot
int hsx = qMin(doc.document_element().attribute("hotspot_x").as_int(), w);
int hsy = qMin(doc.document_element().attribute("hotspot_y").as_int(), h);
//The size comes straight from the file. A symbol whose parts
//span hundreds of thousands of pixels would ask for a pixmap of
//hundreds of gigabytes; draw it scaled down to fit instead. The
//largest symbols in the shipped collection are about 3200 px,
//so this only changes files nobody would draw on purpose.
const int max_side = 4096;
qreal scale = 1.0;
if (w > max_side || h > max_side) {
scale = qreal(max_side) / qMax(w, h);
w = qMax(1, qRound(w * scale));
h = qMax(1, qRound(h * scale));
}
QPixmap pix(w, h);
//Element definitions almost always draw with a hardcoded black
//stroke color, on the assumption of the white diagram sheet they
@@ -157,6 +172,7 @@ QPixmap ElementPictureFactory::pixmap(const ElementsLocation &location)
QPainter painter(&pix);
painter.setRenderHint(QPainter::Antialiasing, true);
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
painter.scale(scale, scale);
painter.translate(hsx, hsy);
painter.drawPicture(0, 0, m_pictures_H.value(uuid));