Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: crypto/encryptor.cc

Issue 8511050: Unify the error checking of crypto::Encryptor and add WARN_UNUSED_RESULT to prevent misuse. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: crypto/encryptor.cc
diff --git a/crypto/encryptor.cc b/crypto/encryptor.cc
index 763dc2c1cb54764ab2428054f9585616f6decdde..0aa706c9b4c14d017295f90fbc00957df99e9e1e 100644
--- a/crypto/encryptor.cc
+++ b/crypto/encryptor.cc
@@ -88,13 +88,13 @@ bool Encryptor::SetCounter(const base::StringPiece& counter) {
bool Encryptor::GenerateCounterMask(size_t plaintext_len,
uint8* mask,
size_t* mask_len) {
- DCHECK_EQ(CTR, mode_);
- CHECK(mask);
- CHECK(mask_len);
+ if (!mask || !mask_len || mode_ != CTR)
+ return false;
const size_t kBlockLength = counter_->GetLengthInBytes();
size_t blocks = (plaintext_len + kBlockLength - 1) / kBlockLength;
- CHECK(blocks);
+ if (blocks == 0)
+ return false;
*mask_len = blocks * kBlockLength;
« no previous file with comments | « crypto/encryptor.h ('k') | crypto/encryptor_mac.cc » ('j') | crypto/encryptor_mac.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698