Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bootanimation stack overflow"

Browse Source
This commit is contained in:
Treehugger Robot
2019-07-23 02:13:28 +00:00
committed by Gerrit Code Review
parent e691553aa6 35a8a11697
commit 935d8032c8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmds/bootanimation/BootAnimation.cpp
View File

@@ -63,6 +63,10 @@
#include "BootAnimation.h" #include "BootAnimation.h"
#define ANIM_PATH_MAX 255
#define STR(x) #x
#define STRTO(x) STR(x)
namespace android { namespace android {
static const char OEM_BOOTANIMATION_FILE[] = "/oem/media/bootanimation.zip"; static const char OEM_BOOTANIMATION_FILE[] = "/oem/media/bootanimation.zip";
@@ -94,7 +98,7 @@ static constexpr size_t FONT_NUM_ROWS = FONT_NUM_CHARS / FONT_NUM_COLS;
static const int TEXT_CENTER_VALUE = INT_MAX; static const int TEXT_CENTER_VALUE = INT_MAX;
static const int TEXT_MISSING_VALUE = INT_MIN; static const int TEXT_MISSING_VALUE = INT_MIN;
static const char EXIT_PROP_NAME[] = "service.bootanim.exit"; static const char EXIT_PROP_NAME[] = "service.bootanim.exit";
static const int ANIM_ENTRY_NAME_MAX = 256; static const int ANIM_ENTRY_NAME_MAX = ANIM_PATH_MAX + 1;
static constexpr size_t TEXT_POS_LEN_MAX = 16; static constexpr size_t TEXT_POS_LEN_MAX = 16;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -658,7 +662,7 @@ bool BootAnimation::parseAnimationDesc(Animation& animation)
animation.width = width; animation.width = width;
animation.height = height; animation.height = height;
animation.fps = fps; animation.fps = fps;
} else if (sscanf(l, " %c %d %d %s #%6s %16s %16s", } else if (sscanf(l, " %c %d %d %" STRTO(ANIM_PATH_MAX) "s #%6s %16s %16s",
&pathType, &count, &pause, path, color, clockPos1, clockPos2) >= 4) { &pathType, &count, &pause, path, color, clockPos1, clockPos2) >= 4) {
//ALOGD("> type=%c, count=%d, pause=%d, path=%s, color=%s, clockPos1=%s, clockPos2=%s", //ALOGD("> type=%c, count=%d, pause=%d, path=%s, color=%s, clockPos1=%s, clockPos2=%s",
// pathType, count, pause, path, color, clockPos1, clockPos2); // pathType, count, pause, path, color, clockPos1, clockPos2);