From: Kerfuffle <redacted>
Date: Sat, 7 Oct 2023 21:31:41 +0000 (-0600)
Subject: Fix trying to strip newline from empty prompt and cfg prompt file content (#3534)
X-Git-Tag: upstream/0.0.4488~3142
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=a16e89cec83b4bd5f6af8f1ce1400f94c12356f9;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Fix trying to strip newline from empty prompt and cfg prompt file content (#3534)
---

diff --git a/common/common.cpp b/common/common.cpp
index 60b00b5f..0f55c33a 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -170,7 +170,7 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
             // store the external file name in params
             params.prompt_file = argv[i];
             std::copy(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>(), back_inserter(params.prompt));
-            if (params.prompt.back() == '\n') {
+            if (!params.prompt.empty() && params.prompt.back() == '\n') {
                 params.prompt.pop_back();
             }
         } else if (arg == "-n" || arg == "--n-predict") {
@@ -295,7 +295,7 @@ bool gpt_params_parse(int argc, char ** argv, gpt_params & params) {
                 break;
             }
             std::copy(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>(), back_inserter(params.cfg_negative_prompt));
-            if (params.cfg_negative_prompt.back() == '\n') {
+            if (!params.cfg_negative_prompt.empty() && params.cfg_negative_prompt.back() == '\n') {
                 params.cfg_negative_prompt.pop_back();
             }
         } else if (arg == "--cfg-scale") {