commit 7b33488e124bbe2a9fcfa6cd7a78726bc932ac8b
author Narayan Kamath <narayan@google.com> Tue Feb 02 09:36:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 02 09:36:55 2016 +0000
tree 8ca3b376e1ecb56094b786e6f9a32a61f2c6aca6
parent 8793ae3ddccf8c82c5a6d7004e5563effa760183
parent 21b2b7306e7d0612cdcb90eaa8102b6a7fa3f130

Merge "Alarm: add missing closedir after opendir when searching for RTC"
am: 21b2b7306e

* commit '21b2b7306e7d0612cdcb90eaa8102b6a7fa3f130':
  Alarm: add missing closedir after opendir when searching for RTC

services/core/jni/com_android_server_AlarmManagerService.cpp

diff --git a/services/core/jni/com_android_server_AlarmManagerService.cpp b/services/core/jni/com_android_server_AlarmManagerService.cpp
index 5cbb277..246ab0d 100644
--- a/services/core/jni/com_android_server_AlarmManagerService.cpp
+++ b/services/core/jni/com_android_server_AlarmManagerService.cpp
@@ -40,6 +40,8 @@
 #include <linux/android_alarm.h>
 #include <linux/rtc.h>
 
+#include <memory>
+
 namespace android {
 
 static const size_t N_ANDROID_TIMERFDS = ANDROID_ALARM_TYPE_COUNT + 1;
@@ -323,14 +325,14 @@
 
 static int wall_clock_rtc()
 {
-    DIR *dir = opendir(rtc_sysfs);
-    if (!dir) {
+    std::unique_ptr<DIR, int(*)(DIR*)> dir(opendir(rtc_sysfs), closedir);
+    if (!dir.get()) {
         ALOGE("failed to open %s: %s", rtc_sysfs, strerror(errno));
         return -1;
     }
 
     struct dirent *dirent;
-    while (errno = 0, dirent = readdir(dir)) {
+    while (errno = 0, dirent = readdir(dir.get())) {
         unsigned int rtc_id;
         int matched = sscanf(dirent->d_name, "rtc%u", &rtc_id);