From 63a948115fb58a33348f88f776cd000c880cbb7c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 25 Oct 2017 10:21:30 +0200 Subject: [PATCH] Bug 1411500, Check return values in cryptohi_unittest.cc, r=fkiefer --HG-- extra : amend_source : 71a51ef73ca0e74affff38a46771fb53c14fe454 --- gtests/cryptohi_gtest/cryptohi_unittest.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gtests/cryptohi_gtest/cryptohi_unittest.cc b/gtests/cryptohi_gtest/cryptohi_unittest.cc index 6f79bdd048..ab553ee012 100644 --- a/gtests/cryptohi_gtest/cryptohi_unittest.cc +++ b/gtests/cryptohi_gtest/cryptohi_unittest.cc @@ -37,7 +37,9 @@ class SignParamsTestF : public ::testing::Test { SECOidData *oidData; oidData = SECOID_FindOIDByTag(SEC_OID_CURVE25519); ASSERT_NE(nullptr, oidData); - SECITEM_AllocItem(NULL, &ecParams, (2 + oidData->oid.len)); + ASSERT_NE(nullptr, + SECITEM_AllocItem(NULL, &ecParams, (2 + oidData->oid.len))) + << "Couldn't allocate memory for OID."; ecParams.data[0] = SEC_ASN1_OBJECT_ID; /* we have to prepend 0x06 */ ecParams.data[1] = oidData->oid.len; memcpy(ecParams.data + 2, oidData->oid.data, oidData->oid.len); @@ -67,7 +69,9 @@ class SignParamsTestF : public ::testing::Test { SECAlgorithmID maskHashAlg; PORT_Memset(&maskHashAlg, 0, sizeof(maskHashAlg)); - SECOID_SetAlgorithmID(arena_.get(), &maskHashAlg, maskHashAlgTag, NULL); + SECStatus rv = + SECOID_SetAlgorithmID(arena_.get(), &maskHashAlg, maskHashAlgTag, NULL); + ASSERT_EQ(SECSuccess, rv); SECItem *maskHashAlgItem = SEC_ASN1EncodeItem(arena_.get(), NULL, &maskHashAlg, @@ -77,8 +81,8 @@ class SignParamsTestF : public ::testing::Test { arena_.get(), sizeof(SECAlgorithmID)); ASSERT_NE(nullptr, params->maskAlg); - SECStatus rv = SECOID_SetAlgorithmID(arena_.get(), params->maskAlg, - SEC_OID_PKCS1_MGF1, maskHashAlgItem); + rv = SECOID_SetAlgorithmID(arena_.get(), params->maskAlg, + SEC_OID_PKCS1_MGF1, maskHashAlgItem); ASSERT_EQ(SECSuccess, rv); }