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

clock: Fix 32 bit assertions in GST_TIME_TO_TIMEVAL and GST_TIME_TO_TIMESPEC

Browse source 
On various 32 bit systems, time_t is actually 64 bits while long is
still only 32 bits. The macro would wrongly trigger its assertion in
this case if a value with more than 68 years worth of seconds is
converted.

Examples are various newer 32 bit platforms and old ones that are
compiled with -D_TIME_BITS=64.

Also statically assert that time_t is either 32 or 64 bits. Other values
might need adjustments in the macro.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6924>
This commit is contained in:
Sebastian Dröge 2024-05-17 11:03:51 +03:00 committed by GStreamer Marge Bot
parent 85c838d881
commit 14713c9964
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
subprojects/gstreamer/gst/gstclock.h
View file

@ -175,16 +175,20 @@ typedef gpointer GstClockID;
* *
* Converts a #GstClockTime to a GTimeVal * Converts a #GstClockTime to a GTimeVal
* *
* > on 32-bit systems, a timeval has a range of only 2^32 - 1 seconds, * > on many 32-bit systems, a timeval has a range of only 2^32 - 1 seconds,
* > which is about 68 years. Expect trouble if you want to schedule stuff * > which is about 68 years. Expect trouble if you want to schedule stuff
* > in your pipeline for 2038. * > in your pipeline for 2038. This macro asserts that this case does not
* > happen.
*/ */
#define GST_TIME_TO_TIMEVAL(t,tv) \ #define GST_TIME_TO_TIMEVAL(t,tv) \
G_STMT_START { \ G_STMT_START { \
G_STATIC_ASSERT (sizeof ((tv).tv_sec) == 4 || sizeof ((tv).tv_sec) == 8); \
if (sizeof ((tv).tv_sec) == 4) { \
g_assert ("Value of time " #t " is out of timeval's range" && \ g_assert ("Value of time " #t " is out of timeval's range" && \
((t) / GST_SECOND) < G_MAXLONG); \ ((t) / GST_SECOND) < G_MAXINT32); \
(tv).tv_sec = (glong) (((GstClockTime) (t)) / GST_SECOND); \ } \
(tv).tv_usec = (glong) ((((GstClockTime) (t)) - \ (tv).tv_sec = (((GstClockTime) (t)) / GST_SECOND); \
(tv).tv_usec = ((((GstClockTime) (t)) - \
((GstClockTime) (tv).tv_sec) * GST_SECOND) \ ((GstClockTime) (tv).tv_sec) * GST_SECOND) \
/ GST_USECOND); \ / GST_USECOND); \
} G_STMT_END } G_STMT_END
@ -205,10 +209,13 @@ G_STMT_START { \
*/ */
#define GST_TIME_TO_TIMESPEC(t,ts) \ #define GST_TIME_TO_TIMESPEC(t,ts) \
G_STMT_START { \ G_STMT_START { \
G_STATIC_ASSERT (sizeof ((ts).tv_sec) == 4 || sizeof ((ts).tv_sec) == 8); \
if (sizeof ((ts).tv_sec) == 4) { \
g_assert ("Value of time " #t " is out of timespec's range" && \ g_assert ("Value of time " #t " is out of timespec's range" && \
((t) / GST_SECOND) < G_MAXLONG); \ ((t) / GST_SECOND) < G_MAXINT32); \
(ts).tv_sec = (glong) ((t) / GST_SECOND); \ } \
(ts).tv_nsec = (glong) (((t) - (ts).tv_sec * GST_SECOND) / GST_NSECOND); \ (ts).tv_sec = ((t) / GST_SECOND); \
(ts).tv_nsec = (((t) - (ts).tv_sec * GST_SECOND) / GST_NSECOND); \
} G_STMT_END } G_STMT_END
/* timestamp debugging macros */ /* timestamp debugging macros */