Changeset 220444 in webkit

Timestamp:

Aug 9, 2017 12:00:34 AM (7 years ago)

Author:

zandobersek@gmail.com

Message:

[Soup] Incorrect conversion in msToSoupDate()
​https://bugs.webkit.org/show_bug.cgi?id=175320

Reviewed by Carlos Garcia Campos.

Original patch by VaL Doroshchuk.

• platform/network/soup/NetworkStorageSessionSoup.cpp:

(WebCore::msToSoupDate): monthFromDayInYear() returns a value in the [0,11] range,
while soup_date_new() expects a month value in the [1,12] range. The return value
must be thus incremented by one to match that expectation.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/NetworkStorageSessionSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-09  Zan Dobersek  <zdobersek@igalia.com>
+
+        [Soup] Incorrect conversion in msToSoupDate()
+        https://bugs.webkit.org/show_bug.cgi?id=175320
+
+        Reviewed by Carlos Garcia Campos.
+
+        Original patch by VaL Doroshchuk.
+
+        * platform/network/soup/NetworkStorageSessionSoup.cpp:
+        (WebCore::msToSoupDate): monthFromDayInYear() returns a value in the [0,11] range,
+        while soup_date_new() expects a month value in the [1,12] range. The return value
+        must be thus incremented by one to match that expectation.
+
 2017-08-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp

@@ -295 +295 @@
     int dayOfYear = dayInYear(ms, year);
     bool leapYear = isLeapYear(year);
-    return soup_date_new(year, monthFromDayInYear(dayOfYear, leapYear), dayInMonthFromDayInYear(dayOfYear, leapYear), msToHours(ms), msToMinutes(ms), static_cast<int>(ms / 1000) % 60);
+
+    // monthFromDayInYear() returns a value in the [0,11] range, while soup_date_new() expects
+    // a value in the [1,12] range, meaning we have to manually adjust the month value.
+    return soup_date_new(year, monthFromDayInYear(dayOfYear, leapYear) + 1, dayInMonthFromDayInYear(dayOfYear, leapYear), msToHours(ms), msToMinutes(ms), static_cast<int>(ms / 1000) % 60);
 }