From 13d96ec373f8f990d6a03f0129eacfcabe9f3d10 Mon Sep 17 00:00:00 2001 From: gcd Date: Wed, 30 Sep 2026 16:31:52 +0200 Subject: [PATCH 1/2] fix(android): defer PdfFile dispose to the rendering thread (#1024, #1041) PDFView.recycle() disposed the PdfFile synchronously on the main thread while RenderingHandler could still be rendering a page on the "PDF renderer" thread, freeing the native pdfium document under the renderer (SIGSEGV in libpdfium.so). PdfView.recycle() now detaches the PdfFile before super.recycle() and posts its dispose on the rendering handler, so it runs after any in-flight render. Co-Authored-By: Claude Opus 5.5 --- .../barteksc/pdfviewer/PdfFileDisposer.java | 35 +++++++++++++++++++ .../src/main/java/org/wonday/pdf/PdfView.java | 9 +++++ 2 files changed, 44 insertions(+) create mode 100644 android/src/main/java/com/github/barteksc/pdfviewer/PdfFileDisposer.java diff --git a/android/src/main/java/com/github/barteksc/pdfviewer/PdfFileDisposer.java b/android/src/main/java/com/github/barteksc/pdfviewer/PdfFileDisposer.java new file mode 100644 index 00000000..94affa80 --- /dev/null +++ b/android/src/main/java/com/github/barteksc/pdfviewer/PdfFileDisposer.java @@ -0,0 +1,35 @@ +package com.github.barteksc.pdfviewer; + +import android.os.Handler; + +// Declared in AndroidPdfViewer's package to reach PDFView's package-private +// pdfFile/renderingHandler fields and the package-private PdfFile class. +// +// PDFView.recycle() disposes the PdfFile synchronously on the main thread while +// RenderingHandler may still be rendering a page on its own thread, which closes +// the native pdfium document under the renderer (SIGSEGV in libpdfium.so, see +// https://github.com/wonday/react-native-pdf/issues/1024 and +// https://github.com/wonday/react-native-pdf/issues/1041). Posting the dispose on +// the rendering handler serializes it after any in-flight render. +public final class PdfFileDisposer { + private PdfFileDisposer() {} + + // Detaches the PdfFile so that PDFView.recycle() skips its synchronous dispose, + // and returns a task disposing it on the rendering thread. Must be called right + // before super.recycle(), and the returned task run right after it. + public static Runnable detach(PDFView view) { + final PdfFile pdfFile = view.pdfFile; + final Handler renderingHandler = view.renderingHandler; + view.pdfFile = null; + if (pdfFile == null) { + return () -> {}; + } + return () -> { + // post() fails once the rendering thread has quit: nothing can be + // rendering anymore, so disposing on the current thread is safe. + if (renderingHandler == null || !renderingHandler.post(pdfFile::dispose)) { + pdfFile.dispose(); + } + }; + } +} diff --git a/android/src/main/java/org/wonday/pdf/PdfView.java b/android/src/main/java/org/wonday/pdf/PdfView.java index e6dab0cb..358b138a 100644 --- a/android/src/main/java/org/wonday/pdf/PdfView.java +++ b/android/src/main/java/org/wonday/pdf/PdfView.java @@ -34,6 +34,7 @@ import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.UIManagerHelper; import com.github.barteksc.pdfviewer.PDFView; +import com.github.barteksc.pdfviewer.PdfFileDisposer; import com.github.barteksc.pdfviewer.listener.OnPageChangeListener; import com.github.barteksc.pdfviewer.listener.OnLoadCompleteListener; import com.github.barteksc.pdfviewer.listener.OnErrorListener; @@ -329,6 +330,14 @@ protected void onDetachedFromWindow() { super.onDetachedFromWindow(); } + // Defers the native document dispose to the rendering thread, see PdfFileDisposer. + @Override + public void recycle() { + Runnable disposePdfFile = PdfFileDisposer.detach(this); + super.recycle(); + disposePdfFile.run(); + } + private int getPdfPageCount(File pdfFile) throws IOException { ParcelFileDescriptor fileDescriptor = ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_ONLY); From 2941304116757507eb13616518621f9a361cfa89 Mon Sep 17 00:00:00 2001 From: gcd Date: Thu, 1 Oct 2026 14:23:54 +0200 Subject: [PATCH 2/2] fix(android): stop the renderer before detaching PdfFile in recycle() RenderingHandler.proceed() reads PDFView.pdfFile when it dequeues a render task. PdfFileDisposer cleared the field before super.recycle() had stopped the handler and removed the queued tasks, so a task dequeued in between hit a NullPointerException on the "PDF renderer" thread. Stop the handler and drop the queued tasks before clearing the field, as PDFView.recycle() itself does before its own dispose. Co-Authored-By: Claude Opus 5.5 --- .../com/github/barteksc/pdfviewer/PdfFileDisposer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/github/barteksc/pdfviewer/PdfFileDisposer.java b/android/src/main/java/com/github/barteksc/pdfviewer/PdfFileDisposer.java index 94affa80..57f4873f 100644 --- a/android/src/main/java/com/github/barteksc/pdfviewer/PdfFileDisposer.java +++ b/android/src/main/java/com/github/barteksc/pdfviewer/PdfFileDisposer.java @@ -1,7 +1,5 @@ package com.github.barteksc.pdfviewer; -import android.os.Handler; - // Declared in AndroidPdfViewer's package to reach PDFView's package-private // pdfFile/renderingHandler fields and the package-private PdfFile class. // @@ -19,7 +17,13 @@ private PdfFileDisposer() {} // before super.recycle(), and the returned task run right after it. public static Runnable detach(PDFView view) { final PdfFile pdfFile = view.pdfFile; - final Handler renderingHandler = view.renderingHandler; + final RenderingHandler renderingHandler = view.renderingHandler; + // RenderingHandler.proceed() reads view.pdfFile when it dequeues a task, so drop + // the queued tasks (as recycle() does) before clearing the field. + if (renderingHandler != null) { + renderingHandler.stop(); + renderingHandler.removeMessages(RenderingHandler.MSG_RENDER_TASK); + } view.pdfFile = null; if (pdfFile == null) { return () -> {};