Mozilla-Ocho
diff --git a/‎llama.cpp/grammar-parser.cpp
Copy file name to clipboardExpand all lines: llama.cpp/grammar-parser.cpp
+9Lines changed: 9 additions & 0 deletions b/‎llama.cpp/grammar-parser.cpp
Copy file name to clipboardExpand all lines: llama.cpp/grammar-parser.cpp
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎llama.cpp/server/server.cpp
Copy file name to clipboardExpand all lines: llama.cpp/server/server.cpp
+3-3Lines changed: 3 additions & 3 deletions b/‎llama.cpp/server/server.cpp
Copy file name to clipboardExpand all lines: llama.cpp/server/server.cpp
+3-3Lines changed: 3 additions & 3 deletions
@@ -145,6 +145,9 @@ namespace grammar_parser {
                 pos++;
                 last_sym_start = out_elements.size();
                 while (*pos != '"') {
+                    if (!*pos) {  // [jart] don't sync until upstream fixes bug
+                        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});
@@ -159,6 +162,9 @@ namespace grammar_parser {
                 }
                 last_sym_start = out_elements.size();
                 while (*pos != ']') {
+                    if (!*pos) {  // [jart] don't sync until upstream fixes bug
+                        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()
@@ -167,6 +173,9 @@ namespace grammar_parser {
 
                     out_elements.push_back({type, char_pair.first});
                     if (pos[0] == '-' && pos[1] != ']') {
+                        if (pos[1]) {  // [jart] don't sync until upstream fixes bug
+                            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});
 
@@ -866,12 +866,12 @@ struct llama_server_context
             }
         }
 
-        if (slot->ctx_sampling != nullptr)
-        {
+        if (slot->ctx_sampling != nullptr) {
             llama_sampling_free(slot->ctx_sampling);
         }
         slot->ctx_sampling = llama_sampling_init(slot->sparams);
-        if (!slot->ctx_sampling) { // [jart] fixes crash
+        if (slot->ctx_sampling == nullptr) {
+            // for now, the only error that may happen here is invalid grammar
             LOG_TEE("%s: failed to initialize sampling subsystem\n", __func__);
             return false;
         }
Original file line number	Diff line number	Diff line change
`@@ -866,12 +866,12 @@ struct llama_server_context`
`866`	`866`	`}`
`867`	`867`	`}`
`868`	`868`
`869`		`- if (slot->ctx_sampling != nullptr)`
`870`		`- {`
	`869`	`+ if (slot->ctx_sampling != nullptr) {`
`871`	`870`	`llama_sampling_free(slot->ctx_sampling);`
`872`	`871`	`}`
`873`	`872`	`slot->ctx_sampling = llama_sampling_init(slot->sparams);`
`874`		`- if (!slot->ctx_sampling) { // [jart] fixes crash`
	`873`	`+ if (slot->ctx_sampling == nullptr) {`
	`874`	`+ // for now, the only error that may happen here is invalid grammar`
`875`	`875`	`LOG_TEE("%s: failed to initialize sampling subsystem\n", __func__);`
`876`	`876`	`return false;`
`877`	`877`	`}`