Changeset 147726 in webkit

Timestamp:

Apr 5, 2013 1:24:50 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] WebOverlay: check if platformContext is null
​https://bugs.webkit.org/show_bug.cgi?id=114005

Patch by Anthony Scian <​ascian@blackberry.com> on 2013-04-05
Reviewed by Carlos Garcia Campos.

RIM PR 256522
Internally reviewed by Mike Lattanzio.

The pointer returned by lockBufferDrawable can be null, so it
needs to be checked first before being used.

• Api/WebOverlay.cpp:

(BlackBerry::WebKit::WebOverlayLayerCompositingThreadClient::uploadTexturesIfNeeded):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebOverlay.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp

@@ -461 +461 @@
         clearBuffer(textureContents, 0, 0, 0, 0);
         PlatformGraphicsContext* platformContext = lockBufferDrawable(textureContents);
+        if (!platformContext) {
+            destroyBuffer(textureContents);
+            return;
+        }
         double transform[] = {
             1, 0,
@@ -477 +481 @@
 
         PlatformGraphicsContext* platformContext = BlackBerry::Platform::Graphics::lockBufferDrawable(textureContents);
+        if (!platformContext) {
+            destroyBuffer(textureContents);
+            return;
+        }
 
         AffineTransform transform;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-05  Anthony Scian  <ascian@blackberry.com>
+
+        [BlackBerry] WebOverlay: check if platformContext is null
+        https://bugs.webkit.org/show_bug.cgi?id=114005
+
+        Reviewed by Carlos Garcia Campos.
+
+        RIM PR 256522
+        Internally reviewed by Mike Lattanzio.
+
+        The pointer returned by lockBufferDrawable can be null, so it
+        needs to be checked first before being used.
+
+        * Api/WebOverlay.cpp:
+        (BlackBerry::WebKit::WebOverlayLayerCompositingThreadClient::uploadTexturesIfNeeded):
+
 2013-04-05  Benjamin Poulain  <bpoulain@apple.com>