make sure input and output files are closed, fixes #35

tanersener · tanersener · commit d23ea26c60c1 · 2021-04-30T22:47:34.000+01:00
diff --git a/android/ffmpeg-kit-android-lib/src/main/cpp/saf_wrapper.c b/android/ffmpeg-kit-android-lib/src/main/cpp/saf_wrapper.c
@@ -91,12 +91,12 @@ static AVIOContext *create_fd_avio_context(const char *filename, int flags) {
 
 static void close_fd_avio_context(AVIOContext *ctx) {
     if (ctx) {
-        if (fd_seek(ctx->opaque, 0, AVSEEK_SIZE) >= 0) {
-            int *fd = ctx->opaque;
+        int *fd = ctx->opaque;
+        if (fd_seek((void*)fd, 0, AVSEEK_SIZE) >= 0) {
             closeParcelFileDescriptor(*fd);
             av_freep(&fd);
+            ctx->opaque = NULL;
         }
-        ctx->opaque = NULL;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,12 @@ static AVIOContext create_fd_avio_context(const char filename, int flags) {`
`91`	`91`
`92`	`92`	`static void close_fd_avio_context(AVIOContext *ctx) {`
`93`	`93`	`if (ctx) {`
`94`		`- if (fd_seek(ctx->opaque, 0, AVSEEK_SIZE) >= 0) {`
`95`		`- int *fd = ctx->opaque;`
	`94`	`+ int *fd = ctx->opaque;`
	`95`	`+ if (fd_seek((void*)fd, 0, AVSEEK_SIZE) >= 0) {`
`96`	`96`	`closeParcelFileDescriptor(*fd);`
`97`	`97`	`av_freep(&fd);`
	`98`	`+ ctx->opaque = NULL;`
`98`	`99`	`}`
`99`		`- ctx->opaque = NULL;`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`