fixed swfextract -F segfault error

[swftools.git] / lib / modules / swftext.c

diff --git a/lib/modules/swftext.c b/lib/modules/swftext.c
index 90e44cb..55fe659 100644 (file)
--- a/lib/modules/swftext.c
+++ b/lib/modules/swftext.c
@@ -896,7 +896,7 @@ void swf_WriteFont(SWFFONT*font, char* filename)
     swf_FontSetDefine2(t,font);
   }
 
-  if(storeGlyphNames)
+  if(storeGlyphNames && font->glyphnames)
   {
     int c;
     t = swf_InsertTag(t,ST_GLYPHNAMES);
@@ -1201,11 +1201,12 @@ void swf_DrawText(drawer_t*draw, SWFFONT*font, char*text)
     while(*s) {
        SHAPE*shape;
        SHAPE2*shape2;
+       SHAPELINE*l;
        U32 c = readUTF8char(&s);
        int g = font->ascii2glyph[c];
        shape = font->glyph[g].shape;
        shape2 = swf_ShapeToShape2(shape);
-       SHAPELINE*l = shape2->lines;
+       l = shape2->lines;
        while(l) {
            if(l->type == moveTo) {
                FPOINT to;