mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 16:36:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

cmd_results_to_json: return copied string and properly free the json

Browse source 
The only user of this function would copy the string right away
to get rid of the const flag anyway, and freeing a const string
afterwards might work but is not meant to be done according to the
json-c API.
This commit is contained in:
Dominique Martinet 2018-07-05 07:07:59 +09:00
parent 9314c45c41
commit fe72e3b349
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/commands.h
View file

@ -79,7 +79,7 @@ void free_cmd_results(struct cmd_results *results);
* *
* Free the JSON string later on. * Free the JSON string later on.
*/ */
const char *cmd_results_to_json(struct cmd_results *results); char *cmd_results_to_json(struct cmd_results *results);
struct cmd_results *add_color(const char *name, struct cmd_results *add_color(const char *name,
char *buffer, const char *color); char *buffer, const char *color);

8
sway/commands.c
View file

@ -527,7 +527,7 @@ void free_cmd_results(struct cmd_results *results) {
free(results); free(results);
} }
const char *cmd_results_to_json(struct cmd_results *results) { char *cmd_results_to_json(struct cmd_results *results) {
json_object *result_array = json_object_new_array(); json_object *result_array = json_object_new_array();
json_object *root = json_object_new_object(); json_object *root = json_object_new_object();
json_object_object_add(root, "success", json_object_object_add(root, "success",
@ -542,9 +542,9 @@ const char *cmd_results_to_json(struct cmd_results *results) {
} }
json_object_array_add(result_array, root); json_object_array_add(result_array, root);
const char *json = json_object_to_json_string(result_array); const char *json = json_object_to_json_string(result_array);
free(result_array); char *res = strdup(json);
free(root); json_object_put(result_array);
return json; return res;
} }
/** /**

7
sway/ipc-server.c
View file

@ -481,11 +481,10 @@ void ipc_client_handle_command(struct ipc_client *client) {
case IPC_COMMAND: case IPC_COMMAND:
{ {
struct cmd_results *results = execute_command(buf, NULL); struct cmd_results *results = execute_command(buf, NULL);
const char *json = cmd_results_to_json(results); char *json = cmd_results_to_json(results);
char reply[256]; int length = strlen(json);
int length = snprintf(reply, sizeof(reply), "%s", json); client_valid = ipc_send_reply(client, json, (uint32_t)length);
free(json); free(json);
client_valid = ipc_send_reply(client, reply, (uint32_t)length);
free_cmd_results(results); free_cmd_results(results);
goto exit_cleanup; goto exit_cleanup;
} }