godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix crashes in SVG loading

Browse Source 
Adding null terminators.
This commit is contained in:
Pedro J. Estébanez
2017-08-22 19:39:10 +02:00
parent 294e912a84
commit 00c9218b48
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/svg/image_loader_svg.cpp
View File

@@ -82,9 +82,9 @@ Error ImageLoaderSVG::create_image_from_string(Ref<Image> p_image, const char *s
size_t str_len = strlen(svg_str); size_t str_len = strlen(svg_str);
PoolVector<uint8_t> src_data; PoolVector<uint8_t> src_data;
src_data.resize(str_len); src_data.resize(str_len + 1);
PoolVector<uint8_t>::Write src_w = src_data.write(); PoolVector<uint8_t>::Write src_w = src_data.write();
memcpy(src_w.ptr(), svg_str, str_len); memcpy(src_w.ptr(), svg_str, str_len + 1);
return _create_image(p_image, &src_data, p_scale, upsample); return _create_image(p_image, &src_data, p_scale, upsample);
} }
@@ -93,9 +93,10 @@ Error ImageLoaderSVG::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
uint32_t size = f->get_len(); uint32_t size = f->get_len();
PoolVector<uint8_t> src_image; PoolVector<uint8_t> src_image;
src_image.resize(size); src_image.resize(size + 1);
PoolVector<uint8_t>::Write src_w = src_image.write(); PoolVector<uint8_t>::Write src_w = src_image.write();
f->get_buffer(src_w.ptr(), size); f->get_buffer(src_w.ptr(), size);
src_w.ptr()[size] = '\0';
return _create_image(p_image, &src_image, p_scale, 1.0); return _create_image(p_image, &src_image, p_scale, 1.0);
} }