Changeset 1081

Timestamp:

Jun 8, 2010, 6:04:08 AM (13 years ago)

Author:

Peter Johansson

Message:

merge patch release 0.7.4 into trunk. delta 0.7.4 - 0.7.3

Location:

trunk

Files:

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

trunk/NEWS

@@ -18 +18 @@
 svndigest 0.7.x series from
     http://dev.thep.lu.se/svndigest/svn/branches/0.7-stable
+
+Version 0.7.4 (released 8 June 2010)
+  - fixed memory bug in StatsCollection (r1075)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.7.4
 
 Version 0.7.3 (released 15 February 2010)

trunk/bin/svndigest.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2006, 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2010 Peter Johansson
+  Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -125 +125 @@
   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()) {

trunk/lib/StatsCollection.cc

@@ -4 +4 @@
   Copyright (C) 2007 Peter Johansson
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -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;
     }
-
   }
 

trunk/lib/StatsCollection.h

@@ -7 +7 @@
   Copyright (C) 2007 Peter Johansson
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -86 +87 @@
 
   private:
+    // copy not allowed
+    StatsCollection(const StatsCollection&);
+    StatsCollection& operator=(const StatsCollection&);
+
     const std::string path_;
     typedef std::map<std::string, Stats*> map;