diff options
| author | Chris Palmer <palmer@google.com> | 2010-08-09 17:46:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-09 17:46:56 -0700 |
| commit | d4476115dee94297c020b3a2b067188117424e25 (patch) | |
| tree | 60f6d3c40590a7dc310bfe91e1d88f8b552bda3f | |
| parent | cf16c2a2b641d98b99f7e943091c530e41f1d62e (diff) | |
| parent | ff8c8b2dfd829fd7b352355cbaf0052a998cc09d (diff) | |
| download | android_external_freetype-d4476115dee94297c020b3a2b067188117424e25.tar.gz android_external_freetype-d4476115dee94297c020b3a2b067188117424e25.tar.bz2 android_external_freetype-d4476115dee94297c020b3a2b067188117424e25.zip | |
am ff8c8b2d: Apply stack overflow patch from http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=11d65e8a1f1f14e56148fd991965424d9bd1cdbc
Merge commit 'ff8c8b2dfd829fd7b352355cbaf0052a998cc09d' into gingerbread
* commit 'ff8c8b2dfd829fd7b352355cbaf0052a998cc09d':
Apply stack overflow patch from
| -rw-r--r-- | src/cff/cffgload.c | 5 |
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 */ |