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)
This commit is contained in:
Jake Smith
2020-02-10 16:58:50 -06:00

View File

@@ -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");
}