diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 21:47:55 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 21:47:55 +0000 |
| commit | a6b4f91d970aa2b71b0f3552dbc11e94f7650fd5 (patch) | |
| tree | 2b757adf21faa704648460bf2ab8f9f59d52e82f | |
| parent | 69e92c3cc4993ff6e42b55ae7fc41d43a103e73d (diff) | |
| download | chromium_src-a6b4f91d970aa2b71b0f3552dbc11e94f7650fd5.zip chromium_src-a6b4f91d970aa2b71b0f3552dbc11e94f7650fd5.tar.gz chromium_src-a6b4f91d970aa2b71b0f3552dbc11e94f7650fd5.tar.bz2 | |
Fix possible access to NULL pointer.
BUG=223139
Review URL: https://codereview.chromium.org/13249003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191449 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/base/android/java/src/org/chromium/media/VideoCapture.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/android/java/src/org/chromium/media/VideoCapture.java b/media/base/android/java/src/org/chromium/media/VideoCapture.java index 0266558..150f3b6 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCapture.java +++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java @@ -251,8 +251,8 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener { stopCapture(); try { mCamera.setPreviewTexture(null); - mSurfaceTexture.setOnFrameAvailableListener(null); - GLES20.glDeleteTextures(1, mGlTextures, 0); + if (mGlTextures != null) + GLES20.glDeleteTextures(1, mGlTextures, 0); mCurrentCapability = null; mCamera.release(); mCamera = null; |