shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #382 from mstorsjo/avoid-overflow-in-timespec

Avoid overflow when populating a struct timespec

--- a/codec/common/WelsThreadLib.cpp

+++ b/codec/common/WelsThreadLib.cpp

@@ -319,8 +319,9 @@

     gettimeofday (&tv, 0);

-    ts.tv_sec = tv.tv_sec + dwMilliseconds / 1000;

-    ts.tv_nsec = tv.tv_usec * 1000 + (dwMilliseconds % 1000) * 1000000;

+    ts.tv_nsec = tv.tv_usec * 1000 + dwMilliseconds * 1000000;

+    ts.tv_sec = tv.tv_sec + ts.tv_nsec / 1000000000;

+    ts.tv_nsec %= 1000000000;

     return sem_timedwait (event, &ts);

 #endif//__APPLE__