From 8a0e8dd74ce642ed92081902cc5b5a7b2e6e8084 Mon Sep 17 00:00:00 2001 From: sbiscigl Date: Wed, 17 Dec 2025 10:10:41 -0500 Subject: [PATCH] check for null headers in header callback --- generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp | 2 +- .../velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm | 2 +- .../velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp b/generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp index efefb5b03f1..9c628d70ea3 100644 --- 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(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 index 4cea67b9cdc..a6a0f973713 100644 --- 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(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 index c59c4efd3a7..b6d8e676707 100644 --- 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(user_data); - if (!userData || !userData->response || !userData->originalRequest) { + if (!userData || !userData->response || !userData->originalRequest || !headers) { return AWS_OP_ERR; }