gdata: Fix a leak from GDataEntry::FromProtoString()

chrome/browser/chromeos/gdata/gdata_files.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 "chrome/browser/chromeos/gdata/gdata_files.h"
 
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "base/platform_file.h"
@@ skipping 716 matching lines @@
 
 // static
 scoped_ptr<GDataEntry> GDataEntry::FromProtoString(
     const std::string& serialized_proto) {
   // First try to parse as GDataDirectoryProto. Note that this can succeed for
   // a serialized_proto that's really a GDataFileProto - we have to check
   // is_directory to be sure.
   GDataDirectoryProto dir_proto;
   bool ok = dir_proto.ParseFromString(serialized_proto);
   if (ok && dir_proto.gdata_entry().file_info().is_directory()) {
-    GDataDirectory* dir = new GDataDirectory(NULL, NULL);
+    scoped_ptr<GDataDirectory> dir(new GDataDirectory(NULL, NULL));
     if (!dir->FromProto(dir_proto))
       return scoped_ptr<GDataEntry>(NULL);
-    return scoped_ptr<GDataEntry>(dir);
+    return scoped_ptr<GDataEntry>(dir.release());

[achuithb, 2012/07/10 23:09:02]

I think you can return dir.Pass() in both cases, ie, don't need the if stmt?

[satorux1, 2012/07/10 23:25:04]

If FromProto() failed, we should return NULL.

Note that dir.Pass() doesn't work as dir is scoped_ptr<GDataDirectory> but we
should return scoped_ptr<GDataEntry>

[achuithb, 2012/07/10 23:29:15]

Ah, that's unfortunate. I believe there's a way to cast scoped_ptr but not worth
it.

   }
 
   GDataFileProto file_proto;
   ok = file_proto.ParseFromString(serialized_proto);
   if (ok) {
     DCHECK(!file_proto.gdata_entry().file_info().is_directory());
-    GDataFile* file = new GDataFile(NULL, NULL);
+    scoped_ptr<GDataFile> file(new GDataFile(NULL, NULL));
     if (!file->FromProto(file_proto))
       return scoped_ptr<GDataEntry>(NULL);
-    return scoped_ptr<GDataEntry>(file);
+    return scoped_ptr<GDataEntry>(file.release());

[achuithb, 2012/07/10 23:09:02]

same

   }
   return scoped_ptr<GDataEntry>(NULL);
 }
 
 void GDataRootDirectory::SerializeToString(
     std::string* serialized_proto) const {
   GDataRootDirectoryProto proto;
   ToProto(&proto);
   const bool ok = proto.SerializeToString(serialized_proto);
   DCHECK(ok);
 }
 
 bool GDataRootDirectory::ParseFromString(const std::string& serialized_proto) {
   GDataRootDirectoryProto proto;
   if (!proto.ParseFromString(serialized_proto))
     return false;
 
   if (!FromProto(proto))
     return false;
 
   set_origin(FROM_CACHE);
   return true;
 }
 
 }  // namespace gdata