merged with trunk so I can build again...

(bzr r10092.1.36)

1 files changed, 10 insertions, 3 deletions

diff --git a/buildtool.cpp b/buildtool.cpp
index 2b4307ab0..7d2ca7912 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -3139,7 +3139,7 @@ public:
             val = iter->second;
         String sval;
         if (!getSubstitutions(val, sval))
-            return false;
+            return String();
         return sval;
         }
 
@@ -6982,8 +6982,14 @@ public:
                 }
             //## Make sure destination directory exists
             if (!createDirectory(destPath))
+            {
+                if (f)
+                {
+                fclose(f);
+                }
                 return false;
-                
+            }
+			
             //## Check whether it needs to be done
             String destName;
             if (destPath.size()>0)
@@ -9793,7 +9799,8 @@ bool Make::parsePropertyFile(const String &fileName,
             {
             error("property file %s, line %d: expected keyword",
                     fileName.c_str(), linenr);
-            return false;
+            fclose(f);
+			return false;
             }
         if (prefix.size() > 0)
             {