aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-10-06 11:05:15 +0200
committermarha <marha@users.sourceforge.net>2011-10-06 11:05:15 +0200
commitab941773990635d79adb5b1ae16a008d7b2ed1ff (patch)
treebe862b3b43f8cf5c216d9b82b4453de7b3b46faa
parent471b2db241070bf447bef9e897d6650b39a59b8f (diff)
downloadvcxsrv-ab941773990635d79adb5b1ae16a008d7b2ed1ff.tar.gz
vcxsrv-ab941773990635d79adb5b1ae16a008d7b2ed1ff.tar.bz2
vcxsrv-ab941773990635d79adb5b1ae16a008d7b2ed1ff.zip
Solved possible crash
-rw-r--r--tools/mhmake/src/commandqueue.cpp7
-rw-r--r--tools/mhmake/src/util.h2
2 files changed, 2 insertions, 7 deletions
diff --git a/tools/mhmake/src/commandqueue.cpp b/tools/mhmake/src/commandqueue.cpp
index d2d462df6..45a1d1043 100644
--- a/tools/mhmake/src/commandqueue.cpp
+++ b/tools/mhmake/src/commandqueue.cpp
@@ -267,16 +267,11 @@ bool commandqueue::StartExecuteCommands(fileinfo* pTarget)
pActiveEntry->pTarget=pTarget;
pActiveEntry->CurrentCommandIt=CommandIt;
- while (1)
+ while (pActiveEntry->CurrentCommandIt!=pRule->GetCommands().end())
{
if (StartExecuteNextCommand(pActiveEntry, &ActiveProcess))
{
pActiveEntry->CurrentCommandIt++;
- if (pActiveEntry->CurrentCommandIt==pRule->GetCommands().end())
- {
- // All commands executed
- break;
- }
}
else
{
diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h
index 342ec8c8a..333e36b00 100644
--- a/tools/mhmake/src/util.h
+++ b/tools/mhmake/src/util.h
@@ -50,7 +50,7 @@
#define PLATFORM "linux"
#endif
-#define MHMAKEVER "3.0.5"
+#define MHMAKEVER "3.0.7"
class makecommand
{