Source release 17.1.2

oemcrypto/test/fuzz_tests/oemcrypto_renewal_request_fuzz.cc

@@ -2,26 +2,26 @@
 // source code may only be used and distributed under the Widevine
 // License Agreement.
 
+#include <vector>
+
 #include "oemcrypto_fuzz_helper.h"
 #include "oemcrypto_fuzz_structs.h"
 
-namespace wvoec {
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  // Redirect printf and log statements from oemcrypto functions to a file to
-  // reduce noise
-  RedirectStdoutToFile();
+  wvoec::RedirectStdoutToFile();
+
   // If input size is less than fuzz data structure, reject the input.
-  if (size < sizeof(OEMCrypto_Request_Fuzz)) {
+  if (size < sizeof(wvoec::OEMCrypto_Request_Fuzz)) {
     return 0;
   }
   // Input for renewal request API will be modified by OEMCrypto, hence it
   // cannot be a const. Fuzzer complains if const identifier is removed of data,
   // hence copying data into a non const pointer.
-  uint8_t* input = new uint8_t[size];
-  memcpy(input, data, size);
-  OEMCryptoRenewalAPIFuzz renewal_api_fuzz;
-  renewal_api_fuzz.renewal_messages().InjectFuzzedRequestData(input, size);
-  delete[] input;
+  std::vector<uint8_t> input(data, data + size);
+  wvoec::OEMCryptoRenewalAPIFuzz renewal_api_fuzz;
+  renewal_api_fuzz.Initialize();
+  renewal_api_fuzz.renewal_messages().InjectFuzzedRequestData(input.data(),
+                                                              input.size());
+  renewal_api_fuzz.Terminate();
   return 0;
 }
-}  // namespace wvoec