mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

shmpipe: Fix crash when sp_close_shm is called with self == NULL.

Browse source 
If sp_open_shm errors out trying to open a shm area, it would crash
when trying to free the area. The RETURN_ERROR macro calls
sp_shm_area_dec with self == NULL. sp_shm_area_dec calls
sp_shm_close, with self == NULL, which it then tries to access a
parameter of without checking. This patch checks to make sure
self != NULL before accessing that parameter.
This commit is contained in:
Olivier Crête 2010-04-07 19:05:37 -04:00
parent e8b4310aa6
commit b9decbb056
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/shm/shmpipe.c
View file

@ -297,26 +297,27 @@ sp_open_shm (char *path, int id, int writer, mode_t perms, size_t size)
static void static void
sp_close_shm (ShmPipe * self, ShmArea * area) sp_close_shm (ShmPipe * self, ShmArea * area)
{ {
ShmArea *item = NULL;
ShmArea *prev_item = NULL;
assert (area->use_count == 0); assert (area->use_count == 0);
if (area->allocspace) if (area->allocspace)
shm_alloc_space_free (area->allocspace); shm_alloc_space_free (area->allocspace);
if (self != NULL) {
ShmArea *item = NULL;
ShmArea *prev_item = NULL;
for (item = self->shm_area; item; item = item->next) { for (item = self->shm_area; item; item = item->next) {
if (item == area) { if (item == area) {
if (prev_item) if (prev_item)
prev_item->next = item->next; prev_item->next = item->next;
else else
self->shm_area = item->next; self->shm_area = item->next;
break; break;
}
prev_item = item;
} }
prev_item = item; assert (item);
} }
assert (item);
if (area->shm_area != MAP_FAILED) if (area->shm_area != MAP_FAILED)
munmap (area->shm_area, area->shm_area_len); munmap (area->shm_area, area->shm_area_len);