From db004e1c9ff995381e204135583c06758ba8f2a3 Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Mon, 9 Aug 2010 17:45:29 -0700
Subject: Add input buffer size check for software video encoders

Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
---
 media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'media/libstagefright/codecs/m4v_h263/enc')

diff --git a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
index 5002442..1bef0e9 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
@@ -292,8 +292,18 @@ status_t M4vH263Encoder::read(
     if (OK != mSource->read(&mInputBuffer, options)) {
         LOGE("Failed to read from data source");
         outputBuffer->release();
+        mInputBuffer->release();
+        mInputBuffer = NULL;
         return UNKNOWN_ERROR;
     }
+
+    if (mInputBuffer->size() - ((mVideoWidth * mVideoHeight * 3) >> 1) != 0) {
+        outputBuffer->release();
+        mInputBuffer->release();
+        mInputBuffer = NULL;
+        return UNKNOWN_ERROR;
+    }
+
     int64_t timeUs;
     CHECK(mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs));
     if (mNextModTimeUs > timeUs) {
-- 
cgit v1.1