This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 5a4e0715bd679f620bd55ab4c42695fc02d0c761
Author: scw00 <[email protected]>
AuthorDate: Sat Apr 22 13:31:55 2017 +0800

    obj_found is never be true
    
    (cherry picked from commit 28a6101cb3360ff1d654ed88f4ce50767b569724)
---
 proxy/hdrs/HdrHeap.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/hdrs/HdrHeap.cc b/proxy/hdrs/HdrHeap.cc
index 7a35625..46af6ca 100644
--- a/proxy/hdrs/HdrHeap.cc
+++ b/proxy/hdrs/HdrHeap.cc
@@ -861,7 +861,7 @@ HdrHeap::check_marshalled(uint32_t buf_length)
 int
 HdrHeap::unmarshal(int buf_length, int obj_type, HdrHeapObjImpl **found_obj, 
RefCountObj *block_ref)
 {
-  bool obj_found = false;
+  *found_obj = nullptr;
 
   // Check out this heap and make sure it is OK
   if (m_magic != HDR_BUF_MAGIC_MARSHALED) {
@@ -929,7 +929,7 @@ HdrHeap::unmarshal(int buf_length, int obj_type, 
HdrHeapObjImpl **found_obj, Ref
     HdrHeapObjImpl *obj = (HdrHeapObjImpl *)obj_data;
     ink_assert(obj_is_aligned(obj));
 
-    if (obj->m_type == (unsigned)obj_type && obj_found == false) {
+    if (obj->m_type == (unsigned)obj_type && *found_obj == nullptr) {
       *found_obj = obj;
     }
 

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to