Make shm_fd a local variable and close it when we need it no longer, thus

fixing a file descriptor leak.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29609 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar
2009-09-01 12:12:45 +00:00
parent 0f7fe32725
commit 7b7302b096
+3 -1
View File
@@ -57,7 +57,6 @@ NSAutoreleasePool *autoreleasepool;
OSType pixelFormat;
//shared memory
int shm_fd;
BOOL shared_buffer = false;
#define DEFAULT_BUFFER_NAME "mplayerosx"
static char *buffer_name;
@@ -173,6 +172,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
}
else
{
int shm_fd;
mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] writing output to a shared buffer "
"named \"%s\"\n",buffer_name);
@@ -190,12 +190,14 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
{
mp_msg(MSGT_VO, MSGL_FATAL,
"[vo_corevideo] failed to size shared memory, possibly already in use. Error: %s\n", strerror(errno));
close(shm_fd);
shm_unlink(buffer_name);
return 1;
}
image_data = mmap(NULL, image_width*image_height*image_bytes,
PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);
close(shm_fd);
if (image_data == MAP_FAILED)
{