Merge branch 'bugfix/crash-from-finalize' of https://github.com/boxer/android-database-sqlcipher into boxer-bugfix/crash-from-finalize

Author: developernotes

src/net/sqlcipher/database/SQLiteProgram.java

@@ -58,6 +58,11 @@ public abstract class SQLiteProgram extends SQLiteClosable {
     @Deprecated
     protected long nStatement = 0;
 
+    /**
+     * Indicates whether {@link #close()} has been called.
+     */
+    boolean mClosed = false;
+
     /* package */ SQLiteProgram(SQLiteDatabase db, String sql) {
         mDatabase = db;
         mSql = sql.trim();
@@ -142,7 +147,7 @@ private void releaseCompiledSqlIfNotInCache() {
                 // it is in compiled-sql cache. reset its CompiledSql#mInUse flag
                 mCompiledSql.release();
             }
-        } 
+        }
     }
 
     /**
@@ -177,6 +182,9 @@ protected void compile(String sql, boolean forceCompilation) {
      * @param index The 1-based index to the parameter to bind null to
      */
     public void bindNull(int index) {
+        if (mClosed) {
+            throw new IllegalStateException("program already closed");
+        }
         if (!mDatabase.isOpen()) {
             throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
         }
@@ -196,6 +204,9 @@ public void bindNull(int index) {
      * @param value The value to bind
      */
     public void bindLong(int index, long value) {
+        if (mClosed) {
+            throw new IllegalStateException("program already closed");
+        }
         if (!mDatabase.isOpen()) {
             throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
         }
@@ -215,6 +226,9 @@ public void bindLong(int index, long value) {
      * @param value The value to bind
      */
     public void bindDouble(int index, double value) {
+        if (mClosed) {
+            throw new IllegalStateException("program already closed");
+        }
         if (!mDatabase.isOpen()) {
             throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
         }
@@ -237,6 +251,9 @@ public void bindString(int index, String value) {
         if (value == null) {
             throw new IllegalArgumentException("the bind value at index " + index + " is null");
         }
+        if (mClosed) {
+            throw new IllegalStateException("program already closed");
+        }
         if (!mDatabase.isOpen()) {
             throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
         }
@@ -259,6 +276,9 @@ public void bindBlob(int index, byte[] value) {
         if (value == null) {
             throw new IllegalArgumentException("the bind value at index " + index + " is null");
         }
+        if (mClosed) {
+            throw new IllegalStateException("program already closed");
+        }
         if (!mDatabase.isOpen()) {
             throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
         }
@@ -274,6 +294,9 @@ public void bindBlob(int index, byte[] value) {
      * Clears all existing bindings. Unset bindings are treated as NULL.
      */
     public void clearBindings() {
+        if (mClosed) {
+            throw new IllegalStateException("program already closed");
+        }
         if (!mDatabase.isOpen()) {
             throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
         }
@@ -289,6 +312,9 @@ public void clearBindings() {
      * Release this program's resources, making it invalid.
      */
     public void close() {
+        if (mClosed) {
+            return;
+        }
         if (!mDatabase.isOpen()) {
             return;
         }
@@ -298,6 +324,7 @@ public void close() {
         } finally {
             mDatabase.unlock();
         }
+        mClosed = true;
     }
 
     /**

src/net/sqlcipher/database/SQLiteQuery.java

@@ -32,19 +32,17 @@ public class SQLiteQuery extends SQLiteProgram {
 
     /** The index of the unbound OFFSET parameter */
     private int mOffsetIndex;
-    
+
     /** Args to bind on requery */
     private String[] mBindArgs;
     private Object[] mObjectBindArgs;
 
-    private boolean mClosed = false;
-
     /**
      * Create a persistent query object.
-     * 
+     *
      * @param db The database that this query object is associated with
-     * @param query The SQL string for this query. 
-     * @param offsetIndex The 1-based index to the OFFSET parameter, 
+     * @param query The SQL string for this query.
+     * @param offsetIndex The 1-based index to the OFFSET parameter,
      */
     /* package */ SQLiteQuery(SQLiteDatabase db, String query, int offsetIndex, String[] bindArgs) {
         super(db, query);
@@ -105,7 +103,7 @@ public class SQLiteQuery extends SQLiteProgram {
      * Get the column count for the statement. Only valid on query based
      * statements. The database must be locked
      * when calling this method.
-     * 
+     *
      * @return The number of column in the statement's result set.
      */
     /* package */ int columnCountLocked() {
@@ -120,7 +118,7 @@ public class SQLiteQuery extends SQLiteProgram {
     /**
      * Retrieves the column name for the given column index. The database must be locked
      * when calling this method.
-     * 
+     *
      * @param columnIndex the index of the column to get the name for
      * @return The requested column's name
      */
@@ -132,17 +130,11 @@ public class SQLiteQuery extends SQLiteProgram {
             releaseReference();
         }
     }
-    
+
     @Override
     public String toString() {
         return "SQLiteQuery: " + mSql;
     }
-    
-    @Override
-    public void close() {
-        super.close();
-        mClosed = true;
-    }
 
     /**
      * Called by SQLiteCursor when it is requeried.
@@ -167,7 +159,7 @@ public void close() {
                 errMsg.append(" ");
                 IllegalStateException leakProgram = new IllegalStateException(
                         errMsg.toString(), e);
-                throw leakProgram;                
+                throw leakProgram;
             }
         }
     }