From d04af0042e7bfa70a010f79b9595cf47aedf8cd0 Mon Sep 17 00:00:00 2001
From: Ian Benz <ianbenz@google.com>
Date: Tue, 8 Nov 2022 13:44:48 -0800
Subject: [PATCH] Prevent oemcrypto_opk_report_usage_fuzz abort

Merge from Widevine repo of http://go/wvgerrit/158204

Prevent abort, interpreted as a crash by libFuzzer, when
OEMCrypto_CreateUsageTableHeader fails session state checks due to being
called after OEMCrypto_GenerateNonce.

Bug: 250682470
Test: tested with http://go/ag/20420224

Change-Id: Ia15b8c26fb391a190c32115e398a78ff9f8a7e16
---
 .../oemcrypto/test/fuzz_tests/oemcrypto_report_usage_fuzz.cc    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_report_usage_fuzz.cc b/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_report_usage_fuzz.cc
index 3b3813a8..03fcffda 100644
--- a/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_report_usage_fuzz.cc
+++ b/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_report_usage_fuzz.cc
@@ -22,8 +22,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   Session* session = entry.license_messages().session();
   session->open();
   entry.InstallTestRSAKey(session);
-  session->GenerateNonce();
   session->CreateNewUsageEntry();
+  session->GenerateNonce();
   vector<uint8_t> encrypted_usage_header;
   session->UpdateUsageEntry(&encrypted_usage_header);
   // Sets pst for usage entry.