40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From ec80a9196e2aedfd617d05964725f113000a41ea Mon Sep 17 00:00:00 2001
|
||
|
|
From: Brad House <brad@brad-house.com>
|
||
|
|
Date: Thu, 22 Feb 2024 16:23:33 -0500
|
||
|
|
Subject: [PATCH] Address CVE-2024-25629
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Original commit title: Merge pull request from GHSA-mg26-v6qh-x48q
|
||
|
|
|
||
|
|
Signed-off-by: Jan Staněk <jstanek@redhat.com>
|
||
|
|
Fixes: CVE-2024-25629
|
||
|
|
Signed-off-by: rpm-build <rpm-build>
|
||
|
|
---
|
||
|
|
deps/cares/src/lib/ares__read_line.c | 8 ++++++++
|
||
|
|
1 file changed, 8 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/deps/cares/src/lib/ares__read_line.c b/deps/cares/src/lib/ares__read_line.c
|
||
|
|
index c62ad2a..16627e4 100644
|
||
|
|
--- a/deps/cares/src/lib/ares__read_line.c
|
||
|
|
+++ b/deps/cares/src/lib/ares__read_line.c
|
||
|
|
@@ -49,6 +49,14 @@ int ares__read_line(FILE *fp, char **buf, size_t *bufsize)
|
||
|
|
if (!fgets(*buf + offset, bytestoread, fp))
|
||
|
|
return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
|
||
|
|
len = offset + strlen(*buf + offset);
|
||
|
|
+
|
||
|
|
+ /* Probably means there was an embedded NULL as the first character in
|
||
|
|
+ * the line, throw away line */
|
||
|
|
+ if (len == 0) {
|
||
|
|
+ offset = 0;
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
if ((*buf)[len - 1] == '\n')
|
||
|
|
{
|
||
|
|
(*buf)[len - 1] = 0;
|
||
|
|
--
|
||
|
|
2.44.0
|
||
|
|
|