pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-03 00:03:12 +02:00
Code Activity

relay: fix read of one buffer line in API protocol

Browse Source
This commit is contained in:
Sébastien Helleu
2024-06-27 07:12:31 +02:00
parent f076db4767
commit b04e1ffd27
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -42,6 +42,7 @@
- core, plugins: return "0x0" instead of "(nil)" for pointers formatted in strings
- php: fix return value of function hdata_longlong
- tcl: fix return value of function hdata_longlong ([#2119](https://github.com/weechat/weechat/issues/2119))
- relay: fix read of one buffer line in API protocol
- relay: fix websocket permessage-deflate extension when the client doesn't send the max window bits parameters ([#1549](https://github.com/weechat/weechat/issues/1549))
- relay: fix allocation and reinit of field "client_context_takeover" in websocket deflate structure ([#1549](https://github.com/weechat/weechat/issues/1549))
- core: fix completion of command `/item refresh`
src/plugins/relay/api/relay-api-protocol.c
+26 -3
View File
@@ -507,8 +507,11 @@ RELAY_API_PROTOCOL_CALLBACK(buffers)
{
cJSON *json;
struct t_gui_buffer *ptr_buffer;
long lines, lines_free;
struct t_gui_line *ptr_line;
struct t_gui_line_data *ptr_line_data;
long lines, lines_free, line_id;
int nicks;
char *error;
enum t_relay_api_colors colors;
ptr_buffer = NULL;
@@ -534,8 +537,28 @@ RELAY_API_PROTOCOL_CALLBACK(buffers)
/* sub-resource of buffers */
if (strcmp (client->http_req->path_items[3], "lines") == 0)
{
lines = relay_http_get_param_long (client->http_req, "lines", LONG_MAX);
json = relay_api_msg_lines_to_json (ptr_buffer, lines, colors);
if (client->http_req->num_path_items > 4)
{
line_id = strtol (client->http_req->path_items[4], &error, 10);
ptr_line = (error && !error[0]) ?
weechat_line_search_by_id (ptr_buffer, line_id) : NULL;
ptr_line_data = (ptr_line) ?
weechat_hdata_pointer (relay_hdata_line, ptr_line, "data") : NULL;
if (!ptr_line_data)
{
relay_api_msg_send_error_json (client, RELAY_HTTP_404_NOT_FOUND, NULL,
"Line \"%s\" not found in buffer \"%s\"",
client->http_req->path_items[4],
client->http_req->path_items[2]);
return RELAY_API_PROTOCOL_RC_OK;
}
json = relay_api_msg_line_data_to_json (ptr_line_data, colors);
}
else
{
lines = relay_http_get_param_long (client->http_req, "lines", LONG_MAX);
json = relay_api_msg_lines_to_json (ptr_buffer, lines, colors);
}
}
else if (strcmp (client->http_req->path_items[3], "nicks") == 0)
{
src/plugins/relay/api/relay-api.h
+1 -1
View File
@@ -24,7 +24,7 @@ struct t_relay_client;
enum t_relay_status;
#define RELAY_API_VERSION_MAJOR 0
#define RELAY_API_VERSION_MINOR 1
#define RELAY_API_VERSION_MINOR 2
#define RELAY_API_VERSION_PATCH 0
#define RELAY_API_VERSION_NUMBER \
((RELAY_API_VERSION_MAJOR << 16) \