Make string_util::WriteInto() DCHECK() that the supplied |length_with_null| > 1, meaning that the...

net/base/net_util.cc

 // Copyright (c) 2011 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 "net/base/net_util.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 
@@ skipping 191 matching lines @@
     } else {
       return false;
     }
     ++it;
   }
   output->swap(temp);
   return true;
 }
 
 enum RFC2047EncodingType {Q_ENCODING, B_ENCODING};
-bool DecodeBQEncoding(const std::string& part, RFC2047EncodingType enc_type,
-                       const std::string& charset, std::string* output) {
+bool DecodeBQEncoding(const std::string& part,
+                      RFC2047EncodingType enc_type,
+                      const std::string& charset,
+                      std::string* output) {
+  DCHECK(!part.empty());  // TODO(pkasting): Not sure about this.
   std::string decoded;
   if (enc_type == B_ENCODING) {
     if (!base::Base64Decode(part, &decoded)) {
       return false;
     }
   } else {
     if (!QPDecode(part, &decoded)) {
       return false;
     }
   }
+  DCHECK(!decoded.empty());
 
   UErrorCode err = U_ZERO_ERROR;
   UConverter* converter(ucnv_open(charset.c_str(), &err));
   if (U_FAILURE(err)) {
     return false;
   }
 
   // A single byte in a legacy encoding can be expanded to 3 bytes in UTF-8.
   // A 'two-byte character' in a legacy encoding can be expanded to 4 bytes
   // in UTF-8. Therefore, the expansion ratio is 3 at most.
@@ skipping 2217 matching lines @@
 
 NetworkInterface::NetworkInterface(const std::string& name,
                                    const IPAddressNumber& address)
     : name(name), address(address) {
 }
 
 NetworkInterface::~NetworkInterface() {
 }
 
 }  // namespace net