summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Karasangabo <olivier@lineageos.org>2017-11-08 10:43:29 +0100
committerOlivier Karasangabo <olivier@lineageos.org>2017-11-08 10:43:29 +0100
commit53adfb97862de15b0fa43e350db9f8a987b96cf1 (patch)
treef0240a0cc2f0025d3436bfeafad9f3de9f8fd571
parent1cc26e544bc8752bfdab777d0bc5d45c0102430f (diff)
parentdfb291d94ac55ce455c8c6f784e38546a3140b89 (diff)
downloadandroid_hardware_qcom_display-lineage-15.0-caf-8994.tar.gz
android_hardware_qcom_display-lineage-15.0-caf-8994.tar.bz2
android_hardware_qcom_display-lineage-15.0-caf-8994.zip
Merge remote-tracking branch 'caf/LA.BF64.1.2.3_rb1.17' into HEADstaging/lineage-15.1-caf-8994lineage-15.0-caf-8994
-rw-r--r--libmemtrack/kgsl.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/libmemtrack/kgsl.c b/libmemtrack/kgsl.c
index 60377d9dd..29c34775a 100644
--- a/libmemtrack/kgsl.c
+++ b/libmemtrack/kgsl.c
@@ -103,21 +103,28 @@ int kgsl_memtrack_get_memory(pid_t pid, enum memtrack_type type,
continue;
}
- if (size == 0)
+ if (size == 0) {
+ fclose(fp);
return -EINVAL;
+ }
- if (unaccounted_size + size < size)
+ if (unaccounted_size + size < size) {
+ fclose(fp);
return -ERANGE;
+ }
if (type == MEMTRACK_TYPE_GL && strcmp(line_type, "gpumem") == 0) {
if (flags[5] == 'Y') {
- if (accounted_size + size < accounted_size)
+ if (accounted_size + size < accounted_size) {
+ fclose(fp);
return -ERANGE;
+ }
accounted_size += size;
- } else
+ } else {
unaccounted_size += size;
+ }
} else if (type == MEMTRACK_TYPE_GRAPHICS && strcmp(line_type, "ion") == 0) {
if (!is_surfaceflinger || strcmp(line_usage, "egl_image") != 0) {
unaccounted_size += size;