6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 02:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Check the return value of std::getenv.

Browse Source 
When constructing std::strings from C strings, we should check the input
value to be not NULL so that the std::string constructor does not
segfault.
Fixes #3047.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59131 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Mikhail Glushenkov 2008-11-12 12:41:18 +00:00
parent 9a365b6acb
commit 6766572dcb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/TableGen/LLVMCConfigurationEmitter.cpp
View File

@ -1121,9 +1121,9 @@ std::string SubstituteSpecialCommands(const std::string& cmd) {
if (cmd.size() == 5) if (cmd.size() == 5)
throw std::string("$ENV invocation: empty argument list!"); throw std::string("$ENV invocation: empty argument list!");
ret += "std::getenv(\""; ret += "checkCString(std::getenv(\"";
ret += std::string(cmd.begin() + 5, cmd.begin() + cparen); ret += std::string(cmd.begin() + 5, cmd.begin() + cparen);
ret += "\")"; ret += "\"))";
} }
else { else {
throw "Unknown special command: " + cmd; throw "Unknown special command: " + cmd;
@ -1729,7 +1729,8 @@ void EmitRegisterPlugin(std::ostream& O) {
<< "static llvmc::RegisterPlugin<Plugin> RP;\n\n}\n\n"; << "static llvmc::RegisterPlugin<Plugin> RP;\n\n}\n\n";
} }
/// EmitInclude - Emit necessary #include directives. /// EmitIncludes - Emit necessary #include directives and some
/// additional declarations.
void EmitIncludes(std::ostream& O) { void EmitIncludes(std::ostream& O) {
O << "#include \"llvm/CompilerDriver/CompilationGraph.h\"\n" O << "#include \"llvm/CompilerDriver/CompilationGraph.h\"\n"
<< "#include \"llvm/CompilerDriver/Plugin.h\"\n" << "#include \"llvm/CompilerDriver/Plugin.h\"\n"
@ -1744,7 +1745,10 @@ void EmitIncludes(std::ostream& O) {
<< "using namespace llvm;\n" << "using namespace llvm;\n"
<< "using namespace llvmc;\n\n" << "using namespace llvmc;\n\n"
<< "extern cl::opt<std::string> OutputFilename;\n\n"; << "extern cl::opt<std::string> OutputFilename;\n\n"
<< "inline const char* checkCString(const char* s)\n"
<< "{ return s == NULL ? \"\" : s; }\n\n";
} }
// End of anonymous namespace // End of anonymous namespace