You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/09/26 04:37:04 UTC

svn commit: r1882034 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java

Author: tilman
Date: Sat Sep 26 04:37:04 2020
New Revision: 1882034

URL: http://svn.apache.org/viewvc?rev=1882034&view=rev
Log:
PDFBOX-4963: avoid TOCTOU-like race condition when a font is needed, as suggested by Maison

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1882034&r1=1882033&r2=1882034&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Sat Sep 26 04:37:04 2020
@@ -114,8 +114,10 @@ final class FileSystemFontProvider exten
          * 
          */
         @Override
-        public FontBoxFont getFont()
+        public synchronized FontBoxFont getFont()
         {
+            // synchronized to avoid race condition on cache access,
+            // which could result in an unreferenced but open font
             FontBoxFont cached = parent.cache.getFont(this);
             if (cached != null)
             {