cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1648 from ethereum/escape-filenames

Browse Source 
Always escape filenames in solc
This commit is contained in:
chriseth 2017-02-06 15:18:59 +01:00 committed by GitHub
commit 06de89aef0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -4,6 +4,7 @@ Features:
* Type system: Support explicit conversion of external function to address. * Type system: Support explicit conversion of external function to address.
Bugfixes: Bugfixes:
* Commandline interface: Always escape filenames (replace ``/``, ``:`` and ``.`` with ``_``).
* Type system: Disallow arrays with negative length. * Type system: Disallow arrays with negative length.
### 0.4.9 (2017-01-31) ### 0.4.9 (2017-01-31)

14
solc/CommandLineInterface.cpp
View File

@ -200,7 +200,7 @@ void CommandLineInterface::handleBinary(string const& _contract)
if (m_args.count(g_argCloneBinary)) if (m_args.count(g_argCloneBinary))
{ {
if (m_args.count(g_argOutputDir)) if (m_args.count(g_argOutputDir))
createFile(_contract + ".clone_bin", m_compiler->cloneObject(_contract).toHex()); createFile(m_compiler->filesystemFriendlyName(_contract) + ".clone_bin", m_compiler->cloneObject(_contract).toHex());
else else
{ {
cout << "Clone Binary: " << endl; cout << "Clone Binary: " << endl;
@ -210,7 +210,7 @@ void CommandLineInterface::handleBinary(string const& _contract)
if (m_args.count(g_argBinaryRuntime)) if (m_args.count(g_argBinaryRuntime))
{ {
if (m_args.count(g_argOutputDir)) if (m_args.count(g_argOutputDir))
createFile(_contract + ".bin-runtime", m_compiler->runtimeObject(_contract).toHex()); createFile(m_compiler->filesystemFriendlyName(_contract) + ".bin-runtime", m_compiler->runtimeObject(_contract).toHex());
else else
{ {
cout << "Binary of the runtime part: " << endl; cout << "Binary of the runtime part: " << endl;
@ -222,7 +222,7 @@ void CommandLineInterface::handleBinary(string const& _contract)
void CommandLineInterface::handleOpcode(string const& _contract) void CommandLineInterface::handleOpcode(string const& _contract)
{ {
if (m_args.count(g_argOutputDir)) if (m_args.count(g_argOutputDir))
createFile(_contract + ".opcode", solidity::disassemble(m_compiler->object(_contract).bytecode)); createFile(m_compiler->filesystemFriendlyName(_contract) + ".opcode", solidity::disassemble(m_compiler->object(_contract).bytecode));
else else
{ {
cout << "Opcodes: " << endl; cout << "Opcodes: " << endl;
@ -249,7 +249,7 @@ void CommandLineInterface::handleSignatureHashes(string const& _contract)
out += toHex(it.first.ref()) + ": " + it.second->externalSignature() + "\n"; out += toHex(it.first.ref()) + ": " + it.second->externalSignature() + "\n";
if (m_args.count(g_argOutputDir)) if (m_args.count(g_argOutputDir))
createFile(_contract + ".signatures", out); createFile(m_compiler->filesystemFriendlyName(_contract) + ".signatures", out);
else else
cout << "Function signatures: " << endl << out; cout << "Function signatures: " << endl << out;
} }
@ -261,7 +261,7 @@ void CommandLineInterface::handleOnChainMetadata(string const& _contract)
string data = m_compiler->onChainMetadata(_contract); string data = m_compiler->onChainMetadata(_contract);
if (m_args.count("output-dir")) if (m_args.count("output-dir"))
createFile(_contract + "_meta.json", data); createFile(m_compiler->filesystemFriendlyName(_contract) + "_meta.json", data);
else else
cout << "Metadata: " << endl << data << endl; cout << "Metadata: " << endl << data << endl;
} }
@ -302,7 +302,7 @@ void CommandLineInterface::handleMeta(DocumentationType _type, string const& _co
output = dev::jsonPrettyPrint(m_compiler->metadata(_contract, _type)); output = dev::jsonPrettyPrint(m_compiler->metadata(_contract, _type));
if (m_args.count(g_argOutputDir)) if (m_args.count(g_argOutputDir))
createFile(_contract + suffix, output); createFile(m_compiler->filesystemFriendlyName(_contract) + suffix, output);
else else
{ {
cout << title << endl; cout << title << endl;
@ -981,7 +981,7 @@ void CommandLineInterface::outputCompilationResults()
{ {
stringstream data; stringstream data;
m_compiler->streamAssembly(data, contract, m_sourceCodes, m_args.count(g_argAsmJson)); m_compiler->streamAssembly(data, contract, m_sourceCodes, m_args.count(g_argAsmJson));
createFile(contract + (m_args.count(g_argAsmJson) ? "_evm.json" : ".evm"), data.str()); createFile(m_compiler->filesystemFriendlyName(contract) + (m_args.count(g_argAsmJson) ? "_evm.json" : ".evm"), data.str());
} }
else else
{ {