Make sure to null terminate argument lists!

llvm-svn: 20166

2 files changed, 4 insertions, 1 deletions

diff --git a/llvm/tools/gccld/GenerateCode.cpp b/llvm/tools/gccld/GenerateCode.cpp
index b189d0654f5..1d4c5205cff 100644
--- a/llvm/tools/gccld/GenerateCode.cpp
+++ b/llvm/tools/gccld/GenerateCode.cpp
@@ -247,6 +247,7 @@ int llvm::GenerateAssembly(const std::string &OutputFilename,
   args.push_back("-o");
   args.push_back(OutputFilename.c_str());
   args.push_back(InputFilename.c_str());
+  args.push_back(0);
 
   return sys::Program::ExecuteAndWait(llc, &args[0]);
 }
@@ -263,6 +264,7 @@ int llvm::GenerateCFile(const std::string &OutputFile,
   args.push_back("-o");
   args.push_back(OutputFile.c_str());
   args.push_back(InputFile.c_str());
+  args.push_back(0);
   return sys::Program::ExecuteAndWait(llc, &args[0]);
 }
 
@@ -322,6 +324,7 @@ int llvm::GenerateNative(const std::string &OutputFilename,
       args.push_back(Libraries[index].c_str());
     }
   }
+  args.push_back(0);
 
   // Run the compiler to assembly and link together the program.
   return sys::Program::ExecuteAndWait(gcc, &args[0], (const char**)clean_env);
diff --git a/llvm/tools/gccld/gccld.cpp b/llvm/tools/gccld/gccld.cpp
index 809db2adacc..00cf6571927 100644
--- a/llvm/tools/gccld/gccld.cpp
+++ b/llvm/tools/gccld/gccld.cpp
@@ -299,7 +299,7 @@ int main(int argc, char **argv, char **envp ) {
                        Libraries, gcc, envp );
 
         // Remove the assembly language file.
-        AssemblyFile.destroyFile();;
+        AssemblyFile.destroyFile();
       } else if (NativeCBE) {
         sys::Path CFile (OutputFilename);
         CFile.appendSuffix("cbe.c");