commit c1ebc31561e895ae014f70279ca408e0086e6abe
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 06 15:52:22 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 06 15:52:22 2017 +0000
tree 953acd0b328b76c2fe710279dfba806dde884052
parent 37f72a46465a13be23f2c0a7ad736b2f15219f19
parent 63fa30305eb2e194704a3ce54fa7da8400151394

Merge "Mark libgrallocusage as vendor_available"

liblog/local_logger.c

diff --git a/liblog/local_logger.c b/liblog/local_logger.c
index 522867d..563cb3f 100644
--- a/liblog/local_logger.c
+++ b/liblog/local_logger.c
@@ -222,6 +222,7 @@
       log->last[logId] = node->prev;
     }
     list_remove(node);
+    LOG_ALWAYS_FATAL_IF(node == log->last[logId], "corrupted list");
     free(e);
   }
   /* add entry to list */

liblog/logprint.c

diff --git a/liblog/logprint.c b/liblog/logprint.c
index b62f8b4..a2839bf 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -250,6 +250,7 @@
   while (!list_empty(&convertHead)) {
     struct listnode* node = list_head(&convertHead);
     list_remove(node);
+    LOG_ALWAYS_FATAL_IF(node == list_head(&convertHead), "corrupted list");
     free(node);
   }
 }

libutils/SystemClock.cpp

diff --git a/libutils/SystemClock.cpp b/libutils/SystemClock.cpp
index 28fc351..73ec1be 100644
--- a/libutils/SystemClock.cpp
+++ b/libutils/SystemClock.cpp
@@ -23,9 +23,9 @@
 
 #include <utils/SystemClock.h>
 
-#include <sys/time.h>
 #include <string.h>
 #include <errno.h>
+#include <time.h>
 
 #include <cutils/compiler.h>