Skip to content

Fix bug in jerry_string_to_char_buffer. #1210

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

Merged
merged 1 commit into from
Jul 15, 2016
Merged

Fix bug in jerry_string_to_char_buffer. #1210

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
2 changes: 1 addition & 1 deletion jerry-core/jerry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ jerry_string_to_char_buffer (const jerry_value_t value, /**< input string value

ecma_string_t *str_p = ecma_get_string_from_value (value);

if (ecma_string_get_size (str_p) < buffer_size)
if (ecma_string_get_size (str_p) > buffer_size)
{
return 0;
}
Expand Down
12 changes: 7 additions & 5 deletions tests/unit/test-api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,30 +187,31 @@ foreach (const jerry_value_t name, /**< field name */
jerry_size_t sz = jerry_string_to_char_buffer (name, (jerry_char_t *) str_buf_p, 128);
str_buf_p[sz] = '\0';

if (sz == 0)
{
JERRY_ASSERT (!strncmp ((const char *) user_data, "user_data", 9));
return true;
}
JERRY_ASSERT (!strncmp ((const char *) user_data, "user_data", 9));
JERRY_ASSERT (sz > 0);

if (!strncmp (str_buf_p, "alpha", (size_t) sz))
{
JERRY_ASSERT (jerry_value_is_number (value));
JERRY_ASSERT (jerry_get_number_value (value) == 32.0);
return true;
}
else if (!strncmp (str_buf_p, "bravo", (size_t) sz))
{
JERRY_ASSERT (jerry_value_is_boolean (value));
JERRY_ASSERT (jerry_get_boolean_value (value) == false);
return true;
}
else if (!strncmp (str_buf_p, "charlie", (size_t) sz))
{
JERRY_ASSERT (jerry_value_is_object (value));
return true;
}
else if (!strncmp (str_buf_p, "delta", (size_t) sz))
{
JERRY_ASSERT (jerry_value_is_number (value));
JERRY_ASSERT (jerry_get_number_value (value) == 123.45);
return true;
}
else if (!strncmp (str_buf_p, "echo", (size_t) sz))
{
Expand All @@ -220,6 +221,7 @@ foreach (const jerry_value_t name, /**< field name */
128);
str_buf_p[echo_sz] = '\0';
JERRY_ASSERT (!strncmp (str_buf_p, "foobar", (size_t) echo_sz));
return true;
}

JERRY_ASSERT (false);
Expand Down