summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-02-20 01:40:46 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-02-20 01:40:46 +0100
commitaf38cd9330d2ee2c96a807e328beb008cd10d789 (patch)
tree1c8e169886b080126498ffa96d0195d73a03bddb
parentMerge commit 'ce46828e08281dc507d4e40ba9e8b770bc21cf0b' into HEAD (diff)
parentMerge "Fix minui cleanup path on error." (diff)
downloadandroid_bootable_recovery-af38cd9330d2ee2c96a807e328beb008cd10d789.tar
android_bootable_recovery-af38cd9330d2ee2c96a807e328beb008cd10d789.tar.gz
android_bootable_recovery-af38cd9330d2ee2c96a807e328beb008cd10d789.tar.bz2
android_bootable_recovery-af38cd9330d2ee2c96a807e328beb008cd10d789.tar.lz
android_bootable_recovery-af38cd9330d2ee2c96a807e328beb008cd10d789.tar.xz
android_bootable_recovery-af38cd9330d2ee2c96a807e328beb008cd10d789.tar.zst
android_bootable_recovery-af38cd9330d2ee2c96a807e328beb008cd10d789.zip
Diffstat (limited to '')
-rw-r--r--minui/resources.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/minui/resources.cpp b/minui/resources.cpp
index fdbe554fe..8489d60ef 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -283,7 +283,7 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps,
goto exit;
}
- surface = reinterpret_cast<GRSurface**>(malloc(*frames * sizeof(GRSurface*)));
+ surface = reinterpret_cast<GRSurface**>(calloc(*frames, sizeof(GRSurface*)));
if (surface == NULL) {
result = -8;
goto exit;
@@ -318,7 +318,7 @@ exit:
if (result < 0) {
if (surface) {
for (int i = 0; i < *frames; ++i) {
- if (surface[i]) free(surface[i]);
+ free(surface[i]);
}
free(surface);
}
@@ -421,7 +421,7 @@ int res_create_localized_alpha_surface(const char* name,
png_read_row(png_ptr, row.data(), NULL);
int w = (row[1] << 8) | row[0];
int h = (row[3] << 8) | row[2];
- int len = row[4];
+ __unused int len = row[4];
char* loc = reinterpret_cast<char*>(&row[5]);
if (y+1+h >= height || matches_locale(loc, locale)) {