Compare commits
No commits in common. "d32de5403bfd285f5faeecd1bfd91eb0ae997ba3" and "27f473f42a4ccb80959642d0a9428ffa934aeb43" have entirely different histories.
d32de5403b
...
27f473f42a
@ -1,32 +0,0 @@
|
|||||||
From 61f2d86d93e46309f5721b3700e1b189350282dd Mon Sep 17 00:00:00 2001
|
|
||||||
From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
|
|
||||||
Date: Fri, 3 Feb 2023 05:11:46 -0600
|
|
||||||
Subject: [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>.
|
|
||||||
---
|
|
||||||
src/preproc/tbl/main.cpp | 4 +++-
|
|
||||||
1 files changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/preproc/tbl/main.cpp b/src/preproc/tbl/main.cpp
|
|
||||||
index 467c19f..a3308ba 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]);
|
|
||||||
--
|
|
||||||
cgit v1.1
|
|
||||||
|
|
||||||
15
groff.spec
15
groff.spec
@ -2,14 +2,12 @@
|
|||||||
%{!?with_x:%global with_x 1}
|
%{!?with_x:%global with_x 1}
|
||||||
Name: groff
|
Name: groff
|
||||||
Version: 1.22.4
|
Version: 1.22.4
|
||||||
Release: 13
|
Release: 9
|
||||||
Summary: A typesetting system
|
Summary: A typesetting system
|
||||||
License: GPLv3+ and GFDL-1.3-or-later and BSD and MIT
|
License: GPLv3+ and GFDL and BSD and MIT
|
||||||
URL: http://www.gnu.org/software/groff/
|
URL: http://www.gnu.org/software/groff/
|
||||||
Source: http://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
|
Source: http://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
|
||||||
|
|
||||||
Patch6000: backport-Avoid-reading-from-invalid-memory.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc, gcc-c++ texinfo
|
BuildRequires: gcc, gcc-c++ texinfo
|
||||||
BuildRequires: git, netpbm-progs, perl-generators, psutils, ghostscript
|
BuildRequires: git, netpbm-progs, perl-generators, psutils, ghostscript
|
||||||
BuildRequires: libXaw-devel, libXmu-devel
|
BuildRequires: libXaw-devel, libXmu-devel
|
||||||
@ -322,15 +320,6 @@ make check
|
|||||||
%{_infodir}/groff.info*
|
%{_infodir}/groff.info*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Sep 02 2024 Linux_zhang <zhangruifang@h-partners.com> - 1.22.4-13
|
|
||||||
- License compliance rectification
|
|
||||||
|
|
||||||
* Mon Apr 08 2024 shixuantong <shixuantong1@huawei.com> - 1.22.4-12
|
|
||||||
- Avoid reading from invalid memory upon failure to open an input file
|
|
||||||
|
|
||||||
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.22.4-10
|
|
||||||
- rebuild for next release
|
|
||||||
|
|
||||||
* Tue Mar 15 2022 renhognxun <renhongxun@h-partners.com> 1.22.4-9
|
* Tue Mar 15 2022 renhognxun <renhongxun@h-partners.com> 1.22.4-9
|
||||||
- split a sub-package groff-x11
|
- split a sub-package groff-x11
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user