summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Smith <jake.smith@hdfgroup.org>2020-02-10 22:58:50 (GMT)
committerJake Smith <jake.smith@hdfgroup.org>2020-02-10 22:58:50 (GMT)
commitbd5d6e4e772fe557ab52f881df17f73a4028184b (patch)
treee641b399ecbbc13fc77b2c094a6bea06a4b46d1d
parentd19d5e7629cbba8485c954450c2172ac42c815c5 (diff)
parent3aeb449b43bcb38d0e61c6a7a6b1dacfc2a4b935 (diff)
downloadhdf5-bd5d6e4e772fe557ab52f881df17f73a4028184b.zip
hdf5-bd5d6e4e772fe557ab52f881df17f73a4028184b.tar.gz
hdf5-bd5d6e4e772fe557ab52f881df17f73a4028184b.tar.bz2
Merge pull request #2359 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:hdf5_1_10 to hdf5_1_10
* commit '3aeb449b43bcb38d0e61c6a7a6b1dacfc2a4b935': Fix improper signing key null check. (HDFFV-11015)
-rw-r--r--src/H5FDs3comms.c4
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");
}