Commit efc7751c authored by samli@chromium.org's avatar samli@chromium.org

Devtools Animations: Fix invalid memory access crash

BUG=497167

Review URL: https://codereview.chromium.org/1165393002

git-svn-id: svn://svn.chromium.org/blink/trunk@197985 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 6b8732e5
...@@ -119,11 +119,11 @@ static PassRefPtr<TypeBuilder::Animation::KeyframeStyle> buildObjectForStringKey ...@@ -119,11 +119,11 @@ static PassRefPtr<TypeBuilder::Animation::KeyframeStyle> buildObjectForStringKey
return keyframeObject.release(); return keyframeObject.release();
} }
static PassRefPtr<TypeBuilder::Animation::KeyframesRule> buildObjectForAnimationKeyframes(const KeyframeEffect* animation) static PassRefPtr<TypeBuilder::Animation::KeyframesRule> buildObjectForAnimationKeyframes(const KeyframeEffect* effect)
{ {
if (!animation->model()->isKeyframeEffectModel()) if (!effect || !effect->model() || !effect->model()->isKeyframeEffectModel())
return nullptr; return nullptr;
const KeyframeEffectModelBase* model = toKeyframeEffectModelBase(animation->model()); const KeyframeEffectModelBase* model = toKeyframeEffectModelBase(effect->model());
WillBeHeapVector<RefPtrWillBeMember<Keyframe> > normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(model->getFrames()); WillBeHeapVector<RefPtrWillBeMember<Keyframe> > normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(model->getFrames());
RefPtr<TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle> > keyframes = TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>::create(); RefPtr<TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle> > keyframes = TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>::create();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment