Explorar o código

Merge pull request #48141 from akien-mga/android-fileaccess-get_buffer-false-positive

Android: Fix get_buffer false positive on empty dest buffer
Rémi Verschelde %!s(int64=4) %!d(string=hai) anos
pai
achega
b923726f67
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      platform/android/file_access_android.cpp

+ 1 - 1
platform/android/file_access_android.cpp

@@ -114,7 +114,7 @@ uint8_t FileAccessAndroid::get_8() const {
 }
 }
 
 
 int FileAccessAndroid::get_buffer(uint8_t *p_dst, int p_length) const {
 int FileAccessAndroid::get_buffer(uint8_t *p_dst, int p_length) const {
-	ERR_FAIL_COND_V(!p_dst, -1);
+	ERR_FAIL_COND_V(!p_dst && p_length > 0, -1);
 	ERR_FAIL_COND_V(p_length < 0, -1);
 	ERR_FAIL_COND_V(p_length < 0, -1);
 
 
 	off_t r = AAsset_read(a, p_dst, p_length);
 	off_t r = AAsset_read(a, p_dst, p_length);