commit 20841a137beac5caa824e3586c7bd91d879ff92e
author Elliott Hughes <enh@google.com> Mon Dec 01 16:13:30 2014 -0800
committer Elliott Hughes <enh@google.com> Tue Dec 02 14:22:02 2014 -0800
tree 3ccc88081ddcdbe9a4448c462eb16e971007f86e
parent 5cd127d3aa4a2f225be202af01581838fdd3c721

Avoid pathological behavior in OpenBSD's fread.

Bug: https://code.google.com/p/android/issues/detail?id=81155
Bug: 18556607
Change-Id: Idc60976b79610e2202cc42dc393dcb4ca6c42e05

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 13fc297..2270dc6 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -58,6 +58,7 @@
     bionic/sigsetmask.c \
     bionic/system_properties_compat.c \
     stdio/findfp.c \
+    stdio/fread.c \
     stdio/snprintf.c\
     stdio/sprintf.c \
     stdio/stdio_ext.cpp \
@@ -406,7 +407,6 @@
     upstream-openbsd/lib/libc/stdio/fputs.c \
     upstream-openbsd/lib/libc/stdio/fputwc.c \
     upstream-openbsd/lib/libc/stdio/fputws.c \
-    upstream-openbsd/lib/libc/stdio/fread.c \
     upstream-openbsd/lib/libc/stdio/freopen.c \
     upstream-openbsd/lib/libc/stdio/fscanf.c \
     upstream-openbsd/lib/libc/stdio/fseek.c \