commit 27d276f3a6d81d29fab13de96496efb7bc072773
author Elliott Hughes <enh@google.com> Mon Dec 01 16:13:30 2014 -0800
committer Elliott Hughes <enh@google.com> Tue Dec 02 14:54:52 2014 -0800
tree f15aacb70521bf895148e9741387c70f708e7c41
parent 152e978f73fc6cd37d0d82de69f1cf8134b34b90

Avoid pathological behavior in OpenBSD's fread.

(cherry picked from commit 20841a137beac5caa824e3586c7bd91d879ff92e)

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

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 045556e..3005092 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -61,6 +61,7 @@
     bionic/sigsetmask.c \
     bionic/system_properties_compat.c \
     stdio/findfp.c \
+    stdio/fread.c \
     stdio/snprintf.c\
     stdio/sprintf.c \
 
@@ -396,7 +397,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 \