commit 4eb1779101686c864aac0ad504b61ee1d5c4a4a8
author Greg Kaiser <gkaiser@google.com> Fri Apr 06 14:26:23 2018 -0700
committer Greg Kaiser <gkaiser@google.com> Fri Apr 06 14:38:06 2018 -0700
tree 1bd0dcf4d6c8ba044f8836ddd737cb272ddf0813
parent faa7b29f1e0c311e42ab5a265cb1b17036ca5a10

patchoat: Move nullptr CHECK

We now check 'out' for nullptr prior to dereferencing it.

Test: Treehugger
Change-Id: I4b0f871a24894107b895789a1b73b95847438dcc

patchoat/patchoat.cc

diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc
index b9a9a69..dc9d990 100644
--- a/patchoat/patchoat.cc
+++ b/patchoat/patchoat.cc
@@ -700,6 +700,7 @@
 }
 
 bool PatchOat::WriteImage(File* out) {
+  CHECK(out != nullptr);
   TimingLogger::ScopedTiming t("Writing image File", timings_);
   std::string error_msg;
 
@@ -709,7 +710,6 @@
                                             true /* read_only_mode */, &error_msg);
 
   CHECK(image_ != nullptr);
-  CHECK(out != nullptr);
   size_t expect = image_->Size();
   if (out->WriteFully(reinterpret_cast<char*>(image_->Begin()), expect) &&
       out->SetLength(expect) == 0) {