diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-04-06 15:47:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-06 15:47:20 +0200 |
commit | ac591d9904e4e5cf7841b3e79caabf558d37db0e (patch) | |
tree | 70f3bd487e91feb4ca777dba214a09b17041da97 /platform/uwp | |
parent | 72407a9cfbd4f58102972c0910429f3ab7006f07 (diff) | |
parent | f851c4aa330e1064a66db50be62db2466f4fb768 (diff) |
Merge pull request #59911 from bruvzg/cppcheck_fixes
Diffstat (limited to 'platform/uwp')
-rw-r--r-- | platform/uwp/export/app_packager.cpp | 1 | ||||
-rw-r--r-- | platform/uwp/export/export_plugin.cpp | 3 | ||||
-rw-r--r-- | platform/uwp/export/export_plugin.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/platform/uwp/export/app_packager.cpp b/platform/uwp/export/app_packager.cpp index e7978ff74d..e5a1e951e4 100644 --- a/platform/uwp/export/app_packager.cpp +++ b/platform/uwp/export/app_packager.cpp @@ -301,7 +301,6 @@ Error AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t FileMeta meta; meta.name = p_file_name; meta.uncompressed_size = p_len; - meta.compressed_size = p_len; meta.compressed = p_compress; meta.zip_offset = package->get_position(); diff --git a/platform/uwp/export/export_plugin.cpp b/platform/uwp/export/export_plugin.cpp index 88343d6f85..375e860f5a 100644 --- a/platform/uwp/export/export_plugin.cpp +++ b/platform/uwp/export/export_plugin.cpp @@ -332,6 +332,9 @@ Error EditorExportPlatformUWP::export_project(const Ref<EditorExportPreset> &p_p unz_file_info info; char fname[16834]; ret = unzGetCurrentFileInfo(pkg, &info, fname, 16834, nullptr, 0, nullptr, 0); + if (ret != UNZ_OK) { + break; + } String path = String::utf8(fname); diff --git a/platform/uwp/export/export_plugin.h b/platform/uwp/export/export_plugin.h index bf89b10ffa..e2a4314ef5 100644 --- a/platform/uwp/export/export_plugin.h +++ b/platform/uwp/export/export_plugin.h @@ -417,7 +417,7 @@ class EditorExportPlatformUWP : public EditorExportPlatform { } static Error save_appx_file(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key) { - AppxPackager *packager = (AppxPackager *)p_userdata; + AppxPackager *packager = static_cast<AppxPackager *>(p_userdata); String dst_path = p_path.replace_first("res://", "game/"); return packager->add_file(dst_path, p_data.ptr(), p_data.size(), p_file, p_total, _should_compress_asset(p_path, p_data)); |