Additional fix for bug 432260. r=nelson

1 files changed, 6 insertions, 6 deletions

diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c
index 7b05fef1b..9e1072a96 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c
@@ -309,6 +309,7 @@ pkix_pl_HttpDefaultClient_HdrCheckComplete(
              /* set available number of bytes in the buffer */
              client->capacity = contentLength;
              client->connectStatus = HTTP_RECV_BODY;
+             *pKeepGoing = PKIX_TRUE;
              break;
  
          default:
@@ -324,10 +325,10 @@ pkix_pl_HttpDefaultClient_HdrCheckComplete(
               */
              if (client->filledupBytes < contentLength) {
                  client->connectStatus = HTTP_RECV_BODY;
+                 *pKeepGoing = PKIX_TRUE;
              } else {
                  client->connectStatus = HTTP_COMPLETE;
                  *pKeepGoing = PKIX_FALSE;
-                 goto cleanup;
              }
          }
  
@@ -346,9 +347,6 @@ pkix_pl_HttpDefaultClient_HdrCheckComplete(
          PKIX_CHECK(PKIX_PL_Free(client->rcvBuf, plContext),
                     PKIX_FREEFAILED);
          client->rcvBuf = body;
- 
-
-        *pKeepGoing = PKIX_TRUE;
 
 cleanup:
 
@@ -478,8 +476,10 @@ pkix_pl_HttpDefaultClient_Destroy(
 
         client = (PKIX_PL_HttpDefaultClient *)object;
 
-        PKIX_PL_Free(client->rcvHeaders, plContext);
-        client->rcvHeaders = NULL;
+        if (client->rcvHeaders) {
+            PKIX_PL_Free(client->rcvHeaders, plContext);
+            client->rcvHeaders = NULL;
+        }
 
         if (client->GETBuf != NULL) {
                 PR_smprintf_free(client->GETBuf);