72 lines
1.6 KiB
Diff
72 lines
1.6 KiB
Diff
From 356771c0c3c2b8040ba2ae83394460d1402d487b Mon Sep 17 00:00:00 2001
|
|
From: Miroslav Lichvar <mlichvar@redhat.com>
|
|
Date: Wed, 4 May 2022 20:17:23 GMT+8
|
|
Subject: [PATCH] rework command and limit the length of command
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/mlichvar/chrony/commit/356771c0c3c2b8040ba2ae83394460d1402d487b
|
|
|
|
---
|
|
client.c | 35 ++++++++++++++---------------------
|
|
1 file changed, 14 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/client.c b/client.c
|
|
index cc179c6..863906a 100644
|
|
--- a/client.c
|
|
+++ b/client.c
|
|
@@ -3409,37 +3409,30 @@ process_line(char *line)
|
|
|
|
/* ================================================== */
|
|
|
|
+#define MAX_LINE_LENGTH 2048
|
|
+
|
|
static int
|
|
process_args(int argc, char **argv, int multi)
|
|
{
|
|
- int total_length, i, ret = 0;
|
|
- char *line;
|
|
-
|
|
- total_length = 0;
|
|
- for(i=0; i<argc; i++) {
|
|
- total_length += strlen(argv[i]) + 1;
|
|
- }
|
|
-
|
|
- line = (char *) Malloc((2 + total_length) * sizeof(char));
|
|
+ char line[MAX_LINE_LENGTH];
|
|
+ int i, l, ret = 0;
|
|
|
|
- for (i = 0; i < argc; i++) {
|
|
- line[0] = '\0';
|
|
- if (multi) {
|
|
- strcat(line, argv[i]);
|
|
- } else {
|
|
- for (; i < argc; i++) {
|
|
- strcat(line, argv[i]);
|
|
- if (i + 1 < argc)
|
|
- strcat(line, " ");
|
|
- }
|
|
+ for (i = l = 0; i < argc; i++) {
|
|
+ l += snprintf(line + l, sizeof(line) - l, "%s ", argv[i]);
|
|
+ if (l >= sizeof(line)) {
|
|
+ LOG(LOGS_ERR, "Command too long");
|
|
+ return 0;
|
|
}
|
|
|
|
+ if (!multi && i + 1 < argc)
|
|
+ continue;
|
|
+
|
|
ret = process_line(line);
|
|
if (!ret || quit)
|
|
break;
|
|
- }
|
|
|
|
- Free(line);
|
|
+ l = 0;
|
|
+ }
|
|
|
|
return ret;
|
|
}
|
|
--
|
|
2.23.0
|
|
|