summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Palmer <palmer@google.com>2010-08-09 14:13:40 -0700
committerChris Palmer <palmer@google.com>2010-08-09 14:13:40 -0700
commitff8c8b2dfd829fd7b352355cbaf0052a998cc09d (patch)
tree8a73191ecfc89f38ed77eb934b819525713c9158
parentbdbe09c32468272311d49ac8539c0378cf16ca08 (diff)
downloadandroid_external_freetype-ff8c8b2dfd829fd7b352355cbaf0052a998cc09d.tar.gz
android_external_freetype-ff8c8b2dfd829fd7b352355cbaf0052a998cc09d.tar.bz2
android_external_freetype-ff8c8b2dfd829fd7b352355cbaf0052a998cc09d.zip
Apply stack overflow patch from
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=11d65e8a1f1f14e56148fd991965424d9bd1cdbc Change-Id: I2df2f52928358225d53b22bcf258f36812d2515d
-rw-r--r--src/cff/cffgload.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 9330c05..4e17eb6 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -2448,7 +2448,10 @@
return CFF_Err_Unimplemented_Feature;
}
- decoder->top = args;
+ decoder->top = args;
+
+ if ( decoder->top - stack >= CFF_MAX_OPERANDS )
+ goto Stack_Overflow;
} /* general operator processing */