Fix readLineAsync when there is already data available to read

hhvm · Jun 15, 2018 · b8ac104 · b8ac104
1 parent 73e4a70
commit b8ac104
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/FileHandleInput.hh b/src/FileHandleInput.hh
@@ -82,18 +82,19 @@ final class FileHandleInput implements InputInterface {
       return '';
     }
 
-    await $this->waitForDataAsync();
     if ($max_bytes === null) {
       // PHP does not document the default value
-      $data = \fgets($this->f);
+      $impl = () ==> \fgets($this->f);
     } else {
       // However, it does document that up to `$length - 1` bytes are returned
-      $data = \fgets($this->f, $max_bytes + 1);
+      $impl = () ==> \fgets($this->f, $max_bytes + 1);
     }
+    $data = $impl();
     if ($data === false) {
-      return '';
+      await $this->waitForDataAsync();
+      $data = $impl();
     }
-    return $data;
+    return $data === false ? '' : $data;
   }
 
   /**