luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refusing to write files with empty string and to a path that is a directory - the latter would rename the directory and later try to remove it

This commit is contained in:
Matthias Koefferlein 2024-09-15 17:15:21 +02:00
parent d5345af466
commit 56e88805a0
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/tl/tl/tlStream.cc
View File

@ -1178,20 +1178,34 @@ OutputStream::seek (size_t pos)
OutputFileBase::OutputFileBase (const std::string &p, int keep_backups)
: m_keep_backups (keep_backups), m_path (tl::absolute_file_path (p)), m_has_error (false)
{
if (p.empty ()) {
throw tl::Exception (tl::to_string (tr ("Path cannot be an empty string")));
}
if (tl::file_exists (m_path)) {
m_backup_path = m_path + ".~backup";
if (tl::file_exists (m_backup_path)) {
if (! tl::rm_file (m_backup_path)) {
tl::warn << tl::sprintf (tl::to_string (tr ("Could not create backup file: unable to remove existing file '%s'")), m_backup_path);
m_backup_path = std::string ();
if (tl::is_dir (m_path)) {
throw tl::Exception (tl::to_string (tr ("Path exists and is a directory: '%s'")), m_path);
} else {
m_backup_path = m_path + ".~backup";
if (tl::file_exists (m_backup_path)) {
if (! tl::rm_file (m_backup_path)) {
tl::warn << tl::sprintf (tl::to_string (tr ("Could not create backup file: unable to remove existing file '%s'")), m_backup_path);
m_backup_path = std::string ();
}
}
}
if (! m_backup_path.empty ()) {
if (! tl::rename_file (m_path, tl::filename (m_backup_path))) {
tl::warn << tl::sprintf (tl::to_string (tr ("Could not create backup file: unable to rename original file '%s' to backup file")), m_path, m_backup_path);
m_backup_path = std::string ();
if (! m_backup_path.empty ()) {
if (! tl::rename_file (m_path, tl::filename (m_backup_path))) {
tl::warn << tl::sprintf (tl::to_string (tr ("Could not create backup file: unable to rename original file '%s' to backup file")), m_path, m_backup_path);
m_backup_path = std::string ();
}
}
}
}
}

15
src/tl/unit_tests/tlStreamTests.cc
View File

@ -462,5 +462,20 @@ TEST(Backups)
}
}
TEST(RefuseToWrite)
{
try {
tl::OutputStream os ("");
EXPECT_EQ (1, 0);
} catch (tl::Exception &ex) {
EXPECT_EQ (ex.msg (), "Path cannot be an empty string");
}
try {
tl::OutputStream os (".");
EXPECT_EQ (1, 0);
} catch (tl::Exception &ex) {
EXPECT_EQ (ex.msg ().find ("Path exists and is a directory"), size_t (0));
}
}