Main, ...: catch any exception, not just std::runtime_error
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
#include "Charset.hxx"
|
||||
#include "Compiler.h"
|
||||
|
||||
#include <stdexcept>
|
||||
#include <exception>
|
||||
|
||||
/* no inlining, please */
|
||||
AllocatedPath::~AllocatedPath() {}
|
||||
@@ -34,7 +34,7 @@ AllocatedPath::FromUTF8(const char *path_utf8) noexcept
|
||||
#if defined(HAVE_FS_CHARSET) || defined(_WIN32)
|
||||
try {
|
||||
return AllocatedPath(::PathFromUTF8(path_utf8));
|
||||
} catch (const std::runtime_error &) {
|
||||
} catch (...) {
|
||||
return nullptr;
|
||||
}
|
||||
#else
|
||||
@@ -63,7 +63,7 @@ AllocatedPath::ToUTF8() const noexcept
|
||||
{
|
||||
try {
|
||||
return ::PathToUTF8(c_str());
|
||||
} catch (const std::runtime_error &) {
|
||||
} catch (...) {
|
||||
return std::string();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,6 +62,6 @@ try {
|
||||
"No permission to read directory: %s",
|
||||
path_fs.ToUTF8().c_str());
|
||||
}
|
||||
} catch (const std::runtime_error &e) {
|
||||
LogError(e);
|
||||
} catch (...) {
|
||||
LogError(std::current_exception());
|
||||
}
|
||||
|
||||
+1
-3
@@ -21,14 +21,12 @@
|
||||
#include "Path.hxx"
|
||||
#include "Charset.hxx"
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
std::string
|
||||
Path::ToUTF8() const noexcept
|
||||
{
|
||||
try {
|
||||
return ::PathToUTF8(c_str());
|
||||
} catch (const std::runtime_error &) {
|
||||
} catch (...) {
|
||||
return std::string();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user