check for null headers in header callback

sbiscigl · sbiscigl · commit 04650250c3e3 · 2025-12-17T10:27:57.000-05:00
diff --git a/generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp b/generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp
@@ -510,7 +510,7 @@ int S3CrtClient::S3CrtRequestHeadersCallback(struct aws_s3_meta_request* meta_re
                                              int response_status, void* user_data) {
   AWS_UNREFERENCED_PARAM(meta_request);
   auto* userData = static_cast<S3CrtClient::CrtRequestCallbackUserData*>(user_data);
-  if (!userData || !userData->response || !userData->originalRequest) {
+  if (!userData || !userData->response || !userData->originalRequest || !headers) {
     return AWS_OP_ERR;
   }
 
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm
@@ -21,7 +21,7 @@ int S3CrtClient::S3CrtRequestHeadersCallback(struct aws_s3_meta_request *meta_re
 {
   AWS_UNREFERENCED_PARAM(meta_request);
   auto *userData = static_cast<S3CrtClient::CrtRequestCallbackUserData*>(user_data);
-  if (!userData || !userData->response || !userData->originalRequest) {
+  if (!userData || !userData->response || !userData->originalRequest || !headers) {
     return AWS_OP_ERR;
   }
 
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm
@@ -21,7 +21,7 @@ int S3CrtClient::S3CrtRequestHeadersCallback(struct aws_s3_meta_request *meta_re
 {
   AWS_UNREFERENCED_PARAM(meta_request);
   auto *userData = static_cast<S3CrtClient::CrtRequestCallbackUserData*>(user_data);
-  if (!userData || !userData->response || !userData->originalRequest) {
+  if (!userData || !userData->response || !userData->originalRequest || !headers) {
     return AWS_OP_ERR;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ int S3CrtClient::S3CrtRequestHeadersCallback(struct aws_s3_meta_request* meta_re`
`510`	`510`	`int response_status, void* user_data) {`
`511`	`511`	`AWS_UNREFERENCED_PARAM(meta_request);`
`512`	`512`	`auto* userData = static_cast<S3CrtClient::CrtRequestCallbackUserData*>(user_data);`
`513`		`- if (!userData \|\| !userData->response \|\| !userData->originalRequest) {`
	`513`	`+ if (!userData \|\| !userData->response \|\| !userData->originalRequest \|\| !headers) {`
`514`	`514`	`return AWS_OP_ERR;`
`515`	`515`	`}`
`516`	`516`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ int S3CrtClient::S3CrtRequestHeadersCallback(struct aws_s3_meta_request *meta_re`
`21`	`21`	`{`
`22`	`22`	`AWS_UNREFERENCED_PARAM(meta_request);`
`23`	`23`	`auto userData = static_cast<S3CrtClient::CrtRequestCallbackUserData>(user_data);`
`24`		`- if (!userData \|\| !userData->response \|\| !userData->originalRequest) {`
	`24`	`+ if (!userData \|\| !userData->response \|\| !userData->originalRequest \|\| !headers) {`
`25`	`25`	`return AWS_OP_ERR;`
`26`	`26`	`}`
`27`	`27`