commit 07fd724aa45837cf7c4e1512a8b840aee17c42b9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 17 19:39:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 17 19:39:40 2021 +0000
tree 270510d610a6d3081fbe67f068779f1ebebf1f06
parent ccee30fa843a0662ab69bf02ced531b79aaa9b27
parent b244ac1d47f14ee03949bd24675209bce37253f5

Merge "scandir: remove dead code." am: b6ed09d323 am: b966c33e09 am: b244ac1d47

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1641339

Change-Id: I443e0d69add2a5e612179a5da056657722cdb032

libc/bionic/scandir.cpp

diff --git a/libc/bionic/scandir.cpp b/libc/bionic/scandir.cpp
index 6a7e368..f528286 100644
--- a/libc/bionic/scandir.cpp
+++ b/libc/bionic/scandir.cpp
@@ -16,8 +16,9 @@
 
 #include <dirent.h>
 
-#include <fcntl.h>
+#include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -32,10 +33,8 @@
   }
 
   ~ScandirResult() {
-    while (size_ > 0) {
-      free(names_[--size_]);
-    }
-    free(names_);
+    // We always call release(), so this can't happen.
+    if (names_ != nullptr) __assert(__FILE__, __LINE__, "missing call to release()");
   }
 
   size_t size() {