commit 2b18b10710995834e955658aedad3fdb2f994af8
author Elliott Hughes <enh@google.com> Mon May 12 22:30:41 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 12 22:30:41 2014 +0000
tree 47ba26f39bdd496b60027c5f63229236ec4bc1a6
parent ebcc72070499b2ab2d1dee990d6f52814a56600e
parent 20f8aec8976b17ad4d9da6be265594d924f368e1

Merge "Fix use-after-free errors in stdio_test."

tests/stdio_test.cpp

diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp
index 73e9dcd..8f6ee2b 100644
--- a/tests/stdio_test.cpp
+++ b/tests/stdio_test.cpp
@@ -102,14 +102,12 @@
   ASSERT_EQ(getdelim(&buffer, NULL, ' ', fp), -1);
   ASSERT_EQ(EINVAL, errno);
 
-  // The stream can't be closed.
-  fclose(fp);
+  // The underlying fd can't be closed.
+  ASSERT_EQ(0, close(fileno(fp)));
   errno = 0;
   ASSERT_EQ(getdelim(&buffer, &buffer_length, ' ', fp), -1);
-  // glibc sometimes doesn't set errno in this particular case.
-#if defined(__BIONIC__)
   ASSERT_EQ(EBADF, errno);
-#endif // __BIONIC__
+  fclose(fp);
 }
 
 TEST(stdio, getline) {
@@ -171,14 +169,12 @@
   ASSERT_EQ(getline(&buffer, NULL, fp), -1);
   ASSERT_EQ(EINVAL, errno);
 
-  // The stream can't be closed.
-  fclose(fp);
+  // The underlying fd can't be closed.
+  ASSERT_EQ(0, close(fileno(fp)));
   errno = 0;
   ASSERT_EQ(getline(&buffer, &buffer_length, fp), -1);
-  // glibc sometimes doesn't set errno in this particular case.
-#if defined(__BIONIC__)
   ASSERT_EQ(EBADF, errno);
-#endif // __BIONIC__
+  fclose(fp);
 }
 
 TEST(stdio, printf_ssize_t) {