From 9271e0bf0570d162130b898385dba76ba2ee60d4 Mon Sep 17 00:00:00 2001
From: Michael Mikonos <127171689+mknos@users.noreply.github.com>
Date: Fri, 22 Nov 2024 11:20:08 +0800
Subject: [PATCH] ed: getAddr() vs maxline()

* When adding getAddr() call to edMove() I noticed getAddr() doesn't raise error for n>maxline case
* This logic was only in input() before, but it seems more correct for getAddr() to check the maxline limit
* Also add missing check in edMove() for stray characters leftover after calling getAddr(); the argument to m should be a single address so anything remaining is invalid input
* test: 1,2m.A ---> "A" suffix invalid after "."
---
 bin/ed | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/ed b/bin/ed
index ae1e80a3..de8f1f3e 100755
--- a/bin/ed
+++ b/bin/ed
@@ -63,6 +63,7 @@ use constant A_NOMATCH => -1;
 use constant A_NOPAT   => -2;
 use constant A_PATTERN => -3;
 use constant A_NOMARK  => -4;
+use constant A_RANGE   => -5;
 
 use constant E_ADDREXT => 'unexpected address';
 use constant E_ADDRBAD => 'invalid address';
@@ -240,7 +241,7 @@ sub input {
         } elsif ($ad == A_PATTERN) {
             edWarn(E_PATTERN);
             return;
-        } elsif ($ad > maxline() || $ad < 0) {
+        } elsif ($ad < 0) {
             edWarn(E_ADDRBAD);
             return;
         }
@@ -438,10 +439,11 @@ sub edMove {
     }
     $_ = $args[0];
     my $dst = getAddr();
+    return E_SUFFBAD if m/\S/;
     if (defined $dst) {
         return E_NOMATCH if $dst == A_NOMATCH;
         return E_NOPAT if $dst == A_NOPAT;
-        return E_ADDRBAD if $dst < 0 || $dst > maxline();
+        return E_ADDRBAD if $dst < 0;
     } else {
         $dst = $CurrentLineNum;
     }
@@ -948,6 +950,9 @@ sub getAddr {
         $n = edSearch($re, $delim eq '?');
         $n = A_NOMATCH unless $n;
     }
+    if (defined $n) {
+        return A_RANGE if $n < 0 || $n > maxline();
+    }
     return $n;
 }