[FFmpeg-cvslog] avformat/file: add missing null check in Android content resolver
sfan5
git at videolan.org
Thu Jul 31 14:59:40 EEST 2025
ffmpeg | branch: master | sfan5 <sfan5 at live.de> | Wed Jul 30 15:49:07 2025 +0200| [1a61db9797f461cbc7dd3400fa77dec4000df24e] | committer: Zhao Zhili
avformat/file: add missing null check in Android content resolver
openFileDescriptor() can return null in certain error conditions.
Signed-off-by: sfan5 <sfan5 at live.de>
Reviewed-by: Kacper Michajłow <kasper93 at gmail.com>
Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a61db9797f461cbc7dd3400fa77dec4000df24e
---
libavformat/file.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/file.c b/libavformat/file.c
index 6a66040b65..a6eceff58d 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -621,6 +621,11 @@ static int android_content_open(URLContext *h, const char *filename, int flags)
ret = ff_jni_exception_check(env, 1, c);
if (ret < 0)
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);
ret = ff_jni_exception_check(env, 1, c);
More information about the ffmpeg-cvslog
mailing list