fix bugs detected by static analysis
This commit is contained in:
Kamil Dudka
parent
a60e2fc46b
commit
1a3036b472
105
lynx-2.8.9-static-analysis.patch
Normal file
105
lynx-2.8.9-static-analysis.patch
Normal file
@ -0,0 +1,105 @@
|
||||
From 0bd3f2aa9bd75263901e1f57a6cd9c4015084408 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Tue, 6 Nov 2018 12:32:04 +0100
|
||||
Subject: [PATCH] lynx: fix bugs detected by static analysis
|
||||
|
||||
---
|
||||
WWW/Library/Implementation/HTGopher.c | 1 +
|
||||
samples/lynxdump | 1 +
|
||||
src/LYBookmark.c | 2 ++
|
||||
src/LYDownload.c | 1 +
|
||||
src/LYLeaks.c | 24 ++++--------------------
|
||||
5 files changed, 9 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
|
||||
index a9ad41e..36ff592 100644
|
||||
--- a/WWW/Library/Implementation/HTGopher.c
|
||||
+++ b/WWW/Library/Implementation/HTGopher.c
|
||||
@@ -1651,6 +1651,7 @@ static int HTLoadCSO(const char *arg,
|
||||
(*Target->isa->put_block) (Target, buf, (int) strlen(buf));
|
||||
(*Target->isa->_free) (Target);
|
||||
free_CSOfields();
|
||||
+ BStrFree(command);
|
||||
return HT_LOADED;
|
||||
}
|
||||
/*
|
||||
diff --git a/samples/lynxdump b/samples/lynxdump
|
||||
index f79be2f..a0e9ae2 100755
|
||||
--- a/samples/lynxdump
|
||||
+++ b/samples/lynxdump
|
||||
@@ -12,4 +12,5 @@ if test $HOME/.lynxrc ; then
|
||||
fi
|
||||
echo 'keypad_mode=NUMBERS_AS_ARROWS' >> $MYTMP/.lynxrc
|
||||
HOME=$MYTMP; export HOME
|
||||
+umask $oldmask
|
||||
lynx -justify -dump -force_html -with_backspaces -nolist $*
|
||||
diff --git a/src/LYBookmark.c b/src/LYBookmark.c
|
||||
index c3116ef..6464d96 100644
|
||||
--- a/src/LYBookmark.c
|
||||
+++ b/src/LYBookmark.c
|
||||
@@ -303,6 +303,7 @@ void save_bookmark_link(const char *address,
|
||||
LYMBM_statusline(CANCELLED);
|
||||
LYSleepMsg();
|
||||
FREE(bookmark_URL);
|
||||
+ BStrFree(tmp_data);
|
||||
return;
|
||||
}
|
||||
} while (!havevisible(string_data->str));
|
||||
@@ -347,6 +348,7 @@ void save_bookmark_link(const char *address,
|
||||
LYSleepAlert();
|
||||
FREE(Title);
|
||||
FREE(bookmark_URL);
|
||||
+ BStrFree(tmp_data);
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/src/LYDownload.c b/src/LYDownload.c
|
||||
index cf1ea98..9cf712d 100644
|
||||
--- a/src/LYDownload.c
|
||||
+++ b/src/LYDownload.c
|
||||
@@ -456,6 +456,7 @@ void LYDownload(char *line)
|
||||
cleanup:
|
||||
FREE(Line);
|
||||
BStrFree(buffer);
|
||||
+ BStrFree(command);
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/src/LYLeaks.c b/src/LYLeaks.c
|
||||
index 2f2de28..8c236ff 100644
|
||||
--- a/src/LYLeaks.c
|
||||
+++ b/src/LYLeaks.c
|
||||
@@ -1090,26 +1090,10 @@ static char *LYLeakSAVsprintf(char **dest,
|
||||
mark_realloced(ALp_old, *dest, strlen(*dest) + 1, cp_File, ssi_Line);
|
||||
return (*dest);
|
||||
}
|
||||
- if (vp_realloced == vp_oldAlloced) {
|
||||
- ALp_new->SL_memory.cp_FileName = old_cp_File;
|
||||
- ALp_new->SL_memory.ssi_LineNumber = old_ssi_Line;
|
||||
- ALp_new->SL_realloc.cp_FileName = cp_File;
|
||||
- ALp_new->SL_realloc.ssi_LineNumber = ssi_Line;
|
||||
- return (*dest);
|
||||
- }
|
||||
- /* Look up again, list may have changed! - kw */
|
||||
- ALp_old = FindInList(vp_oldAlloced);
|
||||
- if (ALp_old == NULL) {
|
||||
- ALp_new->SL_memory.cp_FileName = old_cp_File;
|
||||
- ALp_new->SL_memory.ssi_LineNumber = old_ssi_Line;
|
||||
- ALp_new->SL_realloc.cp_FileName = cp_File;
|
||||
- ALp_new->SL_realloc.ssi_LineNumber = ssi_Line;
|
||||
- } else {
|
||||
- ALp_new->SL_memory.cp_FileName = old_cp_File;
|
||||
- ALp_new->SL_memory.ssi_LineNumber = old_ssi_Line;
|
||||
- ALp_new->SL_realloc.cp_FileName = cp_File;
|
||||
- ALp_new->SL_realloc.ssi_LineNumber = ssi_Line;
|
||||
- }
|
||||
+ ALp_new->SL_memory.cp_FileName = old_cp_File;
|
||||
+ ALp_new->SL_memory.ssi_LineNumber = old_ssi_Line;
|
||||
+ ALp_new->SL_realloc.cp_FileName = cp_File;
|
||||
+ ALp_new->SL_realloc.ssi_LineNumber = ssi_Line;
|
||||
}
|
||||
return (*dest);
|
||||
}
|
||||
--
|
||||
2.17.2
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: A text-based Web browser
|
||||
Name: lynx
|
||||
Version: 2.8.9
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2
|
||||
Group: Applications/Internet
|
||||
Source: https://invisible-mirror.net/archives/lynx/tarballs/lynx%{version}rel.%{devrel}.tar.bz2
|
||||
@ -24,6 +24,9 @@ Patch2: lynx-CVE-2008-4690.patch
|
||||
# avoid build failure caused by mistakenly excluded <locale.h>
|
||||
Patch3: lynx-2.8.8-locale.patch
|
||||
|
||||
# fix bugs detected by static analysis
|
||||
Patch4: lynx-2.8.9-static-analysis.patch
|
||||
|
||||
Provides: webclient
|
||||
Provides: text-www-browser
|
||||
BuildRequires: dos2unix
|
||||
@ -55,6 +58,7 @@ exits quickly and swiftly displays web pages.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||
sed -e "s,^HELPFILE:.*,HELPFILE:file://localhost%{_pkgdocdir}/lynx_help/lynx_help_main.html,g" -i lynx.cfg
|
||||
@ -131,6 +135,9 @@ EOF
|
||||
%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
|
||||
|
||||
%changelog
|
||||
* Thu Nov 08 2018 Kamil Dudka <kdudka@redhat.com> - 2.8.9-3
|
||||
- fix bugs detected by static analysis
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user