openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-23 09:59:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix file descriptor leaks in sf_close_fd() function

Browse Source 
Closes: https://github.com/erikd/libsndfile/pull/566
This commit is contained in:
evpobr 2020-08-26 15:36:41 +05:00 committed by Erik de Castro Lopo
parent 25b5476a47
commit b329ba64ab
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sndfile.c
View File

@ -27,6 +27,12 @@
#include "sfendian.h"
#include "common.h"
#if HAVE_UNISTD_H
#include <unistd.h>
#elif defined _WIN32
#include <io.h>
#endif
#define SNDFILE_MAGICK 0x1234C0DE
#ifdef __APPLE__
@ -356,14 +362,21 @@ sf_open (const char *path, int mode, SF_INFO *sfinfo)
SNDFILE*
sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc)
{ SF_PRIVATE *psf ;
SNDFILE *result ;
if ((SF_CONTAINER (sfinfo->format)) == SF_FORMAT_SD2)
{ sf_errno = SFE_SD2_FD_DISALLOWED ;
if (close_desc)
close (fd) ;
return NULL ;
} ;
if ((psf = psf_allocate ()) == NULL)
{ sf_errno = SFE_MALLOC_FAILED ;
if (close_desc)
close (fd) ;
return NULL ;
} ;
@ -375,10 +388,11 @@ sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc)
psf->is_pipe = psf_is_pipe (psf) ;
psf->fileoffset = psf_ftell (psf) ;
if (! close_desc)
psf->file.do_not_close_descriptor = SF_TRUE ;
result = psf_open_file (psf, sfinfo) ;
if (result != NULL && ! close_desc)
psf->file.do_not_close_descriptor = SF_TRUE ;
return psf_open_file (psf, sfinfo) ;
return result ;
} /* sf_open_fd */
SNDFILE*