зеркало из https://github.com/mozilla/gecko-dev.git
Backout e28405983f87, Likely causing startup crashes (bug 805432) r=me
This commit is contained in:
Родитель
5830e46894
Коммит
0887fcb0a7
|
@ -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);
|
||||
|
|
|
@ -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*)
|
||||
|
|
Загрузка…
Ссылка в новой задаче