groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 13/20: [tbl]: Fix Savannah #63751.


From: G. Branden Robinson
Subject: [groff] 13/20: [tbl]: Fix Savannah #63751.
Date: Fri, 3 Feb 2023 16:47:55 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit 61f2d86d93e46309f5721b3700e1b189350282dd
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Feb 3 05:11:46 2023 -0600

    [tbl]: Fix Savannah #63751.
    
    * src/preproc/tbl/main.cpp (main): Avoid reading from invalid memory
      upon failure to open an input file.
    
    Fixes <https://savannah.gnu.org/bugs/?63751>.
---
 ChangeLog                | 7 +++++++
 src/preproc/tbl/main.cpp | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d4b7e7f57..b0841faf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-02-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/preproc/tbl/main.cpp (main): Avoid reading from invalid
+       memory upon failure to open an input file.
+
+       Fixes <https://savannah.gnu.org/bugs/?63751>.
+
 2023-02-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/preproc/eqn/lex.cpp (get_delimited_text): Avoid reading
diff --git a/src/preproc/tbl/main.cpp b/src/preproc/tbl/main.cpp
index 467c19f86..a3308baa8 100644
--- a/src/preproc/tbl/main.cpp
+++ b/src/preproc/tbl/main.cpp
@@ -1658,8 +1658,10 @@ int main(int argc, char **argv)
       else {
        errno = 0;
        FILE *fp = fopen(argv[i], "r");
-       if (fp == 0)
+       if (fp == 0) {
+         current_filename = 0 /* nullptr */;
          fatal("can't open '%1': %2", argv[i], strerror(errno));
+       }
        else {
          current_lineno = 1;
          string fn(argv[i]);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]