p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Bump liberty, fix calloc argument order
Alpine 3.20 Success Details
Arch Linux AUR Success Details
OpenBSD 7.5 Success Details

This commit is contained in:
Přemysl Eric Janouch 2024-08-08 09:08:20 +02:00
parent 6934550068
commit ac1a21eac8
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
json-rpc-shell.c
View File

@ -601,7 +601,7 @@ input_el_on_return (EditLine *editline, int key)
int len = info->lastchar - info->buffer; int len = info->lastchar - info->buffer;
int point = info->cursor - info->buffer; int point = info->cursor - info->buffer;
wchar_t *line = calloc (sizeof *info->buffer, len + 1); wchar_t *line = xcalloc (len + 1, sizeof *info->buffer);
memcpy (line, info->buffer, sizeof *info->buffer * len); memcpy (line, info->buffer, sizeof *info->buffer * len);
if (*line) if (*line)
@ -762,7 +762,7 @@ input_el_hide (struct input *input)
int len = info->lastchar - info->buffer; int len = info->lastchar - info->buffer;
int point = info->cursor - info->buffer; int point = info->cursor - info->buffer;
wchar_t *line = calloc (sizeof *info->buffer, len + 1); wchar_t *line = xcalloc (len + 1, sizeof *info->buffer);
memcpy (line, info->buffer, sizeof *info->buffer * len); memcpy (line, info->buffer, sizeof *info->buffer * len);
el_cursor (self->editline, len - point); el_cursor (self->editline, len - point);
el_wdeletestr (self->editline, len); el_wdeletestr (self->editline, len);
@ -1225,7 +1225,7 @@ await_try_cancel (struct app_context *ctx)
static void on_config_attribute_change (struct config_item *item); static void on_config_attribute_change (struct config_item *item);
static struct config_schema g_config_connection[] = static const struct config_schema g_config_connection[] =
{ {
{ .name = "tls_ca_file", { .name = "tls_ca_file",
.comment = "OpenSSL CA bundle file", .comment = "OpenSSL CA bundle file",
@ -1236,7 +1236,7 @@ static struct config_schema g_config_connection[] =
{} {}
}; };
static struct config_schema g_config_attributes[] = static const struct config_schema g_config_attributes[] =
{ {
#define XX(x, y, z) { .name = y, .comment = z, .type = CONFIG_ITEM_STRING, \ #define XX(x, y, z) { .name = y, .comment = z, .type = CONFIG_ITEM_STRING, \
.on_change = on_config_attribute_change }, .on_change = on_config_attribute_change },

2
liberty

@ -1 +1 @@
Subproject commit 7a0cb13a1a653f61b0e715f79156046898d0dd1b Subproject commit 75fc6f1c374796f9e794297c3893089009b8772f