[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 4dc0d48: [psaux] Avoid slow PS font parsing in case o
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 4dc0d48: [psaux] Avoid slow PS font parsing in case of error. |
Date: |
Sat, 18 Aug 2018 08:39:44 -0400 (EDT) |
branch: master
commit 4dc0d48f7bf939f893bc203239600fc56c63e39c
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[psaux] Avoid slow PS font parsing in case of error.
Reported as
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9955
* src/psaux/psobjs.c (ps_parser_to_bytes): Set `parser->cursor' even
in case of error to avoid potential re-scanning.
---
ChangeLog | 13 ++++++++++++-
src/psaux/psobjs.c | 6 +++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4e30cdc..7b7c7cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
-2018-08-14 Werner Lemberg <address@hidden>
+2018-08-18 Werner Lemberg <address@hidden>
+
+ [psaux] Avoid slow PS font parsing in case of error.
+
+ Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9955
+
+ * src/psaux/psobjs.c (ps_parser_to_bytes): Set `parser->cursor' even
+ in case of error to avoid potential re-scanning.
+
+2018-08-18 Werner Lemberg <address@hidden>
[cff] Fix heap buffer overflow in old engine.
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 97c9cb1..906c008 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -1447,6 +1447,8 @@
bytes,
max_bytes );
+ parser->cursor = cur;
+
if ( delimiters )
{
if ( cur < parser->limit && *cur != '>' )
@@ -1456,11 +1458,9 @@
goto Exit;
}
- cur++;
+ parser->cursor++;
}
- parser->cursor = cur;
-
Exit:
return error;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 4dc0d48: [psaux] Avoid slow PS font parsing in case of error.,
Werner LEMBERG <=