You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2014/07/14 21:44:19 UTC

git commit: TS-1475: Fix server_transfer_init potential NULL pointer.

Repository: trafficserver
Updated Branches:
  refs/heads/master a72bac211 -> 45a5ff5cd


TS-1475: Fix server_transfer_init potential NULL pointer.


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

Branch: refs/heads/master
Commit: 45a5ff5cd1b7da9291c17239303c0b024c50de89
Parents: a72bac2
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Mon Jul 14 14:42:32 2014 -0500
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Mon Jul 14 14:42:57 2014 -0500

----------------------------------------------------------------------
 proxy/http/HttpSM.cc | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/45a5ff5c/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 77a30c1..24acf9a 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -5960,6 +5960,8 @@ HttpSM::server_transfer_init(MIOBuffer * buf, int hdr_size)
   int64_t nbytes;
   int64_t to_copy = INT64_MAX;
 
+  ink_assert(t_state.current.server != NULL); // should have been set up if we're doing a transfer.
+
   if (server_entry->eos == true) {
     // The server has shutdown on us already so the only data
     //  we'll get is already in the buffer