!28 Fix use-of-uninitialized-value in end_string
From: @ultra_planet Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
60580306ed
53
wireshark-initialize-point-in-end_string.patch
Normal file
53
wireshark-initialize-point-in-end_string.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
From 8862151190b333c938a47fbbe51b0a611607af7d Mon Sep 17 00:00:00 2001
|
||||||
|
From: lingsheng <lingsheng@huawei.com>
|
||||||
|
Date: Mon, 2 Nov 2020 16:01:57 +0800
|
||||||
|
Subject: [PATCH] initialize point in end_string
|
||||||
|
|
||||||
|
---
|
||||||
|
epan/version_info.c | 2 +-
|
||||||
|
version_info.c | 2 +-
|
||||||
|
wiretap/version_info.c | 2 +-
|
||||||
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/epan/version_info.c b/epan/version_info.c
|
||||||
|
index 6c80bd9..7e979d8 100644
|
||||||
|
--- a/epan/version_info.c
|
||||||
|
+++ b/epan/version_info.c
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
static void
|
||||||
|
end_string(GString *str)
|
||||||
|
{
|
||||||
|
- size_t point;
|
||||||
|
+ size_t point = 0;
|
||||||
|
char *p, *q;
|
||||||
|
|
||||||
|
point = str->len;
|
||||||
|
diff --git a/version_info.c b/version_info.c
|
||||||
|
index 6c80bd9..7e979d8 100644
|
||||||
|
--- a/version_info.c
|
||||||
|
+++ b/version_info.c
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
static void
|
||||||
|
end_string(GString *str)
|
||||||
|
{
|
||||||
|
- size_t point;
|
||||||
|
+ size_t point = 0;
|
||||||
|
char *p, *q;
|
||||||
|
|
||||||
|
point = str->len;
|
||||||
|
diff --git a/wiretap/version_info.c b/wiretap/version_info.c
|
||||||
|
index 6c80bd9..7e979d8 100644
|
||||||
|
--- a/wiretap/version_info.c
|
||||||
|
+++ b/wiretap/version_info.c
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
static void
|
||||||
|
end_string(GString *str)
|
||||||
|
{
|
||||||
|
- size_t point;
|
||||||
|
+ size_t point = 0;
|
||||||
|
char *p, *q;
|
||||||
|
|
||||||
|
point = str->len;
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: wireshark
|
Name: wireshark
|
||||||
Version: 2.6.2
|
Version: 2.6.2
|
||||||
Release: 12
|
Release: 13
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: Network traffic analyzer
|
Summary: Network traffic analyzer
|
||||||
License: GPL+
|
License: GPL+
|
||||||
@ -43,6 +43,7 @@ Patch6028: CVE-2020-15466.patch
|
|||||||
Patch6029: CVE-2018-16056.patch
|
Patch6029: CVE-2018-16056.patch
|
||||||
Patch6030: CVE-2020-25862.patch
|
Patch6030: CVE-2020-25862.patch
|
||||||
Patch6031: CVE-2020-25863.patch
|
Patch6031: CVE-2020-25863.patch
|
||||||
|
Patch6032: wireshark-initialize-point-in-end_string.patch
|
||||||
|
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
Requires(post): systemd-udev
|
Requires(post): systemd-udev
|
||||||
@ -149,6 +150,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon
|
|||||||
%{_mandir}/man?/*
|
%{_mandir}/man?/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 02 2020 lingsheng <lingsheng@huawei.com> - 2.6.2-13
|
||||||
|
- Fix use-of-uninitialized-value in end_string
|
||||||
|
|
||||||
* Wed Oct 21 2020 wangxiao <wangxiao65@huawei.com> - 2.6.2-12
|
* Wed Oct 21 2020 wangxiao <wangxiao65@huawei.com> - 2.6.2-12
|
||||||
- Type:cves
|
- Type:cves
|
||||||
- ID: CVE-2020-25862 CVE-2020-25863
|
- ID: CVE-2020-25862 CVE-2020-25863
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user