Skip to content

conf: fix snd_func_imul accumulator initialization #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orange-dot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

conf: fix snd_func_imul accumulator initialization #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/confmisc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ static int snd_func_iops(snd_config_t **dst,
snd_config_iterator_t i, next;
const char *id;
char *res = NULL;
long result = 0, val;
long result = op == 1 ? 1 : 0, val;
int idx = 0, err, hit;

err = snd_config_search(src, "integers", &n);
Expand Down Expand Up @@ -531,6 +531,9 @@ static int snd_func_iops(snd_config_t **dst,
}
}
} while (hit);
/* Preserve pre-fix behavior for an empty integers list. */
if (op == 1 && idx == 0)
result = 0;
err = snd_config_get_id(src, &id);
if (err >= 0)
err = snd_config_imake_integer(dst, id, result);
Expand Down Expand Up @@ -582,6 +585,9 @@ SND_DLSYM_BUILD_VERSION(snd_func_iadd, SND_CONFIG_DLSYM_VERSION_EVALUATE);
integers [ 2 3 2 ]
}
\endcode
*
* \note An empty \c integers list yields 0 (not the multiplicative
* identity 1) for backward compatibility.
*/
int snd_func_imul(snd_config_t **dst, snd_config_t *root,
snd_config_t *src, snd_config_t *private_data)
Expand Down
69 changes: 69 additions & 0 deletions test/lsb/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,74 @@ static void test_for_each(void)
ALSA_CHECK(snd_config_delete(c));
}

static void test_evaluate_integer_functions(void)
{
const char *text =
"sum {\n"
" @func iadd\n"
" integers [ 2 3 5 ]\n"
"}\n"
"product {\n"
" @func imul\n"
" integers [ 2 4 6 ]\n"
"}\n"
"single {\n"
" @func imul\n"
" integers [ 7 ]\n"
"}\n"
"with_zero {\n"
" @func imul\n"
" integers [ 2 0 5 ]\n"
"}\n"
"negative {\n"
" @func imul\n"
" integers [ -2 3 ]\n"
"}\n"
"empty {\n"
" @func imul\n"
" integers [ ]\n"
"}\n"
"out_of_order {\n"
" @func imul\n"
" integers {\n"
" 2 = 5\n"
" 0 = 2\n"
" 1 = 3\n"
" }\n"
"}\n";
struct {
const char *id;
long result;
} *p, expected[] = {
{ .id = "sum", .result = 10 },
{ .id = "product", .result = 48 },
{ .id = "single", .result = 7 },
{ .id = "with_zero", .result = 0 },
{ .id = "negative", .result = -6 },
{ .id = "empty", .result = 0 },
{ .id = "out_of_order", .result = 30 },
{ .id = NULL, .result = 0 },
};
snd_config_t *top, *node;
snd_input_t *input;
long value;

ALSA_CHECK(snd_input_buffer_open(&input, text, strlen(text)));
ALSA_CHECK(snd_config_top(&top));
ALSA_CHECK(snd_config_load(top, input));
ALSA_CHECK(snd_input_close(input));
ALSA_CHECK(snd_config_evaluate(top, top, NULL, NULL));

for (p = expected; p->id; p++) {
ALSA_CHECK(snd_config_search(top, p->id, &node));
TEST_CHECK(snd_config_get_type(node) == SND_CONFIG_TYPE_INTEGER);
ALSA_CHECK(snd_config_get_integer(node, &value));
TEST_CHECK(value == p->result);
}

ALSA_CHECK(snd_config_delete(top));
}

static int _expand_fcn(snd_config_t **dst, const char *s, void *private_data ATTRIBUTE_UNUSED)
{
if (strcmp(s, "var10") == 0)
Expand Down Expand Up @@ -644,6 +712,7 @@ int main(void)
test_get_ascii();
test_iterators();
test_for_each();
test_evaluate_integer_functions();
test_evaluate_string();
test_load_string();
return TEST_EXIT_CODE();
Expand Down
Loading