llama : fix grammar sometimes generating null char (ggml-org#2756)

ejones · akawrykow · commit d50550648d54 · 2023-08-29T14:14:00.000-07:00
diff --git a/llama.cpp b/llama.cpp
@@ -4074,7 +4074,7 @@ void llama_sample_grammar(struct llama_context * ctx, llama_token_data_array * c
             if (!allow_eos) {
                 candidates->data[i].logit = -INFINITY;
             }
-        } else if (text.empty()) {
+        } else if (text.empty() || text[0] == 0) {
             candidates->data[i].logit = -INFINITY;
         } else {
             candidates_decoded.push_back(decode_utf8(text.c_str(), grammar->partial_utf8));

Original file line number	Diff line number	Diff line change
`@@ -4074,7 +4074,7 @@ void llama_sample_grammar(struct llama_context * ctx, llama_token_data_array * c`
`4074`	`4074`	`if (!allow_eos) {`
`4075`	`4075`	`candidates->data[i].logit = -INFINITY;`
`4076`	`4076`	`}`
`4077`		`- } else if (text.empty()) {`
	`4077`	`+ } else if (text.empty() \|\| text[0] == 0) {`
`4078`	`4078`	`candidates->data[i].logit = -INFINITY;`
`4079`	`4079`	`} else {`
`4080`	`4080`	`candidates_decoded.push_back(decode_utf8(text.c_str(), grammar->partial_utf8));`