commit fae95cc08ed2af84497a934e4d375d3cec58817a
author Elliott Hughes <enh@google.com> Fri Oct 26 15:27:20 2012 -0700
committer Elliott Hughes <enh@google.com> Fri Oct 26 15:27:20 2012 -0700
tree 6d7ca4cee0514fc340cf95fcdc1e2ad8ced2da62
parent e206e7c9f1c58c77ca51f6e80483c94f6c779e4e

Fix dalvik's use of readdir_r(3).

Change-Id: Ic2c9b88b2b3204b4c02f4838766dc4d9ebad06a2

vm/Thread.cpp

diff --git a/vm/Thread.cpp b/vm/Thread.cpp
index 7f6f583..2676ca4 100644
--- a/vm/Thread.cpp
+++ b/vm/Thread.cpp
@@ -3488,13 +3488,12 @@
     snprintf(path, sizeof(path), "/proc/%d/task", getpid());
 
     DIR* d = opendir(path);
-    if (d) {
-        dirent de;
-        dirent* result;
+    if (d != NULL) {
+        dirent* entry = NULL;
         bool first = true;
-        while (!readdir_r(d, &de, &result) && result) {
+        while ((entry = readdir(d)) != NULL) {
             char* end;
-            pid_t tid = strtol(de.d_name, &end, 10);
+            pid_t tid = strtol(entry->d_name, &end, 10);
             if (!*end && !isDalvikThread(tid)) {
                 if (first) {
                     dvmPrintDebugMessage(target, "NATIVE THREADS:\n");