asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #35203 from timothyqiu/image-loader-null

Browse source 
Adds null check before using image loader
This commit is contained in:
Rémi Verschelde 2020-01-16 15:51:46 +01:00 committed by GitHub
commit df13245408
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/import/editor_scene_importer_gltf.cpp
View file

@ -1302,6 +1302,8 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b
if (mimetype.findn("png") != -1) { if (mimetype.findn("png") != -1) {
//is a png //is a png
ERR_FAIL_COND_V(Image::_png_mem_loader_func == NULL, ERR_UNAVAILABLE);
const Ref<Image> img = Image::_png_mem_loader_func(data_ptr, data_size); const Ref<Image> img = Image::_png_mem_loader_func(data_ptr, data_size);
ERR_FAIL_COND_V(img.is_null(), ERR_FILE_CORRUPT); ERR_FAIL_COND_V(img.is_null(), ERR_FILE_CORRUPT);
@ -1316,6 +1318,8 @@ Error EditorSceneImporterGLTF::_parse_images(GLTFState &state, const String &p_b
if (mimetype.findn("jpeg") != -1) { if (mimetype.findn("jpeg") != -1) {
//is a jpg //is a jpg
ERR_FAIL_COND_V(Image::_jpg_mem_loader_func == NULL, ERR_UNAVAILABLE);
const Ref<Image> img = Image::_jpg_mem_loader_func(data_ptr, data_size); const Ref<Image> img = Image::_jpg_mem_loader_func(data_ptr, data_size);
ERR_FAIL_COND_V(img.is_null(), ERR_FILE_CORRUPT); ERR_FAIL_COND_V(img.is_null(), ERR_FILE_CORRUPT);

2
modules/assimp/import_utils.h
View file

@ -355,11 +355,13 @@ public:
print_verbose("Open Asset Import: Loading embedded texture " + filename); print_verbose("Open Asset Import: Loading embedded texture " + filename);
if (tex->mHeight == 0) { if (tex->mHeight == 0) {
if (tex->CheckFormat("png")) { if (tex->CheckFormat("png")) {
ERR_FAIL_COND_V(Image::_png_mem_loader_func == NULL, Ref<Image>());
Ref<Image> img = Image::_png_mem_loader_func((uint8_t *)tex->pcData, tex->mWidth); Ref<Image> img = Image::_png_mem_loader_func((uint8_t *)tex->pcData, tex->mWidth);
ERR_FAIL_COND_V(img.is_null(), Ref<Image>()); ERR_FAIL_COND_V(img.is_null(), Ref<Image>());
state.path_to_image_cache.insert(p_path, img); state.path_to_image_cache.insert(p_path, img);
return img; return img;
} else if (tex->CheckFormat("jpg")) { } else if (tex->CheckFormat("jpg")) {
ERR_FAIL_COND_V(Image::_jpg_mem_loader_func == NULL, Ref<Image>());
Ref<Image> img = Image::_jpg_mem_loader_func((uint8_t *)tex->pcData, tex->mWidth); Ref<Image> img = Image::_jpg_mem_loader_func((uint8_t *)tex->pcData, tex->mWidth);
ERR_FAIL_COND_V(img.is_null(), Ref<Image>()); ERR_FAIL_COND_V(img.is_null(), Ref<Image>());
state.path_to_image_cache.insert(p_path, img); state.path_to_image_cache.insert(p_path, img);