Changeset 233574 in webkit

Timestamp:

Jul 6, 2018, 3:10:50 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[Crash] Illegal use of uninitialized std::optional value in WebCore::AnimationBase::updateStateMachine
​https://bugs.webkit.org/show_bug.cgi?id=187382

Patch by Frederic Wang <​fwang@igalia.com> on 2018-07-06
Reviewed by Carlos Garcia Campos.

WebCore::AnimationBase::updateStateMachine has two potential places where the use of an
uninitialized std:optional value is possible and one of them is hit when using Google drive.
Since that old animation code is going to be removed soon, we just quickly patch this issue
via value_or() so that we can restore the ASSERT added in bug 186536.

No new tests, code is going to be removed soon.

• page/animation/AnimationBase.cpp:

(WebCore::AnimationBase::updateStateMachine): Use value_or(0) to avoid potential crashes.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/animation/AnimationBase.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-06  Frederic Wang  <fwang@igalia.com>
+
+        [Crash] Illegal use of uninitialized std::optional value in WebCore::AnimationBase::updateStateMachine
+        https://bugs.webkit.org/show_bug.cgi?id=187382
+
+        Reviewed by Carlos Garcia Campos.
+
+        WebCore::AnimationBase::updateStateMachine has two potential places where the use of an
+        uninitialized std:optional value is possible and one of them is hit when using Google drive.
+        Since that old animation code is going to be removed soon, we just quickly patch this issue
+        via value_or() so that we can restore the ASSERT added in bug 186536.
+
+        No new tests, code is going to be removed soon.
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::updateStateMachine): Use value_or(0) to avoid potential crashes.
+
 2018-07-06  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/page/animation/AnimationBase.cpp

@@ -380 +380 @@
             ASSERT(paused());
             // Update the times
-            m_startTime = m_startTime.value() + beginAnimationUpdateTime() - m_pauseTime.value_or(0);
+            m_startTime = m_startTime.value_or(0) + beginAnimationUpdateTime() - m_pauseTime.value_or(0);
             m_pauseTime = std::nullopt;
 
@@ -412 +412 @@
                 // Update the times
                 if (m_animationState == AnimationState::PausedRun)
-                    m_startTime = m_startTime.value() + beginAnimationUpdateTime() - m_pauseTime.value_or(0);
+                    m_startTime = m_startTime.value_or(0) + beginAnimationUpdateTime() - m_pauseTime.value_or(0);
                 else
                     m_startTime = 0;