vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix return types

Browse source
This commit is contained in:
Jan Boon 2024-03-30 06:01:38 +08:00
parent 29f18c29b4
commit f2e41b3239
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/server/server.cpp
View file

@ -3321,7 +3321,7 @@ int main(int argc, char ** argv) {
json request_data = json::parse(req.body); json request_data = json::parse(req.body);
std::string filename = request_data["filename"]; std::string filename = request_data["filename"];
if (filename.find('/') != std::string::npos || filename.find('\\') != std::string::npos || filename.find("..") != std::string::npos) { if (filename.find('/') != std::string::npos || filename.find('\\') != std::string::npos || filename.find("..") != std::string::npos) {
res_error(res, "Invalid filename"); res_error(res, format_error_response("Invalid filename", ERROR_TYPE_INVALID_REQUEST));
return; return;
} }
std::string filepath = sparams.slot_save_path + filename; std::string filepath = sparams.slot_save_path + filename;
@ -3351,7 +3351,7 @@ int main(int argc, char ** argv) {
json request_data = json::parse(req.body); json request_data = json::parse(req.body);
std::string filename = request_data["filename"]; std::string filename = request_data["filename"];
if (filename.find('/') != std::string::npos || filename.find('\\') != std::string::npos || filename.find("..") != std::string::npos) { if (filename.find('/') != std::string::npos || filename.find('\\') != std::string::npos || filename.find("..") != std::string::npos) {
res_error(res, "Invalid filename"); res_error(res, format_error_response("Invalid filename", ERROR_TYPE_INVALID_REQUEST));
return; return;
} }
std::string filepath = sparams.slot_save_path + filename; std::string filepath = sparams.slot_save_path + filename;
@ -3393,7 +3393,7 @@ int main(int argc, char ** argv) {
if (result.error) { if (result.error) {
res_error(res, result.data); res_error(res, result.data);
} else { } else {
res.set_content(result.data, "application/json"); res.set_content(result.data.dump(), "application/json");
} }
}; };
@ -3406,7 +3406,7 @@ int main(int argc, char ** argv) {
try { try {
id_slot = std::stoi(id_slot_str); id_slot = std::stoi(id_slot_str);
} catch (const std::exception &) { } catch (const std::exception &) {
res_error(res, "Invalid slot ID"); res_error(res, format_error_response("Invalid slot ID", ERROR_TYPE_INVALID_REQUEST));
return; return;
} }
@ -3419,7 +3419,7 @@ int main(int argc, char ** argv) {
} else if (action == "erase") { } else if (action == "erase") {
handle_slots_erase(req, res, id_slot); handle_slots_erase(req, res, id_slot);
} else { } else {
res_error(res, "Invalid action"); res_error(res, format_error_response("Invalid action", ERROR_TYPE_INVALID_REQUEST));
} }
}; };