aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2019-04-30 19:43:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-30 19:43:17 +0000
commit8dc7da51b537e301bf6ee05e7fb56e97df23a7d1 (patch)
tree39038ec25d6803c3c26a1a784da80ccb3c17e177
parent62b214dc87ce76055a21a6f5b9b4fdf37bea1952 (diff)
parent1f2ea324639f04eeee39f2b2457bc232d967d72c (diff)
downloadandroid_bionic-8dc7da51b537e301bf6ee05e7fb56e97df23a7d1.tar.gz
android_bionic-8dc7da51b537e301bf6ee05e7fb56e97df23a7d1.tar.bz2
android_bionic-8dc7da51b537e301bf6ee05e7fb56e97df23a7d1.zip
Merge "__cxa_finalize: skip fflush call on dlclose" into qt-dev
-rw-r--r--libc/stdlib/atexit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libc/stdlib/atexit.c b/libc/stdlib/atexit.c
index bd6ac3db0..692e0c0fc 100644
--- a/libc/stdlib/atexit.c
+++ b/libc/stdlib/atexit.c
@@ -186,7 +186,10 @@ restart:
}
_ATEXIT_UNLOCK();
- fflush(NULL);
+ /* If called via exit(), flush output of all open files. */
+ if (dso == NULL) {
+ fflush(NULL);
+ }
/* BEGIN android-changed: call __unregister_atfork if dso is not null */
if (dso != NULL) {