From 0887fcb0a7dbb526c05b95e379df6be6eeb76e2d Mon Sep 17 00:00:00 2001 From: Mark Finkle Date: Thu, 25 Oct 2012 13:01:13 -0400 Subject: [PATCH] Backout e28405983f87, Likely causing startup crashes (bug 805432) r=me --- mozglue/android/SQLiteBridge.cpp | 9 --------- mozglue/android/SQLiteBridge.h | 1 - 2 files changed, 10 deletions(-) diff --git a/mozglue/android/SQLiteBridge.cpp b/mozglue/android/SQLiteBridge.cpp index c10a6813d646..160fe15abc71 100644 --- a/mozglue/android/SQLiteBridge.cpp +++ b/mozglue/android/SQLiteBridge.cpp @@ -26,7 +26,6 @@ SQLITE_WRAPPER_INT(sqlite3_errmsg) SQLITE_WRAPPER_INT(sqlite3_prepare_v2) SQLITE_WRAPPER_INT(sqlite3_bind_parameter_count) SQLITE_WRAPPER_INT(sqlite3_bind_text) -SQLITE_WRAPPER_INT(sqlite3_bind_null) SQLITE_WRAPPER_INT(sqlite3_step) SQLITE_WRAPPER_INT(sqlite3_column_count) SQLITE_WRAPPER_INT(sqlite3_finalize) @@ -253,14 +252,6 @@ sqliteInternalCall(JNIEnv* jenv, if (numPars > 0) { for (int i = 0; i < numPars; i++) { jobject jObjectParam = jenv->GetObjectArrayElement(jParams, i); - if (jObjectParam == NULL) { - rc = f_sqlite3_bind_null(ppStmt, i + 1); - if (rc != SQLITE_OK) { - asprintf(&errorMsg, "Error binding null query parameter"); - goto error_close; - } - continue; - } // IsInstanceOf or isAssignableFrom? String is final, so IsInstanceOf // should be OK. jboolean isString = jenv->IsInstanceOf(jObjectParam, stringClass); diff --git a/mozglue/android/SQLiteBridge.h b/mozglue/android/SQLiteBridge.h index f2ede820f051..105d8a6045d9 100644 --- a/mozglue/android/SQLiteBridge.h +++ b/mozglue/android/SQLiteBridge.h @@ -18,7 +18,6 @@ SQLITE_WRAPPER(sqlite3_errmsg, const char*, sqlite3*) SQLITE_WRAPPER(sqlite3_prepare_v2, int, sqlite3*, const char*, int, sqlite3_stmt**, const char**) SQLITE_WRAPPER(sqlite3_bind_parameter_count, int, sqlite3_stmt*) SQLITE_WRAPPER(sqlite3_bind_text, int, sqlite3_stmt*, int, const char*, int, void(*)(void*)) -SQLITE_WRAPPER(sqlite3_bind_null, int, sqlite3_stmt*, int) SQLITE_WRAPPER(sqlite3_step, int, sqlite3_stmt*) SQLITE_WRAPPER(sqlite3_column_count, int, sqlite3_stmt*) SQLITE_WRAPPER(sqlite3_finalize, int, sqlite3_stmt*)