Repository: trafficserver
Updated Branches:
  refs/heads/master 2e6de25ad -> a23a03d5b


[TS-3438]: Move the assert to the correct place, before the length is 
incremented


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

Branch: refs/heads/master
Commit: a23a03d5b00582b8c039030d1dfa1544c83e2142
Parents: 2e6de25
Author: Sudheer Vinukonda <[email protected]>
Authored: Fri Apr 10 21:45:13 2015 +0000
Committer: Sudheer Vinukonda <[email protected]>
Committed: Fri Apr 10 21:45:13 2015 +0000

----------------------------------------------------------------------
 iocore/net/SSLNextProtocolSet.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a23a03d5/iocore/net/SSLNextProtocolSet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNextProtocolSet.cc b/iocore/net/SSLNextProtocolSet.cc
index d543052..454f336 100644
--- a/iocore/net/SSLNextProtocolSet.cc
+++ b/iocore/net/SSLNextProtocolSet.cc
@@ -52,6 +52,7 @@ create_npn_advertisement(const 
SSLNextProtocolSet::NextProtocolEndpoint::list_ty
   *len = 0;
 
   for (ep = endpoints.head; ep != NULL; ep = endpoints.next(ep)) {
+    ink_release_assert((strlen(ep->protocol) > 0));
     *len += (strlen(ep->protocol) + 1);
   }
 
@@ -62,7 +63,6 @@ create_npn_advertisement(const 
SSLNextProtocolSet::NextProtocolEndpoint::list_ty
 
   for (ep = endpoints.head; ep != NULL; ep = endpoints.next(ep)) {
     Debug("ssl", "advertising protocol %s", ep->protocol);
-    ink_release_assert((strlen(ep->protocol) > 0));
     advertised = append_protocol(ep->protocol, advertised);
   }
 

Reply via email to