Repository: trafficserver
Updated Branches:
  refs/heads/master dcb39f9aa -> b918d0493


CID #1271336 fix the fix that was bad


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b918d049
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b918d049
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b918d049

Branch: refs/heads/master
Commit: b918d04939d4ddb50e33088e3c04f9b3b4175bda
Parents: dcb39f9
Author: Leif Hedstrom <[email protected]>
Authored: Tue Jun 9 09:46:19 2015 -0600
Committer: Leif Hedstrom <[email protected]>
Committed: Tue Jun 9 09:46:50 2015 -0600

----------------------------------------------------------------------
 proxy/http2/Http2ConnectionState.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b918d049/proxy/http2/Http2ConnectionState.h
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ConnectionState.h 
b/proxy/http2/Http2ConnectionState.h
index d51c67b..85b4147 100644
--- a/proxy/http2/Http2ConnectionState.h
+++ b/proxy/http2/Http2ConnectionState.h
@@ -59,9 +59,13 @@ public:
   unsigned
   get(Http2SettingsIdentifier id) const
   {
-    ink_assert(id < HTTP2_SETTINGS_MAX);
+    if (id < HTTP2_SETTINGS_MAX) {
+      return this->settings[indexof(id)];
+    } else {
+      ink_assert(!"Bad Settings Identifier");
+    }
 
-    return this->settings[indexof(id)];
+    return 0;
   }
 
   unsigned

Reply via email to