From 83d1fc6e72a9656f66a3d3b3d767e22d12f62949 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Sun, 7 Nov 2021 14:08:51 +0000 Subject: [PATCH] dont allow generating invalid saf urls, improves #34 --- .../main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java index 5e36e0c..e0f0549 100644 --- a/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java +++ b/android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/FFmpegKitConfig.java @@ -852,15 +852,17 @@ public class FFmpegKitConfig { } } catch (final Throwable t) { android.util.Log.e(TAG, String.format("Failed to get %s column for %s.%s", DocumentsContract.Document.COLUMN_DISPLAY_NAME, uri.toString(), Exceptions.getStackTraceString(t))); + throw t; } - int fd = -1; + final int fd; try { ParcelFileDescriptor parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, openMode); fd = parcelFileDescriptor.getFd(); pfdMap.put(fd, parcelFileDescriptor); } catch (final Throwable t) { android.util.Log.e(TAG, String.format("Failed to obtain %s parcelFileDescriptor for %s.%s", openMode, uri.toString(), Exceptions.getStackTraceString(t))); + throw new IllegalArgumentException(String.format("Failed to obtain %s parcelFileDescriptor for %s.", openMode, uri.toString()), t); } return "saf:" + fd + "." + FFmpegKitConfig.extractExtensionFromSafDisplayName(displayName);