journal: do not leak mmaps on OOM

After a section of memory is succesfully allocated, some of the following
actions can still fail due to lack of memory. In this case -ENOMEM is
returned without actually freeing the already mapped memory.
Found with coverity. Fixes: CID#1237762
This commit is contained in:
Philippe De Swert
2014-09-11 17:27:44 +02:00
committed by David Herrmann
parent 21978bc3c9
commit b67ddc7bbe
+7 -3
View File
@@ -496,15 +496,15 @@ static int add_mmap(
c = context_add(m, context);
if (!c)
return -ENOMEM;
goto outofmem;
f = fd_add(m, fd);
if (!f)
return -ENOMEM;
goto outofmem;
w = window_add(m);
if (!w)
return -ENOMEM;
goto outofmem;
w->keep_always = keep_always;
w->ptr = d;
@@ -522,6 +522,10 @@ static int add_mmap(
if (ret)
*ret = (uint8_t*) w->ptr + (offset - w->offset);
return 1;
outofmem:
munmap(d, wsize);
return -ENOMEM;
}
int mmap_cache_get(