diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-01 21:52:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 21:52:55 +0200 |
| commit | dac150108ab3c1f41d5fd86cc6853f883064caaf (patch) | |
| tree | 09195c9dd5e0d651e96b7d26f26985ab5ff6f871 /core/io/file_access_encrypted.cpp | |
| parent | 69ac4cbb3764a454194e27a7afe71d98af65c32c (diff) | |
| parent | f9467ec1ea6c0dac2ea513b7dfe58d0349788e02 (diff) | |
| download | redot-engine-dac150108ab3c1f41d5fd86cc6853f883064caaf.tar.gz | |
Merge pull request #10846 from hpvb/fix-sign-compare
Fix signed and unsigned comparisons
Diffstat (limited to 'core/io/file_access_encrypted.cpp')
| -rw-r--r-- | core/io/file_access_encrypted.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index cf82d04ac5..12503f3be4 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -73,14 +73,14 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8 length = p_base->get_64(); base = p_base->get_pos(); ERR_FAIL_COND_V(p_base->get_len() < base + length, ERR_FILE_CORRUPT); - int ds = length; + uint32_t ds = length; if (ds % 16) { ds += 16 - (ds % 16); } data.resize(ds); - int blen = p_base->get_buffer(data.ptr(), ds); + uint32_t blen = p_base->get_buffer(data.ptr(), ds); ERR_FAIL_COND_V(blen != ds, ERR_FILE_CORRUPT); aes256_context ctx; |