mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

filesrc: Don't abort on _get_osfhandle()

Browse source 
_get_osfhandle() expects valid fd and CRT will abort program
if given paramerter is invalid. The fd can be invalidated
in various way, file was deleted by other process after
we open a file. To avoid it, our own exception
handler must be installed so that _get_osfhandle() can return
INVALID_HANDLE_VALUE if fd is invalid.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6877>
This commit is contained in:
Seungha Yang 2024-05-17 23:03:19 +09:00 committed by GStreamer Marge Bot
parent 87ec3bd399
commit e56d3d3e07
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gstreamer/meson.build
View file

@ -277,6 +277,12 @@ foreach f : check_functions
endif endif
endforeach endforeach
if host_system == 'windows'
if cc.has_function('_set_thread_local_invalid_parameter_handler', prefix : '#include <stdlib.h>')
cdata.set('HAVE__SET_THREAD_LOCAL_INVALID_PARAMETER_HANDLER', 1)
endif
endif
if cc.has_function('localtime_r', prefix : '#include<time.h>') if cc.has_function('localtime_r', prefix : '#include<time.h>')
cdata.set('HAVE_LOCALTIME_R', 1) cdata.set('HAVE_LOCALTIME_R', 1)
# Needed by libcheck # Needed by libcheck

36
subprojects/gstreamer/plugins/elements/gstfilesrc.c
View file

@ -57,6 +57,9 @@
/* Prevent stat.h from defining the stat* functions as /* Prevent stat.h from defining the stat* functions as
* _stat*, since we're explicitly overriding that */ * _stat*, since we're explicitly overriding that */
#undef _INC_STAT_INL #undef _INC_STAT_INL
#ifdef HAVE__SET_THREAD_LOCAL_INVALID_PARAMETER_HANDLER
#include <stdlib.h>
#endif
#endif #endif
#include <fcntl.h> #include <fcntl.h>
@ -403,6 +406,35 @@ gst_file_src_is_seekable (GstBaseSrc * basesrc)
return src->seekable; return src->seekable;
} }
#ifdef G_OS_WIN32
#ifdef HAVE__SET_THREAD_LOCAL_INVALID_PARAMETER_HANDLER
static void __cdecl
gst_file_src_win32_iph (wchar_t const *exp, wchar_t const *func,
wchar_t const *file, unsigned int line, uintptr_t reserved)
{
/* Do nothing */
}
static HANDLE
gst_file_src_win32_get_osfhandle (int fd)
{
HANDLE handle;
_invalid_parameter_handler old_iph =
_set_thread_local_invalid_parameter_handler (gst_file_src_win32_iph);
handle = (HANDLE) _get_osfhandle (fd);
_set_thread_local_invalid_parameter_handler (old_iph);
return handle;
}
#else /* HAVE__SET_THREAD_LOCAL_INVALID_PARAMETER_HANDLER */
static HANDLE
gst_file_src_win32_get_osfhandle (int fd)
{
return (HANDLE) _get_osfhandle (fd);
}
#endif /* HAVE__SET_THREAD_LOCAL_INVALID_PARAMETER_HANDLER */
#endif /* G_OS_WIN32 */
static gboolean static gboolean
gst_file_src_get_size (GstBaseSrc * basesrc, guint64 * size) gst_file_src_get_size (GstBaseSrc * basesrc, guint64 * size)
{ {
@ -417,7 +449,7 @@ gst_file_src_get_size (GstBaseSrc * basesrc, guint64 * size)
} }
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
{ {
HANDLE h = (HANDLE) _get_osfhandle (src->fd); HANDLE h = gst_file_src_win32_get_osfhandle (src->fd);
LARGE_INTEGER file_size; LARGE_INTEGER file_size;
if (h == INVALID_HANDLE_VALUE) if (h == INVALID_HANDLE_VALUE)
@ -472,7 +504,7 @@ gst_file_src_start (GstBaseSrc * basesrc)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
{ {
HANDLE h = (HANDLE) _get_osfhandle (src->fd); HANDLE h = gst_file_src_win32_get_osfhandle (src->fd);
FILE_STANDARD_INFO file_info; FILE_STANDARD_INFO file_info;
if (h == INVALID_HANDLE_VALUE) if (h == INVALID_HANDLE_VALUE)