summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2017-09-07 16:39:53 -0500
committerGerrit Code Review2017-09-07 16:39:53 -0500
commit16dd491aac1c69ac4f143792454d9b53e855a8ef (patch)
tree1eac5356c7c5b8c10e8eb778462bac902a65eb67
parent61cb88add2a31fe3177c10967451a37eed9a04f0 (diff)
parent4ff5ff29d26cd028d5d78f5b764dab380fd7c9f4 (diff)
downloadplatform-system-core-16dd491aac1c69ac4f143792454d9b53e855a8ef.tar.gz
platform-system-core-16dd491aac1c69ac4f143792454d9b53e855a8ef.tar.xz
platform-system-core-16dd491aac1c69ac4f143792454d9b53e855a8ef.zip
Merge "libsync: Fix a double-free."android-o-mr1-preview-2android-o-mr1-preview-1
-rw-r--r--libsync/sync.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libsync/sync.c b/libsync/sync.c
index baeccda47..e65765894 100644
--- a/libsync/sync.c
+++ b/libsync/sync.c
@@ -275,7 +275,6 @@ static struct sync_file_info* legacy_fence_info_to_sync_file_info(
275 info = calloc(1, sizeof(struct sync_file_info) + 275 info = calloc(1, sizeof(struct sync_file_info) +
276 num_fences * sizeof(struct sync_fence_info)); 276 num_fences * sizeof(struct sync_fence_info));
277 if (!info) { 277 if (!info) {
278 free(legacy_info);
279 return NULL; 278 return NULL;
280 } 279 }
281 info->sync_fence_info = (__u64)(uintptr_t)(info + 1); 280 info->sync_fence_info = (__u64)(uintptr_t)(info + 1);