git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-13 19:44:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

svg_loader: <image> tag introduced fix #8

Browse source 
Disable embedded svg files to protect against recursive svg image loading
This commit is contained in:
Michal Maciola 2021-07-06 11:33:44 +02:00 • committed by Hermet Park
parent 48bc30e70a
commit 28342c5c1f
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/loaders/svg/tvgSvgSceneBuilder.cpp
View file

@ -347,6 +347,7 @@ static bool _appendShape(SvgNode* node, Shape* shape, float vx, float vy, float
return true;
}
enum class imageMimeTypeEncoding
{
base64 = 0x1,
@ -359,6 +360,7 @@ constexpr bool operator&(imageMimeTypeEncoding a, imageMimeTypeEncoding b) {
return (static_cast<int>(a) & static_cast<int>(b));
}
static constexpr struct
{
const char* name;
@ -370,6 +372,7 @@ static constexpr struct
{"svg+xml", sizeof("svg+xml"), imageMimeTypeEncoding::base64 | imageMimeTypeEncoding::utf8},
};
static bool _isValidImageMimeTypeAndEncoding(const char** href, imageMimeTypeEncoding* encoding) {
if (strncmp(*href, "image/", sizeof("image/") - 1)) return false; //not allowed mime type
*href += sizeof("image/") - 1;
@ -413,6 +416,7 @@ static bool _isValidImageMimeTypeAndEncoding(const char** href, imageMimeTypeEnc
return false;
}
static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy, float vw, float vh)
{
if (!node->node.image.href) return nullptr;
@ -432,8 +436,17 @@ static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy,
}
} else {
if(!strncmp(href, "file://", sizeof("file://") - 1)) href += sizeof("file://") - 1;
if (!strncmp(href, "file://", sizeof("file://") - 1)) href += sizeof("file://") - 1;
//TODO: protect against recursive svg image loading
//Temporarily disable embedded svg:
const char *dot = strrchr(href, '.');
if (dot && !strcmp(dot, ".svg")) {
#ifdef THORVG_LOG_ENABLED
printf("SVG: Embedded svg file is disabled.\n");
#endif
return nullptr;
}
if (picture->load(href) != Result::Success) return nullptr;
picture->size(node->node.image.w, node->node.image.h);
}