drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix potential NPE in SQLiteProgram."

Browse Source
This commit is contained in:
Jeff Brown
2012-03-12 15:53:33 -07:00
committed by Android (Google) Code Review
parent 4d367c54d1 b2679481b5
commit ed6aa3da03
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/database/sqlite/SQLiteProgram.java
View File

@ -64,19 +64,19 @@ public abstract class SQLiteProgram extends SQLiteClosable {
break;
}
if (mNumParameters != 0) {
mBindArgs = new Object[mNumParameters];
} else {
mBindArgs = null;
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 (bindArgs != null) {
if (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);
}
System.arraycopy(bindArgs, 0, mBindArgs, 0, bindArgs.length);
} else {
mBindArgs = null;
}
}