From 4b63dcf346cd2f17ab19bb7829fc58879372b6d8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 25 2018 09:30:09 +0000
Subject: import net-snmp-5.7.2-28.el7_4.1


---

diff --git a/SOURCES/net-snmp-5.7.2-strstr.patch b/SOURCES/net-snmp-5.7.2-strstr.patch
new file mode 100644
index 0000000..82c4c57
--- /dev/null
+++ b/SOURCES/net-snmp-5.7.2-strstr.patch
@@ -0,0 +1,13 @@
+diff -urNp old/agent/mibgroup/host/data_access/swinst_rpm.c new/agent/mibgroup/host/data_access/swinst_rpm.c
+--- old/agent/mibgroup/host/data_access/swinst_rpm.c	2012-10-10 00:28:58.000000000 +0200
++++ new/agent/mibgroup/host/data_access/swinst_rpm.c	2017-03-23 13:39:44.695386498 +0100
+@@ -129,7 +129,7 @@ netsnmp_swinst_arch_load( netsnmp_contai
+                                       "%s-%s-%s", n, v, r);
+         if (entry->swName_len > sizeof(entry->swName))
+             entry->swName_len = sizeof(entry->swName);
+-        entry->swType = (NULL != strstr( g, "System Environment"))
++        entry->swType = (g != NULL && NULL != strstr( g, "System Environment"))
+                         ? 2      /* operatingSystem */
+                         : 4;     /*  application    */
+ 
+
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
index d15029f..8ccf217 100644
--- a/SPECS/net-snmp.spec
+++ b/SPECS/net-snmp.spec
@@ -11,7 +11,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: 5.7.2
-Release: 28%{?dist}
+Release: 28%{?dist}.1
 Epoch: 1
 
 License: BSD
@@ -96,6 +96,7 @@ Patch59: net-snmp-5.7.2-client-udp6.patch
 Patch60: net-snmp-5.7.2-ipAddress-faster-load.patch
 Patch61: net-snmp-5.7.2-large-fdset.patch
 Patch62: net-snmp-5.7.2-duplicate-ipAddress.patch
+Patch63: net-snmp-5.7.2-strstr.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -311,6 +312,7 @@ The net-snmp-sysvinit package provides SysV init scripts for Net-SNMP daemons.
 %patch60 -p1 -b .ipAddress-faster-load
 %patch61 -p1 -b .large-fdset
 %patch62 -p1 -b .duplicate-ipAddress
+%patch63 -p1 -b .strstr.patch
 
 %ifarch sparc64 s390 s390x
 # disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
@@ -606,6 +608,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_initrddir}/snmptrapd
 
 %changelog
+* Wed Dec 13 2017 Pavel Zhukov <pzhukov@redhat.com> - 1:5.7.2-28.1
+- Resolves: #1525421 - fix strstr() crash
+
 * Wed Apr 26 2017 Josef Ridky <jridky@redhat.com> - 1:5.7.2-28
 - Restored message about duplicate IP address (#1442962)