components/net-snmp/patches/040.17812413.logmatch_free.patch
author pkidd <patrick.kidd@oracle.com>
Tue, 21 Feb 2017 09:42:20 -0800
branchs11u3-sru
changeset 7677 9b4f5d1632d7
parent 3023 90190872ae3e
permissions -rw-r--r--
Added tag 0.175.3.18.0.2.0, S11.3SRU18.2 for changeset 89cc78d134da
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3023
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     1
# This patch has been submitted upstream. But it has not been accepted yet.
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     2
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     3
--- a/agent/mibgroup/ucd-snmp/logmatch.c	Thu Sep 14 17:48:50 2006
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     4
+++ b/agent/mibgroup/ucd-snmp/logmatch.c	Wed Feb  5 23:56:38 2014
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     5
@@ -118,8 +118,8 @@
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     6
      */
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     7
 
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     8
     for (i = 0; i < logmatchCount; i++) {
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     9
-
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    10
-        regfree(&(logmatchTable[i].regexBuffer));
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    11
+        if (logmatchTable[i].myRegexError == 0)
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    12
+            regfree(&(logmatchTable[i].regexBuffer));
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    13
     }
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    14
     logmatchCount = 0;
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    15
 }
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    16
@@ -212,6 +212,17 @@
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    17
             regcomp(&(logmatchTable[logmatchCount].regexBuffer),
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    18
                     logmatchTable[logmatchCount].regEx,
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    19
                     REG_EXTENDED | REG_NOSUB);
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    20
+		if (logmatchTable[logmatchCount].myRegexError)
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    21
+		{
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    22
+			char regexErrorString[100];
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    23
+			regerror(logmatchTable[logmatchCount].myRegexError,
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    24
+					&(logmatchTable[logmatchCount].regexBuffer),
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    25
+					regexErrorString, 100);
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    26
+			regexErrorString[99] = '\0';
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    27
+			snmp_log(LOG_ERR, "Could not process the logmatch regex - %s," \
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    28
+					"\n since regcomp() failed with - %s\n",
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    29
+					logmatchTable[logmatchCount].regEx, regexErrorString);
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    30
+		}
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    31
 
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    32
         if (logmatchTable[logmatchCount].frequency > 0) {
90190872ae3e 17812413 net-snmp 5.4.1 dumps core when snmpd.conf contains an incorrect logmatch param.
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    33
             snmp_alarm_register(logmatchTable[logmatchCount].frequency,