bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use Chromium code for cookie date validity check (fixes issue #2927)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-06-11 12:37:08 -04:00
parent 430895168d
commit 571911730a
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libcef/common/time_impl.cc
View File

@@ -6,6 +6,23 @@
#include "base/macros.h"
#if defined(OS_WIN)
#include <limits>
namespace {
// From MSDN, FILETIME "Contains a 64-bit value representing the number of
// 100-nanosecond intervals since January 1, 1601 (UTC)." This value must
// be less than 0x8000000000000000. Otherwise, the function
// FileTimeToSystemTime fails.
// From base/time/time_win.cc:
bool CanConvertToFileTime(int64_t us) {
return us >= 0 && us <= (std::numeric_limits<int64_t>::max() / 10);
}
} // namespace
#endif // defined(OS_WIN)
void cef_time_to_basetime(const cef_time_t& cef_time, base::Time& time) {
base::Time::Exploded exploded;
exploded.year = cef_time.year;
@@ -22,11 +39,7 @@ void cef_time_to_basetime(const cef_time_t& cef_time, base::Time& time) {
void cef_time_from_basetime(const base::Time& time, cef_time_t& cef_time) {
#if defined(OS_WIN)
int64_t t = time.ToDeltaSinceWindowsEpoch().InMicroseconds();
// From MSDN, FILETIME "Contains a 64-bit value representing the number of
// 100-nanosecond intervals since January 1, 1601 (UTC)." This value must
// be less than 0x8000000000000000. Otherwise, the function
// FileTimeToSystemTime fails.
if (t < 0 || static_cast<uint64_t>(t * 10) >= 0x8000000000000000)
if (!CanConvertToFileTime(t))
return;
#endif