Merge "Fix potential NPE in SQLiteProgram."

1 files changed, 9 insertions, 9 deletions

diff --git a/core/java/android/database/sqlite/SQLiteProgram.java b/core/java/android/database/sqlite/SQLiteProgram.java
index 94a23cb..e9b06c6 100644
--- a/core/java/android/database/sqlite/SQLiteProgram.java
+++ b/core/java/android/database/sqlite/SQLiteProgram.java
@@ -64,20 +64,20 @@ public abstract class SQLiteProgram extends SQLiteClosable {
                 break;
         }
 
+        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;
         }
-
-        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.");
-            }
-            System.arraycopy(bindArgs, 0, mBindArgs, 0, bindArgs.length);
-        }
     }
 
     final SQLiteDatabase getDatabase() {