Merge "Fix potential NPE in SQLiteProgram." (ed6aa3da) · Commits · e / os / android_frameworks_base

core/java/android/database/sqlite/SQLiteProgram.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -64,20 +64,20 @@ public abstract class SQLiteProgram extends SQLiteClosable {
		break;
		}

		if (mNumParameters != 0) {
		mBindArgs = new Object[mNumParameters];
		} else {
		mBindArgs = null;
		}

		if (bindArgs != null) {
		if (bindArgs.length > mNumParameters) {
		if (bindArgs != null && bindArgs.length > mNumParameters) {
		throw new IllegalArgumentException("Too many bind arguments. "
		+ bindArgs.length + " arguments were provided but the statement needs "
		+ mNumParameters + " arguments.");
		}

		if (mNumParameters != 0) {
		mBindArgs = new Object[mNumParameters];
		if (bindArgs != null) {
		System.arraycopy(bindArgs, 0, mBindArgs, 0, bindArgs.length);
		}
		} else {
		mBindArgs = null;
		}
		}

		final SQLiteDatabase getDatabase() {