38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From ec75b3393506a6f71a477ac3982b31a48a42c196 Mon Sep 17 00:00:00 2001
|
|
From: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Date: Sat, 17 Dec 2022 12:23:45 -0800
|
|
Subject: [PATCH libXpm 1/5] Fix CVE-2022-46285: Infinite loop on unclosed
|
|
comments
|
|
|
|
When reading XPM images from a file with libXpm 3.5.14 or older, if a
|
|
comment in the file is not closed (i.e. a C-style comment starts with
|
|
"/*" and is missing the closing "*/"), the ParseComment() function will
|
|
loop forever calling getc() to try to read the rest of the comment,
|
|
failing to notice that it has returned EOF, which may cause a denial of
|
|
service to the calling program.
|
|
|
|
Reported-by: Marco Ivaldi <raptor@0xdeadbeef.info>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
---
|
|
src/data.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/data.c b/src/data.c
|
|
index 898889c..bfad4ff 100644
|
|
--- a/src/data.c
|
|
+++ b/src/data.c
|
|
@@ -174,6 +174,10 @@ ParseComment(xpmData *data)
|
|
notend = 0;
|
|
Ungetc(data, *s, file);
|
|
}
|
|
+ else if (c == EOF) {
|
|
+ /* hit end of file before the end of the comment */
|
|
+ return XpmFileInvalid;
|
|
+ }
|
|
}
|
|
return 0;
|
|
}
|
|
--
|
|
2.39.0
|
|
|