summaryrefslogtreecommitdiffstats
path: root/media/jni/android_media_ResampleInputStream.cpp
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-02-22 15:56:21 -0800
committerGloria Wang <gwang@google.com>2010-02-22 15:59:03 -0800
commit196863d27407e23c69debdd061df58ce8fe76c20 (patch)
treeda98749f52e5ca39bb3ff282ca2df5c660aa0b4f /media/jni/android_media_ResampleInputStream.cpp
parentbc92766cfd8d91f390799a96d5fb8c4aa4d07448 (diff)
downloadframeworks_base-196863d27407e23c69debdd061df58ce8fe76c20.zip
frameworks_base-196863d27407e23c69debdd061df58ce8fe76c20.tar.gz
frameworks_base-196863d27407e23c69debdd061df58ce8fe76c20.tar.bz2
Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE,
but when it calls GetByteArrayRegion, it multiplies it by 2 which defeats the "// safety first" check at the beginning.
Diffstat (limited to 'media/jni/android_media_ResampleInputStream.cpp')
-rw-r--r--media/jni/android_media_ResampleInputStream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_ResampleInputStream.cpp b/media/jni/android_media_ResampleInputStream.cpp
index f248557..d965d9a 100644
--- a/media/jni/android_media_ResampleInputStream.cpp
+++ b/media/jni/android_media_ResampleInputStream.cpp
@@ -92,7 +92,7 @@ static void android_media_ResampleInputStream_fir21(JNIEnv *env, jclass clazz,
jint jNpoints) {
// safety first!
- if (nFir21 + jNpoints > BUF_SIZE) {
+ if (nFir21 + jNpoints * 2 > BUF_SIZE) {
throwException(env, "java/lang/IllegalArgumentException",
"FIR+data too long %d", nFir21 + jNpoints);
return;