diff --git a/interp/builtin.go b/interp/builtin.go
index 818f9f78..57b2c85b 100644
--- a/interp/builtin.go
+++ b/interp/builtin.go
@@ -9,7 +9,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -604,6 +603,8 @@ func (r *Runner) builtinCode(ctx context.Context, pos syntax.Pos, name string, a
 			r.setVarString(name, val)
 		}
 
+		// We can get data back from readLine and an error at the same time, so
+		// check err after we process the data.
 		if err != nil {
 			return 1
 		}
@@ -966,11 +967,8 @@ func (r *Runner) readLine(ctx context.Context, raw bool) ([]byte, error) {
 				esc = false
 			}
 		}
-		if err == io.EOF && len(line) > 0 {
-			return line, nil
-		}
 		if err != nil {
-			return nil, err
+			return line, err
 		}
 	}
 }
diff --git a/interp/interp_test.go b/interp/interp_test.go
index 8a6a528a..75735571 100644
--- a/interp/interp_test.go
+++ b/interp/interp_test.go
@@ -2982,6 +2982,27 @@ done <<< 2`,
 		"mapfile -t butter <<EOF\na\nb\nc\nEOF\n" + `for x in "${butter[@]}"; do echo "$x"; done`,
 		"a\nb\nc\n",
 	},
+	// read & EOF
+	// // newline
+	// {
+	// 	`a=a; echo | read a; echo -n "$a"`,
+	// 	"",
+	// },
+	// empty input
+	{
+		`a=b; read a < /dev/null; echo -n "$a"`,
+		"",
+	},
+	// // some string and newline
+	// {
+	// 	"a=c; echo x | read a; echo -n $a",
+	// 	"x",
+	// },
+	// // some string and EOF
+	// {
+	// 	"a=d; echo -n y | read a; echo -n $a",
+	// 	"y",
+	// },
 }
 
 var runTestsUnix = []runTest{
@@ -3943,6 +3964,49 @@ func TestRunnerContext(t *testing.T) {
 	}
 }
 
+func TestCancelreader(t *testing.T) {
+	t.Parallel()
+
+	p := syntax.NewParser()
+	file := parse(t, p, "read x")
+	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+	// Make the linter happy, even though we deliberately wait for the
+	// timeout.
+	defer cancel()
+
+	var r *interp.Runner
+	if runtime.GOOS == "windows" {
+		// On Windows, the cancelreader only works on stdin
+		r, _ = interp.New(interp.StdIO(os.Stdin, nil, nil))
+	} else {
+		siR, siW, err := os.Pipe()
+		if err != nil {
+			t.Fatalf("Error calling os.Pipe: %v", err)
+		}
+		defer func() {
+			siW.Close()
+			siR.Close()
+		}()
+		r, _ = interp.New(interp.StdIO(siR, nil, nil))
+	}
+	now := time.Now()
+	errChan := make(chan error)
+	go func() {
+		errChan <- r.Run(ctx, file)
+	}()
+
+	timeout := 500 * time.Millisecond
+	select {
+	case err := <-errChan:
+		if err == nil || err.Error() != "exit status 1" || ctx.Err() != context.DeadlineExceeded {
+			t.Fatalf("'read x' did not timeout correctly; err: %v, ctx.Err(): %v; dur: %v",
+				err, ctx.Err(), time.Since(now))
+		}
+	case <-time.After(timeout):
+		t.Fatalf("program was not killed in %s", timeout)
+	}
+}
+
 func TestRunnerAltNodes(t *testing.T) {
 	t.Parallel()