From: Justine Tunney <redacted>
Date: Tue, 9 Jan 2024 17:59:14 +0000 (-0800)
Subject: llava-cli : don't crash if --image flag is invalid (#4835)
X-Git-Tag: upstream/0.0.4488~2684
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=36e5a08b203542dca53cca4eaf172c5dc4bbc991;p=pkg%2Fggml%2Fsources%2Fllama.cpp

llava-cli : don't crash if --image flag is invalid (#4835)

This change fixes an issue where supplying `--image missing-file` would
result in a segfault due to a null pointer being dereferenced. This can
result in distracting info being printed if robust crash analysis tools
are being used.
---

diff --git a/examples/llava/llava-cli.cpp b/examples/llava/llava-cli.cpp
index 502b788b..d94795fe 100644
--- a/examples/llava/llava-cli.cpp
+++ b/examples/llava/llava-cli.cpp
@@ -243,6 +243,9 @@ int main(int argc, char ** argv) {
     }
 
     auto image_embed = load_image(ctx_llava, &params);
+    if (!image_embed) {
+        return 1;
+    }
 
     // process the prompt
     process_prompt(ctx_llava, image_embed, &params, params.prompt);