OCSPTrySendAndReceive should always set *http_response_data_len, even on...

net/ocsp/nss_ocsp.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ocsp/nss_ocsp.h"
 
 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424
 // until NSS 3.12.2 comes out and we update to it.
 #define Lock FOO_NSS_Lock
 #include <certt.h>
@@ skipping 405 matching lines @@
                      const char** http_response_content_type,
                      const char** http_response_headers,
                      const char** http_response_data,
                      PRUint32* http_response_data_len) {
   DCHECK(req->Finished());
   const std::string& data = req->http_response_data();
   if (http_response_data_len && *http_response_data_len) {
     if (*http_response_data_len < data.size()) {
       LOG(ERROR) << "data size too large: " << *http_response_data_len
                  << " < " << data.size();
-      *http_response_data_len = 1;
+      *http_response_data_len = data.size();
       return false;
     }
   }
   LOG(INFO) << "OCSP response "
             << " response_code=" << req->http_response_code()
             << " content_type=" << req->http_response_content_type()
             << " header=" << req->http_response_headers()
             << " data_len=" << data.size();
   if (http_response_code)
     *http_response_code = req->http_response_code();
   if (http_response_content_type)
     *http_response_content_type = req->http_response_content_type().c_str();
   if (http_response_headers)
     *http_response_headers = req->http_response_headers().c_str();
   if (http_response_data)
     *http_response_data = data.data();
   if (http_response_data_len)
     *http_response_data_len = data.size();
   return true;
 }
 
 SECStatus OCSPTrySendAndReceive(SEC_HTTP_REQUEST_SESSION request,
                                 PRPollDesc** pPollDesc,
                                 PRUint16* http_response_code,
                                 const char** http_response_content_type,
                                 const char** http_response_headers,
                                 const char** http_response_data,
                                 PRUint32* http_response_data_len) {
-  LOG(INFO) << "OCSP try start and receive";
+  LOG(INFO) << "OCSP try send and receive";
   DCHECK(!MessageLoop::current());
   OCSPRequestSession* req = reinterpret_cast<OCSPRequestSession*>(request);
   // We support blocking mode only.
   if (pPollDesc)
     *pPollDesc = NULL;
 
   if (req->Started() || req->Finished()) {
     // We support blocking mode only, so this function shouldn't be called
     // again when req has stareted or finished.
     NOTREACHED();
-    return SECFailure;
+    goto failed;
   }
   req->Start();
   if (!req->Wait())
-    return SECFailure;
+    goto failed;
 
   // If the response code is -1, the request failed and there is no response.
   if (req->http_response_code() == static_cast<PRUint16>(-1))
-    return SECFailure;
+    goto failed;
 
   return OCSPSetResponse(
       req, http_response_code,
       http_response_content_type,
       http_response_headers,
       http_response_data,
       http_response_data_len) ? SECSuccess : SECFailure;
+
+failed:
+  if (http_response_data_len) {
+    // We must always set an output value, even on failure.  The output value 0
+    // means the failure was unrelated to the acceptable response data length.
+    *http_response_data_len = 0;
+  }
+  return SECFailure;
 }
 
 SECStatus OCSPFree(SEC_HTTP_REQUEST_SESSION request) {
   LOG(INFO) << "OCSP free";
   DCHECK(!MessageLoop::current());
   OCSPRequestSession* req = reinterpret_cast<OCSPRequestSession*>(request);
   req->Cancel();
   req->Release();
   return SECSuccess;
 }
@@ skipping 24 matching lines @@
 void EnsureOCSPInit() {
   Singleton<OCSPInitSingleton>::get();
 }
 
 // This function would be called before NSS initialization.
 void SetURLRequestContextForOCSP(URLRequestContext* request_context) {
   OCSPInitSingleton::set_url_request_context(request_context);
 }
 
 }  // namespace net