virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/file: add missing null check in Android content resolver

Browse Source 
openFileDescriptor() can return null in certain error conditions.

Signed-off-by: sfan5 <sfan5@live.de>
Reviewed-by: Kacper Michajłow <kasper93@gmail.com>
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
sfan5
2025-07-30 15:49:07 +02:00
committed by Zhao Zhili
parent 2a49d05d1a
commit 1a61db9797
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/file.c
View File

@ -621,6 +621,11 @@ static int android_content_open(URLContext *h, const char *filename, int flags)
ret = ff_jni_exception_check(env, 1, c); ret = ff_jni_exception_check(env, 1, c);
if (ret < 0) if (ret < 0)
goto done; goto done;
if (!parcel_file_descriptor) {
av_log(c, AV_LOG_ERROR, "file descriptor is null\n");
ret = AVERROR_EXTERNAL;
goto done;
}
fd = (*env)->CallIntMethod(env, parcel_file_descriptor, jfields.detach_fd_id); fd = (*env)->CallIntMethod(env, parcel_file_descriptor, jfields.detach_fd_id);
ret = ff_jni_exception_check(env, 1, c); ret = ff_jni_exception_check(env, 1, c);