Merge branch 'master' of github.com:feeley/emscripten into incoming

2 files changed, 5 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
index 136e53b6..7196711d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -81,4 +81,5 @@ a license to everyone to use it as detailed in LICENSE.)
 * Frits Talbot <frits@metapathy.com>
 * Onno Jongbloed <hey@onnoj.net>
 * Jez Ng <me@jezng.com>
+* Marc Feeley <mfeeley@mozilla.com> (copyright owned by Mozilla Foundation)
 
diff --git a/src/library.js b/src/library.js
index 07368ee7..ab27ed35 100644
--- a/src/library.js
+++ b/src/library.js
@@ -1834,6 +1834,10 @@ LibraryManager.library = {
               ___setErrNo(ERRNO_CODES.EIO);
               return -1;
             }
+            if (result === undefined && bytesRead === 0) {
+              ___setErrNo(ERRNO_CODES.EAGAIN);
+              return -1;
+            }
             if (result === null || result === undefined) break;
             bytesRead++;
             {{{ makeSetValue('buf', 'i', 'result', 'i8') }}}