summaryrefslogtreecommitdiffstats
path: root/src/base/ftstream.c
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2009-06-08 15:18:21 +0200
committerDavid 'Digit' Turner <digit@google.com>2009-06-08 15:18:21 +0200
commit77f63d23f7d380b0ff02c18fd6a154ab9063128a (patch)
tree14b8437e23a816c57512fe472fdef4c7875c2eba /src/base/ftstream.c
parentd04869994887b14ee43c9f8a9a8597193b5a7107 (diff)
downloadandroid_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.tar.gz
android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.tar.bz2
android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.zip
Integrate FreeType 2.3.9 into the donut tree.
This is done to get fixes for a few security-related issues. NOTE: the auto-hinter hasn't been changed to avoid modifying the rendering of characters. The 2.3.9 code contains minor fixes (not security-related) that could in theory do that (though extensive testing is needed to evaluate its real impact on Android).
Diffstat (limited to 'src/base/ftstream.c')
-rw-r--r--src/base/ftstream.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index 569e46c..cff67e0 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -707,12 +707,13 @@
{
FT_Error error;
FT_Bool frame_accessed = 0;
- FT_Byte* cursor = stream->cursor;
-
+ FT_Byte* cursor;
if ( !fields || !stream )
return FT_Err_Invalid_Argument;
+ cursor = stream->cursor;
+
error = FT_Err_Ok;
do
{