tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix minui cleanup path on error."

Browse source
This commit is contained in:
Elliott Hughes 2016-02-20 00:30:19 +00:00 committed by Gerrit Code Review
commit fa9af7dae6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
minui/resources.cpp
View file

@ -283,7 +283,7 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps,
goto exit; goto exit;
} }
surface = reinterpret_cast<GRSurface**>(malloc(*frames * sizeof(GRSurface*))); surface = reinterpret_cast<GRSurface**>(calloc(*frames, sizeof(GRSurface*)));
if (surface == NULL) { if (surface == NULL) {
result = -8; result = -8;
goto exit; goto exit;
@ -318,7 +318,7 @@ exit:
if (result < 0) { if (result < 0) {
if (surface) { if (surface) {
for (int i = 0; i < *frames; ++i) { for (int i = 0; i < *frames; ++i) {
if (surface[i]) free(surface[i]); free(surface[i]);
} }
free(surface); free(surface);
} }
@ -421,7 +421,7 @@ int res_create_localized_alpha_surface(const char* name,
png_read_row(png_ptr, row.data(), NULL); png_read_row(png_ptr, row.data(), NULL);
int w = (row[1] << 8) | row[0]; int w = (row[1] << 8) | row[0];
int h = (row[3] << 8) | row[2]; int h = (row[3] << 8) | row[2];
int len = row[4]; __unused int len = row[4];
char* loc = reinterpret_cast<char*>(&row[5]); char* loc = reinterpret_cast<char*>(&row[5]);
if (y+1+h >= height || matches_locale(loc, locale)) { if (y+1+h >= height || matches_locale(loc, locale)) {