Commit 582ae172 authored Feb 22, 2010 by Gloria Wang Committed by Android (Google) Code Review Feb 22, 2010

Merge "Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE, ...

Merge "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."

parents ab9985ed 196863d2

media/jni/android_media_ResampleInputStream.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;