summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-07-25 00:00:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-07-25 00:00:38 +0000
commit9c5f04f9c333a541b6549ef7d6c4f18bf858e104 (patch)
treeadd2beb1adbbff2baa937efa4dd7e7b65249ba8f /cmds/bootanimation/BootAnimation.cpp
parent602542f8e0a5bfda88fe36fb07d84dd1318df0e2 (diff)
parent1a8a213b77a9fbddd170d865e82f6cc590725d92 (diff)
Merge "Fix use-after-free: release the animation after we're done with it"
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
-rw-r--r--cmds/bootanimation/BootAnimation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 8ffe5bf59315..048fb43bfa3d 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -859,12 +859,12 @@ bool BootAnimation::movie()
mTimeCheckThread = nullptr;
}
- releaseAnimation(animation);
-
if (clockFontInitialized) {
glDeleteTextures(1, &animation->clockFont.texture.name);
}
+ releaseAnimation(animation);
+
return false;
}