diff options
| author | Jake Smith <jake.smith@hdfgroup.org> | 2020-02-10 22:57:33 (GMT) |
|---|---|---|
| committer | Jake Smith <jake.smith@hdfgroup.org> | 2020-02-10 22:57:33 (GMT) |
| commit | 444a666f1d04a310543bd7dd85ffe39f0986d6e2 (patch) | |
| tree | e4bcd292f6d945155503a8768e7057c06795fc39 | |
| parent | ae8091f5683a79b4f51c5729dd344d587bd99011 (diff) | |
| parent | 6a93d1f834184853913d43e50fda5b350fa1dc38 (diff) | |
| download | hdf5-444a666f1d04a310543bd7dd85ffe39f0986d6e2.zip hdf5-444a666f1d04a310543bd7dd85ffe39f0986d6e2.tar.gz hdf5-444a666f1d04a310543bd7dd85ffe39f0986d6e2.tar.bz2 | |
Merge pull request #2357 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:develop to develop
* commit '6a93d1f834184853913d43e50fda5b350fa1dc38':
Fix improper S3 signing key null check (HDFFV-11015).
| -rw-r--r-- | src/H5FDs3comms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c index f08e9d5..d9d4c88 100644 --- a/src/H5FDs3comms.c +++ b/src/H5FDs3comms.c @@ -1202,7 +1202,7 @@ H5FD_s3comms_s3r_open(const char *url, if ((region != NULL && *region != '\0') || (id != NULL && *id != '\0') || - (signing_key != NULL && *signing_key != '\0')) + (signing_key != NULL)) { /* if one exists, all three must exist */ @@ -1214,7 +1214,7 @@ H5FD_s3comms_s3r_open(const char *url, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "secret id cannot be null.\n"); } - if (signing_key == NULL || signing_key[0] == '\0') { + if (signing_key == NULL) { HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "signing key cannot be null.\n"); } |