From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 18 Feb 2016 17:11:35 +0000 (-0500)
Subject: Merge pull request #276 in SNORT/snort3 from crc/svcmap to master
X-Git-Tag: 3.0.0-233~597
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f9b24bb7ec8b7375b77bbd2b9c5f0418d9494eb;p=thirdparty%2Fsnort3.git

Merge pull request #276 in SNORT/snort3 from crc/svcmap to master

Squashed commit of the following:

commit 602998ad8b7c3694135015ca4b43628f289935b6
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Feb 18 11:40:06 2016 -0500

    fix bounds check
---

diff --git a/src/detection/service_map.cc b/src/detection/service_map.cc
index bfe7beec7..b333037d5 100644
--- a/src/detection/service_map.cc
+++ b/src/detection/service_map.cc
@@ -317,7 +317,7 @@ PortGroup* sopg_table_t::get_port_group(
 
     PortGroupVector& v = c2s ? to_srv[proto] : to_cli[proto];
 
-    if ( (unsigned)proto_ordinal > v.size() )
+    if ( (unsigned)proto_ordinal >= v.size() )
         return nullptr;
 
     return v[proto_ordinal];