Changeset 98970 in webkit

Timestamp:

Nov 1, 2011, 9:28:18 AM (13 years ago)

Author:

Darin Adler

Message:

Crash in PDF code when script has illegal UTF-8 or UTF-16 sequences
​https://bugs.webkit.org/show_bug.cgi?id=71289

Reviewed by Dan Bernstein.

Just adding a null check. I don't have access to an actual PDF with
this problem but crashes from the field indicate they exist.

• WebView/WebPDFDocumentExtras.mm:

(allScriptsInPDFDocument): Skip the code to add the script text
to an array when the script is null.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebPDFDocumentExtras.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-11-01  Darin Adler  <darin@apple.com>
+
+        Crash in PDF code when script has illegal UTF-8 or UTF-16 sequences
+        https://bugs.webkit.org/show_bug.cgi?id=71289
+
+        Reviewed by Dan Bernstein.
+
+        Just adding a null check. I don't have access to an actual PDF with
+        this problem but crashes from the field indicate they exist.
+
+        * WebView/WebPDFDocumentExtras.mm:
+        (allScriptsInPDFDocument): Skip the code to add the script text
+        to an array when the script is null.
+
 2011-10-28  John Sullivan  <sullivan@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm

@@ -90 +90 @@
         return scripts;
 
-    // The names are aribtrary. We are only interested in the values.
+    // The names are arbitrary. We are only interested in the values.
     Vector<CGPDFObjectRef> objects;
     getAllValuesInPDFNameTree(javaScriptNameTree, objects);
@@ -126 +126 @@
         NSStringEncoding encoding = (length > 1 && bytes[0] == 0xFE && bytes[1] == 0xFF) ? NSUnicodeStringEncoding : NSUTF8StringEncoding;
         NSString *script = [[NSString alloc] initWithBytes:bytes length:length encoding:encoding];
+        if (!script)
+            continue;
+
         [scripts addObject:script];
         [script release];