From b6f27a0c19ea76fd0fe9c7b0411744102a76989c Mon Sep 17 00:00:00 2001 From: Erik Janssen <30315129+janssen70@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:22:42 +0200 Subject: [PATCH] Prevent reading beyond end of file (#1626) Co-authored-by: Erik at Axis --- examples/helpers/AsyncFileStreamer.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/helpers/AsyncFileStreamer.h b/examples/helpers/AsyncFileStreamer.h index 3e76e5a..e29d493 100644 --- a/examples/helpers/AsyncFileStreamer.h +++ b/examples/helpers/AsyncFileStreamer.h @@ -38,7 +38,8 @@ struct AsyncFileStreamer { static void streamFile(uWS::HttpResponse *res, AsyncFileReader *asyncFileReader) { /* Peek from cache */ std::string_view chunk = asyncFileReader->peek(res->getWriteOffset()); - if (!chunk.length() || res->tryEnd(chunk, asyncFileReader->getFileSize()).first) { + auto remaining_data = r->getFileSize() - res->getWriteOffset(); + if (!chunk.length() || res->tryEnd(chunk, remaining_data).first) { /* Request new chunk */ // todo: we need to abort this callback if peer closed! // this also means Loop::defer needs to support aborting (functions should embedd an atomic boolean abort or something) @@ -50,7 +51,7 @@ struct AsyncFileStreamer { // us_socket_up_ref eftersom vi delar ägandeskapet - if (chunk.length() < asyncFileReader->getFileSize()) { + if (chunk.length() < remaining_data) { asyncFileReader->request(res->getWriteOffset(), [res, asyncFileReader](std::string_view chunk) { // check if we were closed in the mean time //if (us_socket_is_closed()) {