Fix a potential race between creating and destroying mmaped strings

[bluesky.git] / bluesky / log.c

diff --git a/bluesky/log.c b/bluesky/log.c
index 03f4fb3..984cf16 100644 (file)
--- a/bluesky/log.c
+++ b/bluesky/log.c
@@ -550,6 +550,8 @@ static void cloudlog_partial_fetch_complete(BlueSkyStoreAsync *async,
             g_warning("Unable to open and write to cache file %s: %m",
                       cachefile->filename);
         }
+
+        bluesky_rangeset_free(items);
     } else {
         g_print("Error fetching from cloud, retrying...\n");
         cloudlog_partial_fetch_start(cachefile, async->start, async->len);
@@ -749,7 +751,7 @@ void bluesky_mmap_unref(BlueSkyCacheFile *mmap)
 
     if (g_atomic_int_dec_and_test(&mmap->mapcount)) {
         g_mutex_lock(mmap->lock);
-        if (mmap->addr != NULL) {
+        if (mmap->addr != NULL && g_atomic_int_get(&mmap->mapcount) == 0) {
             if (bluesky_verbose)
                 g_print("Unmapped log segment %d...\n", mmap->log_seq);
             munmap((void *)mmap->addr, mmap->len);