summaryrefslogtreecommitdiffstats
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-10-29 13:12:55 -0700
committerElliott Hughes <enh@google.com>2013-10-29 13:12:55 -0700
commitc367d48c55e5a3fa0df14fd62889e4bb6b63cb01 (patch)
treecc6a7e56e5c5e74d66603c8170660fd99c52bff3 /cmds/bootanimation/BootAnimation.cpp
parentb4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48 (diff)
downloadframeworks_base-c367d48c55e5a3fa0df14fd62889e4bb6b63cb01.zip
frameworks_base-c367d48c55e5a3fa0df14fd62889e4bb6b63cb01.tar.gz
frameworks_base-c367d48c55e5a3fa0df14fd62889e4bb6b63cb01.tar.bz2
Fix a variety of small publicly-reported bugs.
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp. https://code.google.com/p/android/issues/detail?id=61556 Missing fclose in core/jni/android_os_Debug.cpp. https://code.google.com/p/android/issues/detail?id=61546 Bad loop guards in core/jni/android_util_Process.cpp. https://code.google.com/p/android/issues/detail?id=61557 Assignment to wrong variable in libs/androidfw/AssetManager.cpp. https://code.google.com/p/android/issues/detail?id=61560 Missing delete[]s in libs/androidfw/ObbFile.cpp. https://code.google.com/p/android/issues/detail?id=61549 Leaks on error in tools/aapt/Images.cpp. https://code.google.com/p/android/issues/detail?id=61552 Two missing fclose calls in tools/aapt/Resource.cpp. https://code.google.com/p/android/issues/detail?id=61553 Missing fclose in tools/aidl/aidl.cpp. https://code.google.com/p/android/issues/detail?id=61554 Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
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 8511735..cc49cf3 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -159,8 +159,8 @@ status_t BootAnimation::initTexture(void* buffer, size_t len)
SkBitmap bitmap;
SkMemoryStream stream(buffer, len);
SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
- codec->setDitherImage(false);
if (codec) {
+ codec->setDitherImage(false);
codec->decode(&stream, &bitmap,
SkBitmap::kARGB_8888_Config,
SkImageDecoder::kDecodePixels_Mode);
@@ -270,7 +270,7 @@ status_t BootAnimation::readyToRun() {
mAndroidAnimation = true;
- // If the device has encryption turned on or is in process
+ // If the device has encryption turned on or is in process
// of being encrypted we show the encrypted boot animation.
char decrypt[PROPERTY_VALUE_MAX];
property_get("vold.decrypt", decrypt, "");