Better handling for NULL PutBytes arg in Pnacl streaming translation thread

ppapi/native_client/src/trusted/plugin/pnacl_streaming_translate_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "native_client/src/trusted/plugin/pnacl_streaming_translate_thread.h"
 
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/pnacl_resources.h"
 #include "native_client/src/trusted/plugin/srpc_params.h"
@@ skipping 42 matching lines @@
     translate_thread_.reset(NULL);
   }
 }
 
 // Called from main thread to send bytes to the translator.
 void PnaclStreamingTranslateThread::PutBytes(std::vector<char>* bytes,
                                              int count) {
   PLUGIN_PRINTF(("PutBytes, this %p bytes %p, size %d, count %d\n", this, bytes,
                  bytes ? bytes->size(): 0, count));
   size_t buffer_size = 0;
+  // If we are done (error or not), Signal the translation thread to stop.
+  if (count <= PP_OK) {
+    NaClXMutexLock(&cond_mu_);
+    done_ = true;
+    NaClXCondVarSignal(&buffer_cond_);
+    NaClXMutexUnlock(&cond_mu_);
+    return;
+  }
+
+  CHECK(bytes != NULL);
   // Ensure that the buffer we send to the translation thread is the right size
   // (count can be < the buffer size). This can be done without the lock.
-  if (bytes != NULL && count >= 0) {
-    buffer_size = bytes->size();
-    bytes->resize(count);
-  }
+  buffer_size = bytes->size();
+  bytes->resize(count);
+
   NaClXMutexLock(&cond_mu_);
-  if (count == PP_OK || count < 0) {
-    done_ = true;
-  } else {
-    data_buffers_.push_back(std::vector<char>());
-    bytes->swap(data_buffers_.back()); // Avoid copying the buffer data.
-  }
+
+  data_buffers_.push_back(std::vector<char>());
+  bytes->swap(data_buffers_.back()); // Avoid copying the buffer data.
+
   NaClXCondVarSignal(&buffer_cond_);
   NaClXMutexUnlock(&cond_mu_);
+
   // Ensure the buffer we send back to the coordinator is the expected size
-  if (bytes != NULL) bytes->resize(buffer_size);
+  bytes->resize(buffer_size);
 }
 
 void PnaclStreamingTranslateThread::DoTranslate() {
   ErrorInfo error_info;
   nacl::scoped_ptr<NaClSubprocess> llc_subprocess(
       StartSubprocess(PnaclUrls::GetLlcUrl(), manifest_, &error_info));
   if (llc_subprocess == NULL) {
     TranslateFailed("Compile process could not be created: " +
                     error_info.message());
     return;
@@ skipping 78 matching lines @@
 }
 
 void PnaclStreamingTranslateThread::SetSubprocessesShouldDie() {
   PnaclTranslateThread::SetSubprocessesShouldDie();
   nacl::MutexLocker ml(&cond_mu_);
   done_ = true;
   NaClXCondVarSignal(&buffer_cond_);
 }
 
 } // namespace plugin