From e671dfc4a9ea6b63e0e4ad5aa03ee4ae039c9780 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Fri, 20 Jun 2014 19:41:34 +0000
Subject: [PATCH] Fixed a bad bug in deepStdVectorPointerCopy

Cherry-pick of trunk r2944.
---
 include/cantera/base/utilities.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/cantera/base/utilities.h b/include/cantera/base/utilities.h
index f6a3eba40..8506e1c27 100644
--- a/include/cantera/base/utilities.h
+++ b/include/cantera/base/utilities.h
@@ -667,13 +667,17 @@ template<class D>
 void deepStdVectorPointerCopy(const std::vector<D*> &fromVec, std::vector<D*> &toVec)
 {
     size_t is = toVec.size();
-    for (size_t i = 0; i < is; is++) {
+    for (size_t i = 0; i < is; i++) {
         delete toVec[i];
     }
     is = fromVec.size();
     toVec.resize(is);
-    for (size_t i = 0; i < is; is++) {
-        toVec[i] = new D(*(fromVec[i]));
+    for (size_t i = 0; i < is; i++) {
+        if (fromVec[i]) {
+            toVec[i] = new D(*(fromVec[i]));
+        } else {
+            toVec[i] = 0;
+        }
     }
 }