Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "net/base/fuzzed_data_provider.h" | |
| 6 | |
| 7 #include <algorithm> | |
| 8 #include <string> | |
| 9 | |
| 10 #include "base/logging.h" | |
| 11 | |
| 12 namespace net { | |
| 13 | |
| 14 FuzzedDataProvider::FuzzedDataProvider(const uint8_t* data, size_t size) | |
| 15 : remaining_data_(reinterpret_cast<const char*>(data), size), | |
| 16 unused_bits_(0), | |
| 17 num_unused_bits_(0) {} | |
| 18 | |
| 19 FuzzedDataProvider::~FuzzedDataProvider() {} | |
| 20 | |
| 21 size_t FuzzedDataProvider::ConsumeBytes(char* dest, size_t bytes) { | |
| 22 size_t bytes_to_write = std::min(bytes, remaining_data_.length()); | |
| 23 memcpy(dest, remaining_data_.data(), bytes_to_write); | |
| 24 remaining_data_ = remaining_data_.substr(bytes_to_write); | |
| 25 return bytes_to_write; | |
| 26 } | |
| 27 | |
| 28 uint32_t FuzzedDataProvider::ConsumeBits(size_t num_bits) { | |
| 29 CHECK_NE(0u, num_bits); | |
| 30 uint32_t out = 0; | |
| 31 while (num_bits > 0) { | |
| 32 if (num_unused_bits_ == 0) { | |
| 33 unused_bits_ = 0; | |
| 34 if (remaining_data_.length() > 0) { | |
|
eroman
2016/04/22 22:07:10
nit: !x.empty()
mmenke
2016/04/27 19:53:24
Done.
| |
| 35 unused_bits_ = remaining_data_.data()[remaining_data_.length() - 1]; | |
|
eroman
2016/04/22 22:07:10
Why does ConsumeBits() and ConsumeBytes() pull fro
mmenke
2016/04/25 15:09:18
For consistency. Remember that the fuzzer takes p
eroman
2016/04/25 16:07:12
OK, if you have run tests and believe this to be a
mmenke
2016/04/27 19:53:24
I have now run tests. I ran each method twice wit
| |
| 36 remaining_data_ = | |
| 37 remaining_data_.substr(0, remaining_data_.length() - 1); | |
| 38 } | |
| 39 num_unused_bits_ = 8; | |
| 40 } | |
| 41 size_t bits_to_consume = | |
| 42 num_bits <= num_unused_bits_ ? num_bits : num_unused_bits_; | |
|
eroman
2016/04/22 22:07:10
Or how about:
bits_to_consume = std::min(num_bits,
mmenke
2016/04/27 19:53:24
Now unused is a hard-coded 8, and "std::min(num_bi
| |
| 43 uint32_t new_bits = unused_bits_ & ((1 << bits_to_consume) - 1); | |
| 44 out = (out << bits_to_consume) + new_bits; | |
|
eroman
2016/04/22 22:07:10
Use | instead of +. It will be equivalent in this
mmenke
2016/04/27 19:53:24
Done.
| |
| 45 unused_bits_ >>= bits_to_consume; | |
| 46 num_unused_bits_ -= bits_to_consume; | |
| 47 num_bits -= bits_to_consume; | |
| 48 } | |
| 49 | |
| 50 return out; | |
| 51 } | |
| 52 | |
| 53 } // namespace net | |
| OLD | NEW |