Fixing potential memory leak in BookmarkCodec::DecodeNode....

chrome/browser/bookmarks/bookmark_codec.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "chrome/browser/bookmarks/bookmark_codec.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 161 matching lines @@
       return false;
 
     DecodeNode(*static_cast<DictionaryValue*>(child_value), parent, NULL);
   }
   return true;
 }
 
 bool BookmarkCodec::DecodeNode(const DictionaryValue& value,
                                BookmarkNode* parent,
                                BookmarkNode* node) {
+  // If no |node| is specified, we'll create one and add it to the |parent|.
+  // Therefore, in that case, |parent| must be non-NULL.
+  if (!node && !parent) {
+    NOTREACHED();
+    return false;
+  }
+
   std::string id_string;
   int64 id = 0;
   if (!value.GetString(kIdKey, &id_string) || !StringToInt64(id_string, &id))
     ids_missing_ = true;
 
   maximum_id_ = std::max(maximum_id_, id);
 
   std::wstring title;
   value.GetString(kNameKey, &title);
 
   std::wstring date_added_string;
   if (!value.GetString(kDateAddedKey, &date_added_string))
     date_added_string = Int64ToWString(Time::Now().ToInternalValue());
 
   std::wstring type_string;
   if (!value.GetString(kTypeKey, &type_string))
     return false;
 
   if (type_string != kTypeURL && type_string != kTypeFolder)
     return false;  // Unknown type.
 
   if (type_string == kTypeURL) {
     std::wstring url_string;
     if (!value.GetString(kURLKey, &url_string))
       return false;
 
     if (!node)
       node = new BookmarkNode(id, GURL(WideToUTF8(url_string)));
     else
-      return false; // Node invalid.
+      return false;  // Node invalid.
 
     if (parent)
       parent->Add(parent->GetChildCount(), node);
     node->SetType(BookmarkNode::URL);
     UpdateChecksumWithUrlNode(id_string, title, url_string);
   } else {
     std::wstring last_modified_date;
     if (!value.GetString(kDateModifiedKey, &last_modified_date))
       last_modified_date = Int64ToWString(Time::Now().ToInternalValue());
 
@@ skipping 71 matching lines @@
 
 void BookmarkCodec::InitializeChecksum() {
   MD5Init(&md5_context_);
 }
 
 void BookmarkCodec::FinalizeChecksum() {
   MD5Digest digest;
   MD5Final(&digest, &md5_context_);
   computed_checksum_ = MD5DigestToBase16(digest);
 }