X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfextract.c;h=2d6b35766cd4fc360f374aa13a9023c00489cdf7;hb=a61b92b4ac72cd15ee0f3165f2e7a2f5ac00f156;hp=863faf50ba889ad4f47af8e70fe5d66e0f82bfef;hpb=6f9e657c0101322f5d2570407012362c7a019363;p=swftools.git

diff --git a/src/swfextract.c b/src/swfextract.c
index 863faf5..2d6b357 100644
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -483,7 +483,7 @@ int isOfType(int t, TAG*tag)
     if(t == 4 && (tag->id == ST_DEFINESOUND)) {
 	show = 1;
     }
-    if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2)) {
+    if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2 || tag->id == ST_DEFINEFONT3)) {
 	show = 1;
     }
     return show;
@@ -586,21 +586,21 @@ void handlefont(SWF*swf, TAG*tag)
 	printf("Couldn't extract font %d\n", id);
 	return;
     }
-    if(!f->layout)
-	swf_FontCreateLayout(f);
 
     swf_WriteFont(f, filename);
     swf_FontFree(f);
 }
 
-U8*jpegtables = 0;
-int jpegtablessize;
+static char has_jpegtables=0;
+static U8*jpegtables = 0;
+static int jpegtablessize = 0;
 
 void handlejpegtables(TAG*tag)
 {
     if(tag->id == ST_JPEGTABLES) {
 	jpegtables = tag->data;
 	jpegtablessize = tag->len;
+	has_jpegtables = 1;
     }
 }
 
@@ -618,7 +618,7 @@ int findjpegboundary(U8*data, int len)
 {
     int t;
     int pos=-1;
-    for(t=0;t<len;t++) {
+    for(t=0;t<len-4;t++) {
 	if(data[t  ]==0xff &&
 	   data[t+1]==0xd9 &&
 	   data[t+2]==0xff &&
@@ -645,10 +645,14 @@ void handlejpeg(TAG*tag)
     /* swf jpeg images have two streams, which both start with ff d8 and
        end with ff d9. The following code handles sorting the middle
        <ff d9 ff d8> bytes out, so that one stream remains */
-    if(tag->id == ST_DEFINEBITSJPEG && tag->len>2 && jpegtables) {
+    if(tag->id == ST_DEFINEBITSJPEG && tag->len>2 && has_jpegtables) {
 	fi = save_fopen(filename, "wb");
-	fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
-	fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
+	if(jpegtablessize>=2) {
+	    fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
+	    fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
+	} else {
+	    fwrite(tag->data+2, tag->len-2, 1, fi);
+	}
 	fclose(fi);
     }
     else if(tag->id == ST_DEFINEBITSJPEG2 && tag->len>2) {
@@ -669,17 +673,21 @@ void handlejpeg(TAG*tag)
     else if(tag->id == ST_DEFINEBITSJPEG3 && tag->len>6) {
 	U32 end = GET32(&tag->data[2])+6;
 	int pos = findjpegboundary(&tag->data[6], tag->len-6);
-	if(pos<0)
-	    return;
-	pos+=6;
-	fi = save_fopen(filename, "wb");
-	fwrite(&tag->data[6], pos-6, 1, fi);
-	fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
-	fclose(fi);
+	if(pos<0) {
+            fi = save_fopen(filename, "wb");
+            fwrite(&tag->data[6], end-6, 1, fi);
+            fclose(fi);
+        } else {
+            pos+=6;
+            fi = save_fopen(filename, "wb");
+            fwrite(&tag->data[6], pos-6, 1, fi);
+            fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
+            fclose(fi);
+        }
     }
     else {
 	int id = GET16(tag->data);
-	fprintf(stderr, "Object %d is not a JPEG picture!\n",id);
+	fprintf(stderr, "Object %d is not a JPEG picture!\n",id, jpegtables);
 	exit(1);
     }
 }
@@ -821,7 +829,7 @@ void handlelossless(TAG*tag)
     }
     msg("<verbose> Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols);
     pos = 0;
-    datalen2 = datalen;
+    datalen2 = datalen+16;
     data2 = malloc(datalen2);
     palette = (RGBA*)malloc(cols*sizeof(RGBA));
 
@@ -934,7 +942,7 @@ void handlelossless(TAG*tag)
 }
 #endif
 
-FILE*mp3file;
+static FILE*mp3file=0;
 void handlesoundstream(TAG*tag)
 {
     char*filename = "output.mp3";
@@ -1113,8 +1121,9 @@ int main (int argc,char ** argv)
 		handlesoundstream(tag);
 	}
 
-	if(tag->id == ST_JPEGTABLES)
+	if(tag->id == ST_JPEGTABLES) {
 	    handlejpegtables(tag);
+	}
 
 	if(swf_isDefiningTag(tag)) {
 	    int id = swf_GetDefineID(tag);
@@ -1176,8 +1185,13 @@ int main (int argc,char ** argv)
     if (found)
 	extractTag(&swf, destfilename);
 
-    if(mp3file)
+    if(mp3file) {
 	fclose(mp3file);
+    } else {
+        if(extractmp3) {
+            msg("<error> Didn't find a soundstream in file");
+        }
+    }
 
     swf_FreeTags(&swf);
     return 0;