components/net-snmp/patches/050.19616465.patch
author Ronald Jordan <ron.jordan@oracle.com>
Tue, 11 Oct 2016 11:55:12 -0700
branchs11u3-sru
changeset 7085 cad8ee01213d
parent 3440 573f3b6b1987
permissions -rw-r--r--
23206271 Upgrade cffi to 1.5.2 22871503 Upgrade cryptography to version 1.2.3 22520335 Integrate idna into Userland 22520346 Integrate ipaddress into Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3440
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     1
http://sourceforge.net/p/net-snmp/code/ci/4c5633f1603e4bd03ed05c37d782ec8911759c47/
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     2
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     3
diff --git a/agent/mibgroup/agent/extend.c b/agent/mibgroup/agent/extend.c
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     4
index 00d270a..cd0b2d6 100644
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     5
--- a/agent/mibgroup/agent/extend.c
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     6
+++ b/agent/mibgroup/agent/extend.c
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     7
@@ -1132,7 +1132,7 @@ _extend_find_entry( netsnmp_request_info       *request,
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     8
              * ...and check the line requested is valid
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
     9
              */
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    10
             line_idx = *table_info->indexes->next_variable->val.integer;
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    11
-            if (eptr->numlines < line_idx)
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    12
+            if (line_idx < 1 || line_idx > eptr->numlines)
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    13
                 return NULL;
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    14
         }
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    15
         return eptr;
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    16
@@ -1305,6 +1305,10 @@ handle_nsExtendOutput2Table(netsnmp_mib_handler          *handler,
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    17
                  * Determine which line we've been asked for....
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    18
                  */
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    19
                 line_idx = *table_info->indexes->next_variable->val.integer;
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    20
+                if (line_idx < 1 || line_idx > extension->numlines) {
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    21
+                    netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE);
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    22
+                    continue;
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    23
+                }
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    24
                 cp  = extension->lines[line_idx-1];
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    25
 
573f3b6b1987 19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset
    26
                 /*