Subject: [PATCH] Merge pull request from GHSA-mg26-v6qh-x48q
From: a804c04ddc8245fc8adf0e92368709639125e183 Mon Sep 17 00:00:00 2001
Date: Mon, 11 Mar 2024 14:29:39 +0000

CVE: CVE-2024-25629
Upstream-Status: Backport [https://github.com/c-ares/c-ares/commit/a804c04ddc8245fc8adf0e92368709639125e183]
Signed-off-by: Ashish Sharma <[email-masked]>
---
 src/lib/ares__read_line.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/lib/ares__read_line.c b/src/lib/ares__read_line.c
index c62ad2a..d6625a3 100644
--- a/src/lib/ares__read_line.c
+++ b/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;
--