fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / src / common / time.cpp

diff --git a/src/common/time.cpp b/src/common/time.cpp
index 4a76dfac4874a9d8c8f7685a53ee6b7a3d62320e..5b2460ca6910797294e6b695428b9a80c510e656 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -292,8 +292,6 @@ wxLongLong wxGetUTCTimeUSec()
 // Get local time as milliseconds since 00:00:00, Jan 1st 1970
 wxLongLong wxGetUTCTimeMillis()
 {
 // Get local time as milliseconds since 00:00:00, Jan 1st 1970
 wxLongLong wxGetUTCTimeMillis()
 {

-    wxLongLong val = MILLISECONDS_PER_SECOND;
-

     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 #if defined(__WINDOWS__)
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 #if defined(__WINDOWS__)


@@ -306,7 +304,10 @@ wxLongLong wxGetUTCTimeMillis()
     t /= 10000;
     t -= wxLL(11644473600000); // Unix - Windows epochs difference in ms.
     return t;
     t /= 10000;
     t -= wxLL(11644473600000); // Unix - Windows epochs difference in ms.
     return t;

-#elif defined(HAVE_GETTIMEOFDAY)
+#else // !__WINDOWS__
+    wxLongLong val = MILLISECONDS_PER_SECOND;
+
+#if defined(HAVE_GETTIMEOFDAY)

     struct timeval tp;
     if ( wxGetTimeOfDay(&tp) != -1 )
     {
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp) != -1 )
     {


@@ -342,6 +343,8 @@ wxLongLong wxGetUTCTimeMillis()
     val *= wxGetUTCTime();
     return val;
 #endif // time functions
     val *= wxGetUTCTime();
     return val;
 #endif // time functions

+
+#endif // __WINDOWS__/!__WINDOWS__

 }
 
 wxLongLong wxGetLocalTimeMillis()
 }
 
 wxLongLong wxGetLocalTimeMillis()