| commit | b966c33e09da9220e47f2c5acbb10f67babd48b3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 17 17:14:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 17 17:14:26 2021 +0000 |
| tree | 270510d610a6d3081fbe67f068779f1ebebf1f06 | |
| parent | e75355e03a665d5e0920a91599a81635f8b7a6ab [diff] | |
| parent | b6ed09d323b8204fa7577a43f8b0b5f6db052054 [diff] |
Merge "scandir: remove dead code." am: b6ed09d323 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1641339 Change-Id: Iae147f53bc4915bc5b6c2c145daaf5c8a26956d8
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() {