Merge pull request 'Fix LMDB use-after-free' (#53) from lda/Cytoplasm:fix-deadlock into master

Reviewed-on: https://git.telodendria.io/Telodendria/Cytoplasm/pulls/53
This commit is contained in:
Jordan Bancino 2024-09-13 20:11:12 -04:00
commit 8987802437

View file

@ -293,6 +293,7 @@ LMDBUnlock(Db *d, DbRef *r)
Stream *stream; Stream *stream;
MDB_val key, val; MDB_val key, val;
bool ret = true; bool ret = true;
DbHint hint = r ? r->hint : 0;
if (!d || !r) if (!d || !r)
{ {
@ -324,7 +325,7 @@ LMDBUnlock(Db *d, DbRef *r)
{ {
free(val.mv_data); free(val.mv_data);
} }
if (ret && r->hint == DB_HINT_WRITE) if (ret && hint == DB_HINT_WRITE)
{ {
pthread_mutex_unlock(&d->lock); pthread_mutex_unlock(&d->lock);
} }