Browse Source

Merge pull request #85428 from jsjtxietian/prevent-nullptr-crash-in-AnimationMixer--restore

Prevent a crash when calling `AnimationMixer::restore` with an invalid resource
Rémi Verschelde 1 year ago
parent
commit
6b21a185e2
1 changed files with 1 additions and 0 deletions
  1. 1 0
      scene/animation/animation_mixer.cpp

+ 1 - 0
scene/animation/animation_mixer.cpp

@@ -1985,6 +1985,7 @@ void AnimationMixer::reset() {
 }
 }
 
 
 void AnimationMixer::restore(const Ref<AnimatedValuesBackup> &p_backup) {
 void AnimationMixer::restore(const Ref<AnimatedValuesBackup> &p_backup) {
+	ERR_FAIL_COND(p_backup.is_null());
 	track_cache = p_backup->get_data();
 	track_cache = p_backup->get_data();
 	_blend_apply();
 	_blend_apply();
 	track_cache = HashMap<NodePath, AnimationMixer::TrackCache *>();
 	track_cache = HashMap<NodePath, AnimationMixer::TrackCache *>();