diff options
| author | Jake Smith <jake.smith@hdfgroup.org> | 2020-03-01 05:39:36 (GMT) |
|---|---|---|
| committer | Jake Smith <jake.smith@hdfgroup.org> | 2020-03-01 05:39:36 (GMT) |
| commit | ce16f035286117a41d257d1ee3df6ee833960c9f (patch) | |
| tree | 641c913384253a7bbee2569c88c296cc1b10c72a /src | |
| parent | 176a7a86597d78b5cc9042449c8110a0b980c78f (diff) | |
| parent | 46f0de82c7674a28b08e4da3b0149c793b762203 (diff) | |
| download | hdf5-ce16f035286117a41d257d1ee3df6ee833960c9f.zip hdf5-ce16f035286117a41d257d1ee3df6ee833960c9f.tar.gz hdf5-ce16f035286117a41d257d1ee3df6ee833960c9f.tar.bz2 | |
Merge pull request #2425 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:hdf5_1_12 to hdf5_1_12
* commit '46f0de82c7674a28b08e4da3b0149c793b762203':
Fix improper signing key null check. (HDFFV-11015)
Add updates from develop, PR 1958.
Diffstat (limited to 'src')
| -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"); } |