Merge pull request #27676 from qarmin/small_fixes_2

Small fixes to static analyzer bugs
2019-05-01 08:19:04 +02:00
parent 8afc9c3938 8460d0678c
commit ae41e35191
14 changed files with 59 additions and 72 deletions
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1864,7 +1864,6 @@ public:
 			return ERR_FILE_NOT_FOUND;
 		}

-		ERR_FAIL_COND_V(!pkg, ERR_CANT_OPEN);
 		int ret = unzGoToFirstFile(pkg);

 		zlib_filefunc_def io2 = io;
@@ -2204,7 +2203,6 @@ public:
 			return ERR_FILE_NOT_FOUND;
 		}

-		ERR_FAIL_COND_V(!tmp_unaligned, ERR_CANT_OPEN);
 		ret = unzGoToFirstFile(tmp_unaligned);

 		io2 = io;