From 5e64197f914e5ec377db709381e02b4999e64870 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Sat, 21 Dec 2019 22:03:30 -0500
Subject: [PATCH] Read cached output line-by-line

This avoids loading potentially gigabytes of output into memory, which
can cause OOMs.
---
 src/cargo/core/compiler/mod.rs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs
index 556664f5e33..cba5764bbe9 100644
--- a/src/cargo/core/compiler/mod.rs
+++ b/src/cargo/core/compiler/mod.rs
@@ -19,7 +19,7 @@ pub mod unit_dependencies;
 use std::env;
 use std::ffi::{OsStr, OsString};
 use std::fs::{self, File};
-use std::io::Write;
+use std::io::{BufRead, Write};
 use std::path::PathBuf;
 use std::sync::Arc;
 
@@ -1252,9 +1252,19 @@ fn replay_output_cache(
             // No cached output, probably didn't emit anything.
             return Ok(());
         }
-        let contents = fs::read_to_string(&path)?;
-        for line in contents.lines() {
-            on_stderr_line(state, line, package_id, &target, &mut options)?;
+        // We sometimes have gigabytes of output from the compiler, so avoid
+        // loading it all into memory at once, as that can cause OOM where
+        // otherwise there would be none.
+        let file = fs::File::open(&path)?;
+        let mut reader = std::io::BufReader::new(file);
+        let mut line = String::new();
+        loop {
+            let length = reader.read_line(&mut line)?;
+            if length == 0 {
+                break;
+            }
+            on_stderr_line(state, line.as_str(), package_id, &target, &mut options)?;
+            line.clear();
         }
         Ok(())
     })