From fd4531fe234149f4f078a1e73ec68145f9da20b3 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Fri, 5 Jul 2024 08:47:30 -0700 Subject: [PATCH] Fix NPE in FileReaderModule (#45287) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/45287 Fixes https://github.com/facebook/react-native/issues/45277 This fixes an NPE reported in OSS if you do this call in JavaScript: ``` const fr = new FileReader(); fr.readAsText({}); ``` Changelog: [Android] [Fixed] - Fix NPE in FileReaderModule Reviewed By: dmytrorykun Differential Revision: D59372620 fbshipit-source-id: ad5073376eaa26852c8277bdbb7d76b1aa480b3c --- .../com/facebook/react/modules/blob/FileReaderModule.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java index e5247907f4c..90911a2884d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java @@ -41,6 +41,9 @@ public class FileReaderModule extends NativeFileReaderModuleSpec { promise.reject( new IllegalStateException("Could not get BlobModule from ReactApplicationContext")); return; + } else if (blob == null) { + promise.reject(ERROR_INVALID_BLOB, "The specified blob is null"); + return; } byte[] bytes = @@ -66,6 +69,9 @@ public class FileReaderModule extends NativeFileReaderModuleSpec { promise.reject( new IllegalStateException("Could not get BlobModule from ReactApplicationContext")); return; + } else if (blob == null) { + promise.reject(ERROR_INVALID_BLOB, "The specified blob is null"); + return; } byte[] bytes =