fuzzer/admin-data/crash-6ba2f7189a6447cd0cce37cfa1c41ded6244dc2f |binary wsd/Admin.cpp | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 946fa38a22e2e90965392446a559c78c87d92219 Author: Miklos Vajna <[email protected]> AuthorDate: Tue Apr 7 09:05:07 2020 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Apr 7 09:35:54 2020 +0200 admin console: fix handling of out of range kill parameter Catch that, similar to when handling an invalid argument. Change-Id: I7405355f0b962673069dbd33dbab8c9e3042c4bf Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91794 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/fuzzer/admin-data/crash-6ba2f7189a6447cd0cce37cfa1c41ded6244dc2f b/fuzzer/admin-data/crash-6ba2f7189a6447cd0cce37cfa1c41ded6244dc2f new file mode 100644 index 000000000..1468abd9e Binary files /dev/null and b/fuzzer/admin-data/crash-6ba2f7189a6447cd0cce37cfa1c41ded6244dc2f differ diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp index 017600af1..93fe76827 100644 --- a/wsd/Admin.cpp +++ b/wsd/Admin.cpp @@ -162,7 +162,11 @@ void AdminSocketHandler::handleMessage(const std::vector<char> &payload) } catch (std::invalid_argument& exc) { - LOG_WRN("Invalid PID to kill: " << tokens[1]); + LOG_WRN("Invalid PID to kill (invalid argument): " << tokens[1]); + } + catch (std::out_of_range& exc) + { + LOG_WRN("Invalid PID to kill (out of range): " << tokens[1]); } } else if (tokens.equals(0, "settings")) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
