ggml-org
diff --git a/‎common/common.cpp
Copy file name to clipboardExpand all lines: common/common.cpp
+3-5Lines changed: 3 additions & 5 deletions b/‎common/common.cpp
Copy file name to clipboardExpand all lines: common/common.cpp
+3-5Lines changed: 3 additions & 5 deletions
diff --git a/‎common/grammar-parser.cpp
Copy file name to clipboardExpand all lines: common/grammar-parser.cpp
+9Lines changed: 9 additions & 0 deletions b/‎common/grammar-parser.cpp
Copy file name to clipboardExpand all lines: common/grammar-parser.cpp
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎examples/llava/llava-cli.cpp
Copy file name to clipboardExpand all lines: examples/llava/llava-cli.cpp
+5Lines changed: 5 additions & 0 deletions b/‎examples/llava/llava-cli.cpp
Copy file name to clipboardExpand all lines: examples/llava/llava-cli.cpp
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎examples/main/main.cpp
Copy file name to clipboardExpand all lines: examples/main/main.cpp
+4Lines changed: 4 additions & 0 deletions b/‎examples/main/main.cpp
Copy file name to clipboardExpand all lines: examples/main/main.cpp
+4Lines changed: 4 additions & 0 deletions
@@ -1367,14 +1367,12 @@ bool gpt_params_parse_ex(int argc, char ** argv, gpt_params & params) {
         if (arg.compare(0, arg_prefix.size(), arg_prefix) == 0) {
             std::replace(arg.begin(), arg.end(), '_', '-');
         }
-
         if (!gpt_params_find_arg(argc, argv, arg, params, i, invalid_param)) {
             throw std::invalid_argument("error: unknown argument: " + arg);
         }
-    }
-
-    if (invalid_param) {
-        throw std::invalid_argument("error: invalid parameter for argument: " + arg);
+        if (invalid_param) {
+            throw std::invalid_argument("error: invalid parameter for argument: " + arg);
+        }
     }
 
     if (params.prompt_cache_all &&
 
@@ -142,6 +142,9 @@ namespace grammar_parser {
                 pos++;
                 last_sym_start = out_elements.size();
                 while (*pos != '"') {
+                    if (!*pos) {
+                        throw std::runtime_error("unexpected end of input");
+                    }
                     auto char_pair = parse_char(pos);
                          pos       = char_pair.second;
                     out_elements.push_back({LLAMA_GRETYPE_CHAR, char_pair.first});
@@ -156,6 +159,9 @@ namespace grammar_parser {
                 }
                 last_sym_start = out_elements.size();
                 while (*pos != ']') {
+                    if (!*pos) {
+                        throw std::runtime_error("unexpected end of input");
+                    }
                     auto char_pair = parse_char(pos);
                          pos       = char_pair.second;
                     enum llama_gretype type = last_sym_start < out_elements.size()
@@ -164,6 +170,9 @@ namespace grammar_parser {
 
                     out_elements.push_back({type, char_pair.first});
                     if (pos[0] == '-' && pos[1] != ']') {
+                        if (!pos[1]) {
+                            throw std::runtime_error("unexpected end of input");
+                        }
                         auto endchar_pair = parse_char(pos + 1);
                              pos          = endchar_pair.second;
                         out_elements.push_back({LLAMA_GRETYPE_CHAR_RNG_UPPER, endchar_pair.first});
 
@@ -189,6 +189,11 @@ static void process_prompt(struct llava_context * ctx_llava, struct llava_image_
     LOG_TEE("\n");
 
     struct llama_sampling_context * ctx_sampling = llama_sampling_init(params->sparams);
+    if (!ctx_sampling) {
+        fprintf(stderr, "%s: failed to initialize sampling subsystem\n", __func__);
+        exit(1);
+    }
+
     std::string response = "";
     for (int i = 0; i < max_tgt_len; i++) {
         const char * tmp = sample(ctx_sampling, ctx_llava->ctx_llama, &n_past);
 
@@ -523,6 +523,10 @@ int main(int argc, char ** argv) {
     }
 
     struct llama_sampling_context * ctx_sampling = llama_sampling_init(sparams);
+    if (!ctx_sampling) {
+        fprintf(stderr, "%s: failed to initialize sampling subsystem\n", __func__);
+        exit(1);
+    }
 
     while ((n_remain != 0 && !is_antiprompt) || params.interactive) {
         // predict
Original file line number	Diff line number	Diff line change
`@@ -1367,14 +1367,12 @@ bool gpt_params_parse_ex(int argc, char ** argv, gpt_params & params) {`
`1367`	`1367`	`if (arg.compare(0, arg_prefix.size(), arg_prefix) == 0) {`
`1368`	`1368`	`std::replace(arg.begin(), arg.end(), '_', '-');`
`1369`	`1369`	`}`
`1370`		`-`
`1371`	`1370`	`if (!gpt_params_find_arg(argc, argv, arg, params, i, invalid_param)) {`
`1372`	`1371`	`throw std::invalid_argument("error: unknown argument: " + arg);`
`1373`	`1372`	`}`
`1374`		`- }`
`1375`		`-`
`1376`		`- if (invalid_param) {`
`1377`		`- throw std::invalid_argument("error: invalid parameter for argument: " + arg);`
	`1373`	`+ if (invalid_param) {`
	`1374`	`+ throw std::invalid_argument("error: invalid parameter for argument: " + arg);`
	`1375`	`+ }`
`1378`	`1376`	`}`
`1379`	`1377`
`1380`	`1378`	`if (params.prompt_cache_all &&`