Skip to content

Commit fdf096b

Browse files
committed
Bug #72740 Fixes NULL byte when using addQueryField()
Fixed regression added in b1b44e0 while working on #72740
1 parent c3fbbf1 commit fdf096b

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/php5/solr_functions_params.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,9 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
714714
solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
715715

716716
if (current_ptr->contents.arg_list.delimiter_override) {
717-
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
717+
if (strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
718+
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
719+
}
718720
} else {
719721
solr_string_appendc(&tmp_buffer, separator);
720722
}
@@ -731,7 +733,9 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
731733
solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
732734

733735
if (current_ptr->contents.arg_list.delimiter_override) {
734-
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
736+
if (strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
737+
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
738+
}
735739
} else {
736740
solr_string_appendc(&tmp_buffer, separator);
737741
}

src/php7/solr_functions_params.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,9 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
701701
solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
702702

703703
if (current_ptr->contents.arg_list.delimiter_override) {
704-
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
704+
if (strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
705+
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
706+
}
705707
} else {
706708
solr_string_appendc(&tmp_buffer, separator);
707709
}
@@ -718,7 +720,9 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
718720
solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
719721

720722
if (current_ptr->contents.arg_list.delimiter_override) {
721-
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
723+
if (strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
724+
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
725+
}
722726
} else {
723727
solr_string_appendc(&tmp_buffer, separator);
724728
}

0 commit comments

Comments
 (0)