Title: [147726] trunk/Source/WebKit/blackberry
- Revision
- 147726
- Author
- [email protected]
- Date
- 2013-04-05 01:24:50 -0700 (Fri, 05 Apr 2013)
Log Message
[BlackBerry] WebOverlay: check if platformContext is null
https://bugs.webkit.org/show_bug.cgi?id=114005
Patch by Anthony Scian <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp (147725 => 147726)
--- trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp 2013-04-05 08:22:13 UTC (rev 147725)
+++ trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp 2013-04-05 08:24:50 UTC (rev 147726)
@@ -460,6 +460,10 @@
clearBuffer(textureContents, 0, 0, 0, 0);
PlatformGraphicsContext* platformContext = lockBufferDrawable(textureContents);
+ if (!platformContext) {
+ destroyBuffer(textureContents);
+ return;
+ }
double transform[] = {
1, 0,
0, 1,
@@ -476,6 +480,10 @@
return;
PlatformGraphicsContext* platformContext = BlackBerry::Platform::Graphics::lockBufferDrawable(textureContents);
+ if (!platformContext) {
+ destroyBuffer(textureContents);
+ return;
+ }
AffineTransform transform;
platformContext->getTransform(reinterpret_cast<double*>(&transform));
Modified: trunk/Source/WebKit/blackberry/ChangeLog (147725 => 147726)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-05 08:22:13 UTC (rev 147725)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-05 08:24:50 UTC (rev 147726)
@@ -1,3 +1,19 @@
+2013-04-05 Anthony Scian <[email protected]>
+
+ [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 <[email protected]>
Remove WTFURL from WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
