Merge "Disable %n in printf and vfwprintf."
diff --git a/libc/Android.mk b/libc/Android.mk
index ff21d6a..4b81f7e 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -223,11 +223,9 @@
upstream-freebsd/lib/libc/stdio/fclose.c \
upstream-freebsd/lib/libc/stdio/flags.c \
upstream-freebsd/lib/libc/stdio/fopen.c \
- upstream-freebsd/lib/libc/stdio/fwrite.c \
upstream-freebsd/lib/libc/stdio/makebuf.c \
upstream-freebsd/lib/libc/stdio/mktemp.c \
upstream-freebsd/lib/libc/stdio/setvbuf.c \
- upstream-freebsd/lib/libc/stdio/wsetup.c \
upstream-freebsd/lib/libc/stdlib/abs.c \
upstream-freebsd/lib/libc/stdlib/getopt_long.c \
upstream-freebsd/lib/libc/stdlib/imaxabs.c \
@@ -388,6 +386,7 @@
upstream-openbsd/lib/libc/stdio/fwalk.c \
upstream-openbsd/lib/libc/stdio/fwide.c \
upstream-openbsd/lib/libc/stdio/fwprintf.c \
+ upstream-openbsd/lib/libc/stdio/fwrite.c \
upstream-openbsd/lib/libc/stdio/fwscanf.c \
upstream-openbsd/lib/libc/stdio/getc.c \
upstream-openbsd/lib/libc/stdio/getchar.c \
@@ -436,6 +435,7 @@
upstream-openbsd/lib/libc/stdio/wbuf.c \
upstream-openbsd/lib/libc/stdio/wprintf.c \
upstream-openbsd/lib/libc/stdio/wscanf.c \
+ upstream-openbsd/lib/libc/stdio/wsetup.c \
upstream-openbsd/lib/libc/stdlib/atoi.c \
upstream-openbsd/lib/libc/stdlib/atol.c \
upstream-openbsd/lib/libc/stdlib/atoll.c \
diff --git a/libc/arch-common/bionic/atexit.h b/libc/arch-common/bionic/atexit.h
index 16ae7aa..90aa030 100644
--- a/libc/arch-common/bionic/atexit.h
+++ b/libc/arch-common/bionic/atexit.h
@@ -26,11 +26,20 @@
* SUCH DAMAGE.
*/
+#include <stddef.h>
+
extern void* __dso_handle;
extern int __cxa_atexit(void (*)(void*), void*, void*);
__attribute__ ((visibility ("hidden")))
+void __atexit_handler_wrapper(void* func) {
+ if (func != NULL) {
+ (*(void (*)(void))func)();
+ }
+}
+
+__attribute__ ((visibility ("hidden")))
int atexit(void (*func)(void)) {
- return (__cxa_atexit((void (*)(void*)) func, (void*) 0, &__dso_handle));
+ return (__cxa_atexit(&__atexit_handler_wrapper, func, &__dso_handle));
}
diff --git a/libc/bionic/wctype.cpp b/libc/bionic/wctype.cpp
index 33cacd1..673402d 100644
--- a/libc/bionic/wctype.cpp
+++ b/libc/bionic/wctype.cpp
@@ -31,7 +31,7 @@
#include <string.h>
#include <wchar.h>
-// TODO: these only work for the ASCII range; rewrite to dlsym icu4c?
+// TODO: these only work for the ASCII range; rewrite to dlsym icu4c? http://b/14499654
int iswalnum(wint_t wc) { return isalnum(wc); }
int iswalpha(wint_t wc) { return isalpha(wc); }
@@ -48,18 +48,18 @@
int iswctype(wint_t wc, wctype_t char_class) {
switch (char_class) {
- case WC_TYPE_ALNUM: return isalnum(wc);
- case WC_TYPE_ALPHA: return isalpha(wc);
- case WC_TYPE_BLANK: return isblank(wc);
- case WC_TYPE_CNTRL: return iscntrl(wc);
- case WC_TYPE_DIGIT: return isdigit(wc);
- case WC_TYPE_GRAPH: return isgraph(wc);
- case WC_TYPE_LOWER: return islower(wc);
- case WC_TYPE_PRINT: return isprint(wc);
- case WC_TYPE_PUNCT: return ispunct(wc);
- case WC_TYPE_SPACE: return isspace(wc);
- case WC_TYPE_UPPER: return isupper(wc);
- case WC_TYPE_XDIGIT: return isxdigit(wc);
+ case WC_TYPE_ALNUM: return iswalnum(wc);
+ case WC_TYPE_ALPHA: return iswalpha(wc);
+ case WC_TYPE_BLANK: return iswblank(wc);
+ case WC_TYPE_CNTRL: return iswcntrl(wc);
+ case WC_TYPE_DIGIT: return iswdigit(wc);
+ case WC_TYPE_GRAPH: return iswgraph(wc);
+ case WC_TYPE_LOWER: return iswlower(wc);
+ case WC_TYPE_PRINT: return iswprint(wc);
+ case WC_TYPE_PUNCT: return iswpunct(wc);
+ case WC_TYPE_SPACE: return iswspace(wc);
+ case WC_TYPE_UPPER: return iswupper(wc);
+ case WC_TYPE_XDIGIT: return iswxdigit(wc);
default: return 0;
}
}
diff --git a/libc/stdlib/atexit.c b/libc/stdlib/atexit.c
index 4e14434..b051e22 100644
--- a/libc/stdlib/atexit.c
+++ b/libc/stdlib/atexit.c
@@ -41,11 +41,52 @@
struct atexit *__atexit;
/*
+ * TODO: Read this before upstreaming:
+ *
+ * As of Apr 2014 there is a bug regaring function type detection logic in
+ * Free/Open/NetBSD implementations of __cxa_finalize().
+ *
+ * What it is about:
+ * First of all there are two kind of atexit handlers:
+ * 1) void handler(void) - this is the regular type
+ * available for to user via atexit(.) function call.
+ *
+ * 2) void internal_handler(void*) - this is the type
+ * __cxa_atexit() function expects. This handler is used
+ * by C++ compiler to register static destructor calls.
+ * Note that calling this function as the handler of type (1)
+ * results in incorrect this pointer in static d-tors.
+ *
+ * What is wrong with BSD implementations:
+ *
+ * They use dso argument to identify the handler type. The problem
+ * with it is dso is also used to identify the handlers associated
+ * with particular dynamic library and allow __cxa_finalize to call correct
+ * set of functions on dlclose(). And it cannot identify both.
+ *
+ * What is correct way to identify function type?
+ *
+ * Consider this:
+ * 1. __cxa_finalize and __cxa_atexit are part of libc and do not have access to hidden
+ * &__dso_handle.
+ * 2. __cxa_atexit has only 3 arguments: function pointer, function argument, dso.
+ * none of them can be reliably used to pass information about handler type.
+ * 3. following http://www.codesourcery.com/cxx-abi/abi.html#dso-dtor (3.3.5.3 - B)
+ * translation of user atexit -> __cxa_atexit(f, NULL, NULL) results in crashes
+ * on exit() after dlclose() of a library with an atexit() call.
+ *
+ * One way to resolve this is to always call second form of handler, which will
+ * result in storing unused argument in register/stack depending on architecture
+ * and should not present any problems.
+ *
+ * Another way is to make them dso-local in one way or the other.
+ */
+
+/*
* Function pointers are stored in a linked list of pages. The list
* is initially empty, and pages are allocated on demand. The first
* function pointer in the first allocated page (the last one in
* the linked list) was reserved for the cleanup function.
- * TODO: switch to the regular FreeBSD/NetBSD atexit implementation.
*
* Outside the following functions, all pages are mprotect()'ed
* to prevent unintentional/malicious corruption.
@@ -94,7 +135,7 @@
__atexit_invalid = 0;
}
fnp = &p->fns[p->ind++];
- fnp->fn_ptr.cxa_func = func;
+ fnp->cxa_func = func;
fnp->fn_arg = arg;
fnp->fn_dso = dso;
if (mprotect(p, pgsize, PROT_READ))
@@ -113,57 +154,59 @@
void
__cxa_finalize(void *dso)
{
- struct atexit *p, *q;
+ struct atexit *p, *q, *original_atexit;
struct atexit_fn fn;
- int n, pgsize = getpagesize();
+ int n, pgsize = getpagesize(), original_ind;
static int call_depth;
if (__atexit_invalid)
return;
-
_ATEXIT_LOCK();
call_depth++;
- for (p = __atexit; p != NULL; p = p->next) {
- for (n = p->ind; --n >= 0;) {
- if (p->fns[n].fn_ptr.cxa_func == NULL)
- continue; /* already called */
- if (dso != NULL && dso != p->fns[n].fn_dso)
- continue; /* wrong DSO */
-
+ p = original_atexit = __atexit;
+ n = original_ind = p != NULL ? p->ind : 0;
+ while (p != NULL) {
+ if (p->fns[n].cxa_func != NULL /* not called */
+ && (dso == NULL || dso == p->fns[n].fn_dso)) { /* correct DSO */
/*
* Mark handler as having been already called to avoid
* dupes and loops, then call the appropriate function.
*/
fn = p->fns[n];
if (mprotect(p, pgsize, PROT_READ | PROT_WRITE) == 0) {
- p->fns[n].fn_ptr.cxa_func = NULL;
+ p->fns[n].cxa_func = NULL;
mprotect(p, pgsize, PROT_READ);
}
+
_ATEXIT_UNLOCK();
-#if ANDROID
- /* it looks like we should always call the function
- * with an argument, even if dso is not NULL. Otherwise
- * static destructors will not be called properly on
- * the ARM.
- */
- (*fn.fn_ptr.cxa_func)(fn.fn_arg);
-#else /* !ANDROID */
- if (dso != NULL)
- (*fn.fn_ptr.cxa_func)(fn.fn_arg);
- else
- (*fn.fn_ptr.std_func)();
-#endif /* !ANDROID */
+ (*fn.cxa_func)(fn.fn_arg);
_ATEXIT_LOCK();
+ // check for new atexit handlers
+ if ((__atexit->ind != original_ind) || (__atexit != original_atexit)) {
+ // need to restart now to preserve correct
+ // call order - LIFO
+ p = original_atexit = __atexit;
+ n = original_ind = p->ind;
+ continue;
+ }
+ }
+ if (n == 0) {
+ p = p->next;
+ n = p != NULL ? p->ind : 0;
+ } else {
+ --n;
}
}
+ --call_depth;
+
/*
* If called via exit(), unmap the pages since we have now run
* all the handlers. We defer this until calldepth == 0 so that
* we don't unmap things prematurely if called recursively.
*/
- if (dso == NULL && --call_depth == 0) {
+ if (dso == NULL && call_depth == 0) {
for (p = __atexit; p != NULL; ) {
q = p;
p = p->next;
diff --git a/libc/stdlib/atexit.h b/libc/stdlib/atexit.h
index 4b3e5ab..2e88ad6 100644
--- a/libc/stdlib/atexit.h
+++ b/libc/stdlib/atexit.h
@@ -37,10 +37,7 @@
int ind; /* next index in this table */
int max; /* max entries >= ATEXIT_SIZE */
struct atexit_fn {
- union {
- void (*std_func)(void);
- void (*cxa_func)(void *);
- } fn_ptr;
+ void (*cxa_func)(void *);
void *fn_arg; /* argument for CXA callback */
void *fn_dso; /* shared module handle */
} fns[1]; /* the table itself */
diff --git a/libc/stdio/fvwrite.h b/libc/upstream-openbsd/lib/libc/stdio/fvwrite.h
similarity index 93%
rename from libc/stdio/fvwrite.h
rename to libc/upstream-openbsd/lib/libc/stdio/fvwrite.h
index 96f65de..d3a309b 100644
--- a/libc/stdio/fvwrite.h
+++ b/libc/upstream-openbsd/lib/libc/stdio/fvwrite.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fvwrite.h,v 1.5 2003/06/02 20:18:37 millert Exp $ */
+/* $OpenBSD: fvwrite.h,v 1.6 2013/11/12 07:04:35 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -36,7 +36,7 @@
* I/O descriptors for __sfvwrite().
*/
struct __siov {
- const void *iov_base;
+ void *iov_base;
size_t iov_len;
};
struct __suio {
@@ -46,3 +46,4 @@
};
extern int __sfvwrite(FILE *, struct __suio *);
+wint_t __fputwc_unlock(wchar_t wc, FILE *fp);
diff --git a/libc/upstream-freebsd/lib/libc/stdio/fwrite.c b/libc/upstream-openbsd/lib/libc/stdio/fwrite.c
similarity index 74%
rename from libc/upstream-freebsd/lib/libc/stdio/fwrite.c
rename to libc/upstream-openbsd/lib/libc/stdio/fwrite.c
index 707d362..f0a17bf 100644
--- a/libc/upstream-freebsd/lib/libc/stdio/fwrite.c
+++ b/libc/upstream-openbsd/lib/libc/stdio/fwrite.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fwrite.c,v 1.11 2014/05/01 16:40:36 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,67 +31,58 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fwrite.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdint.h>
#include <stdio.h>
-#include "un-namespace.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
#include "local.h"
#include "fvwrite.h"
-#include "libc_private.h"
+
+#define MUL_NO_OVERFLOW (1UL << (sizeof(size_t) * 4))
/*
* Write `count' objects (each size `size') from memory to the given file.
* Return the number of whole objects written.
*/
size_t
-fwrite(const void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
+fwrite(const void *buf, size_t size, size_t count, FILE *fp)
{
size_t n;
struct __suio uio;
struct __siov iov;
+ int ret;
/*
- * ANSI and SUSv2 require a return value of 0 if size or count are 0.
+ * Extension: Catch integer overflow
*/
- if ((count == 0) || (size == 0))
- return (0);
-
- /*
- * Check for integer overflow. As an optimization, first check that
- * at least one of {count, size} is at least 2^16, since if both
- * values are less than that, their product can't possible overflow
- * (size_t is always at least 32 bits on FreeBSD).
- */
- if (((count | size) > 0xFFFF) &&
- (count > SIZE_MAX / size)) {
- errno = EINVAL;
+ if ((size >= MUL_NO_OVERFLOW || count >= MUL_NO_OVERFLOW) &&
+ size > 0 && SIZE_MAX / size < count) {
+ errno = EOVERFLOW;
fp->_flags |= __SERR;
return (0);
}
- n = count * size;
+ /*
+ * ANSI and SUSv2 require a return value of 0 if size or count are 0.
+ */
+ if ((n = count * size) == 0)
+ return (0);
iov.iov_base = (void *)buf;
uio.uio_resid = iov.iov_len = n;
uio.uio_iov = &iov;
uio.uio_iovcnt = 1;
- FLOCKFILE(fp);
- ORIENT(fp, -1);
/*
* The usual case is success (__sfvwrite returns 0);
* skip the divide if this happens, since divides are
* generally slow and since this occurs whenever size==0.
*/
- if (__sfvwrite(fp, &uio) != 0)
- count = (n - uio.uio_resid) / size;
+ FLOCKFILE(fp);
+ _SET_ORIENTATION(fp, -1);
+ ret = __sfvwrite(fp, &uio);
FUNLOCKFILE(fp);
- return (count);
+ if (ret == 0)
+ return (count);
+ return ((n - uio.uio_resid) / size);
}
diff --git a/libc/upstream-freebsd/lib/libc/stdio/wsetup.c b/libc/upstream-openbsd/lib/libc/stdio/wsetup.c
similarity index 87%
rename from libc/upstream-freebsd/lib/libc/stdio/wsetup.c
rename to libc/upstream-openbsd/lib/libc/stdio/wsetup.c
index 70f8247..0834223 100644
--- a/libc/upstream-freebsd/lib/libc/stdio/wsetup.c
+++ b/libc/upstream-openbsd/lib/libc/stdio/wsetup.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wsetup.c,v 1.7 2005/08/08 08:05:36 espie Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,13 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wsetup.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include "local.h"
@@ -44,7 +38,7 @@
/*
* Various output routines call wsetup to be sure it is safe to write,
* because either _flags does not include __SWR, or _buf is NULL.
- * _wsetup returns 0 if OK to write; otherwise, it returns EOF and sets errno.
+ * _wsetup returns 0 if OK to write, nonzero otherwise.
*/
int
__swsetup(FILE *fp)
@@ -57,11 +51,8 @@
* If we are not writing, we had better be reading and writing.
*/
if ((fp->_flags & __SWR) == 0) {
- if ((fp->_flags & __SRW) == 0) {
- errno = EBADF;
- fp->_flags |= __SERR;
+ if ((fp->_flags & __SRW) == 0)
return (EOF);
- }
if (fp->_flags & __SRD) {
/* clobber any ungetc data */
if (HASUB(fp))
@@ -76,8 +67,11 @@
/*
* Make a buffer if necessary, then set _w.
*/
- if (fp->_bf._base == NULL)
+ if (fp->_bf._base == NULL) {
+ if ((fp->_flags & (__SSTR | __SALC)) == __SSTR)
+ return (EOF);
__smakebuf(fp);
+ }
if (fp->_flags & __SLBF) {
/*
* It is line buffered, so make _lbfsize be -_bufsize
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 4d8563e..08231ea 100755
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -680,6 +680,9 @@
return fd;
}
// ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now.
+#if defined(__LP64__)
+ return -1;
+#endif
}
// Otherwise we try LD_LIBRARY_PATH first, and fall back to the built-in well known paths.
diff --git a/tests/Android.mk b/tests/Android.mk
index fccf3f1..4e82591 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -210,6 +210,18 @@
include $(LOCAL_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
+# This library used by atexit tests
+# -----------------------------------------------------------------------------
+
+libtest_atexit_src_files := \
+ atexit_testlib.cpp
+
+module := libtest_atexit
+build_type := target
+build_target := SHARED_LIBRARY
+include $(LOCAL_PATH)/Android.build.mk
+
+# -----------------------------------------------------------------------------
# Tests for the device using bionic's .so. Run with:
# adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
# -----------------------------------------------------------------------------
@@ -217,6 +229,7 @@
libBionicTests \
bionic-unit-tests_src_files := \
+ atexit_test.cpp \
dlext_test.cpp \
dlfcn_test.cpp \
@@ -263,11 +276,14 @@
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
+bionic-unit-tests-glibc_src_files := \
+ atexit_test.cpp \
+
bionic-unit-tests-glibc_whole_static_libraries := \
libBionicStandardTests \
bionic-unit-tests-glibc_ldlibs := \
- -lrt \
+ -lrt -ldl \
module := bionic-unit-tests-glibc
module_tag := optional
diff --git a/tests/atexit_test.cpp b/tests/atexit_test.cpp
new file mode 100644
index 0000000..e52235d
--- /dev/null
+++ b/tests/atexit_test.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include <dlfcn.h>
+#include <libgen.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#include <string>
+
+TEST(atexit, combined_test) {
+ std::string atexit_call_sequence;
+ bool valid_this_in_static_dtor = false;
+ void* handle = dlopen("libtest_atexit.so", RTLD_NOW);
+ ASSERT_TRUE(handle != NULL);
+
+ void* sym = dlsym(handle, "register_atexit");
+ ASSERT_TRUE(sym != NULL);
+ reinterpret_cast<void (*)(std::string*, bool*)>(sym)(&atexit_call_sequence, &valid_this_in_static_dtor);
+
+ ASSERT_EQ(0, dlclose(handle));
+ // this test verifies atexit call from atexit handler. as well as the order of calls
+ ASSERT_EQ("Humpty Dumpty sat on a wall", atexit_call_sequence);
+ ASSERT_TRUE(valid_this_in_static_dtor);
+}
+
+// TODO: test for static dtor calls from from exit(.) -> __cxa_finalize(NULL)
+
diff --git a/tests/atexit_testlib.cpp b/tests/atexit_testlib.cpp
new file mode 100644
index 0000000..36393e7
--- /dev/null
+++ b/tests/atexit_testlib.cpp
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <string>
+
+// use external control number from main test
+static std::string* atexit_sequence = NULL;
+static bool* atexit_valid_this_in_static_dtor = NULL;
+
+class AtExitStaticClass;
+
+static const AtExitStaticClass* valid_this = NULL;
+
+static class AtExitStaticClass {
+public:
+ AtExitStaticClass() { valid_this = this; }
+ ~AtExitStaticClass() {
+ if (atexit_valid_this_in_static_dtor) {
+ *atexit_valid_this_in_static_dtor = (valid_this == this);
+ }
+ }
+} staticObj;
+
+// 4
+static void atexit_handler_from_atexit_from_atexit2() {
+ *atexit_sequence += " on";
+}
+
+// 3
+static void atexit_handler_from_atexit_from_atexit1() {
+ *atexit_sequence += " sat";
+}
+
+// 2
+static void atexit_handler_from_atexit() {
+ *atexit_sequence += " Dumpty";
+ // register 2 others
+ atexit(atexit_handler_from_atexit_from_atexit2);
+ atexit(atexit_handler_from_atexit_from_atexit1);
+}
+
+// 1
+static void atexit_handler_with_atexit() {
+ *atexit_sequence += "Humpty";
+ atexit(atexit_handler_from_atexit);
+}
+
+// last
+static void atexit_handler_regular() {
+ *atexit_sequence += " a wall";
+}
+
+extern "C" void register_atexit(std::string* sequence, bool* valid_this_in_static_dtor) {
+ atexit_sequence = sequence;
+ atexit_valid_this_in_static_dtor = valid_this_in_static_dtor;
+ atexit(atexit_handler_regular);
+ atexit(atexit_handler_with_atexit);
+ atexit(NULL);
+}
+
diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp
index 44ad76d..73e9dcd 100644
--- a/tests/stdio_test.cpp
+++ b/tests/stdio_test.cpp
@@ -441,3 +441,45 @@
ASSERT_EQ(123, i1);
ASSERT_DOUBLE_EQ(1.23, d1);
}
+
+TEST(stdio, cantwrite_EBADF) {
+ // If we open a file read-only...
+ FILE* fp = fopen("/proc/version", "r");
+
+ // ...all attempts to write to that file should return failure.
+
+ // They should also set errno to EBADF. This isn't POSIX, but it's traditional.
+ // glibc gets the wide-character functions wrong.
+
+ errno = 0;
+ EXPECT_EQ(EOF, putc('x', fp));
+ EXPECT_EQ(EBADF, errno);
+
+ errno = 0;
+ EXPECT_EQ(EOF, fprintf(fp, "hello"));
+ EXPECT_EQ(EBADF, errno);
+
+ errno = 0;
+ EXPECT_EQ(EOF, fwprintf(fp, L"hello"));
+#if !defined(__GLIBC__)
+ EXPECT_EQ(EBADF, errno);
+#endif
+
+ errno = 0;
+ EXPECT_EQ(EOF, putw(1234, fp));
+ EXPECT_EQ(EBADF, errno);
+
+ errno = 0;
+ EXPECT_EQ(0U, fwrite("hello", 1, 2, fp));
+ EXPECT_EQ(EBADF, errno);
+
+ errno = 0;
+ EXPECT_EQ(EOF, fputs("hello", fp));
+ EXPECT_EQ(EBADF, errno);
+
+ errno = 0;
+ EXPECT_EQ(WEOF, fputwc(L'x', fp));
+#if !defined(__GLIBC__)
+ EXPECT_EQ(EBADF, errno);
+#endif
+}