From 3f9e647ae8c4928a8fc4de0d704119245f58ff45 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Mar 2010 19:04:17 +0000 Subject: [PATCH] * checkInterrupt() shouldn't be called from a destructor. --- src/libstore/local-store.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 95e775ce7..8a690b913 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -47,6 +47,7 @@ SQLite::~SQLite() void SQLiteStmt::create(sqlite3 * db, const string & s) { + checkInterrupt(); assert(!stmt); if (sqlite3_prepare_v2(db, s.c_str(), -1, &stmt, 0) != SQLITE_OK) throw SQLiteError(db, "creating statement"); @@ -56,7 +57,6 @@ void SQLiteStmt::create(sqlite3 * db, const string & s) void SQLiteStmt::reset() { - checkInterrupt(); assert(stmt); if (sqlite3_reset(stmt) != SQLITE_OK) throw SQLiteError(db, "resetting statement");