Changeset 1075

Timestamp:

Jun 7, 2010, 5:57:58 AM (13 years ago)

Author:

Peter Johansson

Message:

Fixes severe bug that we allowed copy construction of StatsCollection?
(compiler generated), which involved copying of pointers, which were
deleted in destructor, i.e., we allowed multiple deletion.

Location:

branches/0.7-stable

Files:

• bin/svndigest.cc (modified) (1 diff)
• lib/StatsCollection.cc (modified) (1 diff)
• lib/StatsCollection.h (modified) (1 diff)

branches/0.7-stable/bin/svndigest.cc

@@ -152 +152 @@
   if (option->verbose())
     std::cout << "Parsing directory tree" << std::endl;
-  StatsCollection stats(tree->parse(option->verbose(), option->ignore_cache()));
+  const StatsCollection& stats(tree->parse(option->verbose(), 
+                                           option->ignore_cache()));
 
   if (option->report()) {

branches/0.7-stable/lib/StatsCollection.cc

@@ -51 +51 @@
   StatsCollection::~StatsCollection(void)
   {
-    for (map::const_iterator i(stats_.begin()); i!=stats_.end(); ++i) {
+    for (map::iterator i(stats_.begin()); i!=stats_.end(); ++i) {
       assert(i->second);
       delete i->second;
+      i->second = NULL;
     }
-
   }
 

branches/0.7-stable/lib/StatsCollection.h

@@ -86 +86 @@
 
   private:
+    // copy not allowed
+    StatsCollection(const StatsCollection&);
+    StatsCollection& operator=(const StatsCollection&);
+
     const std::string path_;
     typedef std::map<std::string, Stats*> map;