commit b6ed09d323b8204fa7577a43f8b0b5f6db052054
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 17 16:33:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 17 16:33:19 2021 +0000
tree 270510d610a6d3081fbe67f068779f1ebebf1f06
parent 433293dbc9b772957ac067c04c23d4746b0f4bb9
parent 13a761032f251f3b7b29df208320bc322addd95c

Merge "scandir: remove dead code."

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() {