use GUARD_PTR for null checks

aws · Jul 17, 2024 · f9107fd · f9107fd
1 parent 768db7d
commit f9107fd
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/crypto/ocsp/ocsp_server.c b/crypto/ocsp/ocsp_server.c
@@ -10,13 +10,17 @@
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 // Modifications Copyright Amazon.com, Inc. or its affiliates.
 
+#include "../internal.h"
 #include "internal.h"
 
 int OCSP_request_onereq_count(OCSP_REQUEST *req) {
+  GUARD_PTR(req);
+  GUARD_PTR(req->tbsRequest);
   return (int)sk_OCSP_ONEREQ_num(req->tbsRequest->requestList);
 }
 
 OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i) {
+  GUARD_PTR(req);
   return sk_OCSP_ONEREQ_value(req->tbsRequest->requestList, i);
 }
 
@@ -42,16 +46,15 @@ int OCSP_id_get0_info(ASN1_OCTET_STRING **nameHash, ASN1_OBJECT **algor,
 }
 
 int OCSP_request_is_signed(OCSP_REQUEST *req) {
+  GUARD_PTR(req);
   if (req->optionalSignature != NULL) {
     return 1;
   }
   return 0;
 }
 
 OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one) {
-  if(one == NULL) {
-    return NULL;
-  }
+  GUARD_PTR(one);
   return one->reqCert;
 }