diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 01:27:27 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 01:27:27 +0000 |
| commit | 736dfa48dc9fd99bc8b6b2fea15cc30b7e334417 (patch) | |
| tree | 7610b34ec5672ed15f9549cbb9e0f2213ce8ebf9 /content | |
| parent | 8b3f6ea58e2dc7d1843f848e019f7d13ae15c25c (diff) | |
| download | chromium_src-736dfa48dc9fd99bc8b6b2fea15cc30b7e334417.zip chromium_src-736dfa48dc9fd99bc8b6b2fea15cc30b7e334417.tar.gz chromium_src-736dfa48dc9fd99bc8b6b2fea15cc30b7e334417.tar.bz2 | |
Check for NULL return from eglQueryString.
This can happen if there's a problem with EGL.
BUG=265478
R=apatrick@chromium.org
Review URL: https://codereview.chromium.org/21201002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/gpu/image_transport_surface_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/common/gpu/image_transport_surface_win.cc b/content/common/gpu/image_transport_surface_win.cc index 7d1b08d..28a2449 100644 --- a/content/common/gpu/image_transport_surface_win.cc +++ b/content/common/gpu/image_transport_surface_win.cc @@ -262,7 +262,8 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface( // TextureImageTransportSurface above). const char* extensions = eglQueryString( gfx::GLSurfaceEGL::GetHardwareDisplay(), EGL_EXTENSIONS); - if (strstr(extensions, "EGL_ANGLE_query_surface_pointer") && + if (extensions && + strstr(extensions, "EGL_ANGLE_query_surface_pointer") && strstr(extensions, "EGL_ANGLE_surface_d3d_texture_2d_share_handle")) { return scoped_refptr<gfx::GLSurface>( new PbufferImageTransportSurface(manager, stub)); |