mutexes in rekey

sjlombardo · sjlombardo · commit c45622d14d24 · 2010-10-03T08:56:16.000-04:00
diff --git a/src/crypto.c b/src/crypto.c
@@ -546,6 +546,8 @@ int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey) {
         ctx->read_ctx->key_sz = ctx->read_ctx->iv_sz =  ctx->read_ctx->pass_sz = 0;
       }
 
+      sqlite3_mutex_enter(db->mutex);
+
       if(ctx->read_ctx->iv_sz != ctx->write_ctx->iv_sz) {
         char *error;
         CODEC_TRACE(("sqlite3_rekey: updating page size for iv_sz change from %d to %d\n", ctx->read_ctx->iv_sz, ctx->write_ctx->iv_sz));
@@ -591,6 +593,7 @@ int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey) {
       }
 
       ctx->mode_rekey = 0;
+      sqlite3_mutex_leave(db->mutex);
     }
     return SQLITE_OK;
   }

Original file line number	Diff line number	Diff line change
`@@ -546,6 +546,8 @@ int sqlite3_rekey(sqlite3 db, const void pKey, int nKey) {`
`546`	`546`	`ctx->read_ctx->key_sz = ctx->read_ctx->iv_sz = ctx->read_ctx->pass_sz = 0;`
`547`	`547`	`}`
`548`	`548`
	`549`	`+ sqlite3_mutex_enter(db->mutex);`
	`550`	`+`
`549`	`551`	`if(ctx->read_ctx->iv_sz != ctx->write_ctx->iv_sz) {`
`550`	`552`	`char *error;`
`551`	`553`	`CODEC_TRACE(("sqlite3_rekey: updating page size for iv_sz change from %d to %d\n", ctx->read_ctx->iv_sz, ctx->write_ctx->iv_sz));`
`@@ -591,6 +593,7 @@ int sqlite3_rekey(sqlite3 db, const void pKey, int nKey) {`
`591`	`593`	`}`
`592`	`594`
`593`	`595`	`ctx->mode_rekey = 0;`
	`596`	`+ sqlite3_mutex_leave(db->mutex);`
`594`	`597`	`}`
`595`	`598`	`return SQLITE_OK;`
`596`	`599`	`}`