Skip to content

Commit 320fb73

Browse files
committed
Bug #72740 Fixes NULL byte when using addQueryField() w/o boost
Fixed regression added in b1b44e0 while working on #72740
1 parent 68a9580 commit 320fb73

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/php5/solr_functions_params.c

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

716-
if (current_ptr->contents.arg_list.delimiter_override) {
716+
if (current_ptr->contents.arg_list.delimiter_override && *current_ptr->contents.arg_list.delimiter_override) {
717717
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
718718
} else {
719719
solr_string_appendc(&tmp_buffer, separator);
@@ -730,7 +730,7 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
730730

731731
solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
732732

733-
if (current_ptr->contents.arg_list.delimiter_override) {
733+
if (current_ptr->contents.arg_list.delimiter_override && *current_ptr->contents.arg_list.delimiter_override) {
734734
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
735735
} else {
736736
solr_string_appendc(&tmp_buffer, separator);

src/php7/solr_functions_params.c

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

703-
if (current_ptr->contents.arg_list.delimiter_override) {
703+
if (current_ptr->contents.arg_list.delimiter_override && *current_ptr->contents.arg_list.delimiter_override) {
704704
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
705705
} else {
706706
solr_string_appendc(&tmp_buffer, separator);
@@ -717,7 +717,7 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
717717

718718
solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
719719

720-
if (current_ptr->contents.arg_list.delimiter_override) {
720+
if (current_ptr->contents.arg_list.delimiter_override && *current_ptr->contents.arg_list.delimiter_override) {
721721
solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
722722
} else {
723723
solr_string_appendc(&tmp_buffer, separator);

0 commit comments

Comments
 (0)