Changeset 89172 in webkit

Timestamp:

Jun 17, 2011 2:20:44 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-06-17 Jer Noble <​jer.noble@apple.com>

Reviewed by Ada Chan.

Playing video from the manifest crashes on Windows
​https://bugs.webkit.org/show_bug.cgi?id=62901

No new tests. This will be covered by existing App Cache tests.

Two related fixes. 1) Null-check the CFStringRef and CFURLRef created in QTMovie::load() before
passing them to CFRelease(). 2) Use CFURL to create an appropriate file-URL on windows in
createFileURLForApplicationCacheResource.

• html/HTMLMediaElement.cpp: (WebCore::createFileURLForApplicationCacheResource):
• platform/graphics/win/QTMovie.cpp: (QTMovie::load):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• platform/graphics/win/QTMovie.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-17  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Ada Chan.
+
+        Playing video from the manifest crashes on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=62901
+
+        No new tests. This will be covered by existing App Cache tests.
+
+        Two related fixes.  1) Null-check the CFStringRef and CFURLRef created in QTMovie::load() before
+        passing them to CFRelease().  2) Use CFURL to create an appropriate file-URL on windows in 
+        createFileURLForApplicationCacheResource.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::createFileURLForApplicationCacheResource):
+        * platform/graphics/win/QTMovie.cpp:
+        (QTMovie::load):
+
 2011-06-17  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -682 +682 @@
     // does not correctly escape '#' and '?'. This function works for our purposes because
     // app cache media files are always created with encodeForFileName(createCanonicalUUIDString()).
+
+#if USE(CF) && PLATFORM(WIN)
+    RetainPtr<CFStringRef> cfPath(AdoptCF, path.createCFString());
+    RetainPtr<CFURLRef> cfURL(AdoptCF, CFURLCreateWithFileSystemPath(0, cfPath.get(), kCFURLWindowsPathStyle, false));
+    KURL url(cfURL.get());
+#else
     KURL url;
 
     url.setProtocol("file");
     url.setPath(path);
+#endif
     return url;
 }

trunk/Source/WebCore/platform/graphics/win/QTMovie.cpp

@@ -450 +450 @@
     load(cfURL, preservesPitch);
 
-    CFRelease(cfURL);
-    CFRelease(urlStringRef);
+    if (cfURL)
+        CFRelease(cfURL);
+    if (urlStringRef)
+        CFRelease(urlStringRef);
 }
 
@@ -461 +463 @@
     load(cfURL, preservesPitch);
 
-    CFRelease(cfURL);
-    CFRelease(urlStringRef);
+    if (cfURL)
+        CFRelease(cfURL);
+    if (urlStringRef)
+        CFRelease(urlStringRef);
 }