From: Molly Sophia <redacted>
Date: Mon, 21 Jul 2025 09:38:36 +0000 (+0800)
Subject: llama : fix `--reverse-prompt` crashing issue (#14794)
X-Git-Tag: upstream/0.0.6073~124
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=c82d48ec23fb8749c341d0838f6891fd5f6b6da0;p=pkg%2Fggml%2Fsources%2Fllama.cpp

llama : fix `--reverse-prompt` crashing issue (#14794)

Signed-off-by: Molly Sophia <redacted>
---

diff --git a/tools/main/main.cpp b/tools/main/main.cpp
index 516bf096..eb36c688 100644
--- a/tools/main/main.cpp
+++ b/tools/main/main.cpp
@@ -785,14 +785,17 @@ int main(int argc, char ** argv) {
                 }
 
                 // check for reverse prompt using special tokens
-                llama_token last_token = common_sampler_last(smpl);
-                for (auto token : antiprompt_token) {
-                    if (token == last_token) {
-                        if (params.interactive) {
-                            is_interacting = true;
+                // avoid calling common_sampler_last() if last_output is empty
+                if (!last_output.empty()) {
+                    llama_token last_token = common_sampler_last(smpl);
+                    for (auto token : antiprompt_token) {
+                        if (token == last_token) {
+                            if (params.interactive) {
+                                is_interacting = true;
+                            }
+                            is_antiprompt = true;
+                            break;
                         }
-                        is_antiprompt = true;
-                        break;
                     }
                 }