[Pmplib-commits] SF.net SVN: pmplib: [215] trunk/pmplib/lib/gmi

[<ny...@us...>]

Revision: 215
          http://svn.sourceforge.net/pmplib/?rev=215&view=rev
Author:   nyaochi
Date:     2006-12-27 21:09:07 -0800 (Wed, 27 Dec 2006)

Log Message:
-----------
Fixed a crash when parsing MP3 files.

Modified Paths:
--------------
    trunk/pmplib/lib/gmi/gmi.vcproj
    trunk/pmplib/lib/gmi/gmi_mp3.c

Modified: trunk/pmplib/lib/gmi/gmi.vcproj
===================================================================
--- trunk/pmplib/lib/gmi/gmi.vcproj	2006-12-28 04:54:57 UTC (rev 214)
+++ trunk/pmplib/lib/gmi/gmi.vcproj	2006-12-28 05:09:07 UTC (rev 215)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=".\contrib\id3tag\win32\libid3tagd.lib .\contrib\id3tag\win32\zlibd.lib .\contrib\ogg\win32\ogg_static_d.lib .\contrib\vorbis\win32\vorbisfile_static_d.lib"
+				AdditionalDependencies=".\contrib\id3tag\win32\libid3tagd.lib .\contrib\id3tag\win32\zlibd.lib .\contrib\ogg\win32\ogg_static_d.lib .\contrib\vorbis\win32\vorbis_static_d.lib .\contrib\vorbis\win32\vorbisfile_static_d.lib"
 				OutputFile="$(OutDir)/gmi.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -139,7 +139,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=".\contrib\id3tag\win32\libid3tag.lib .\contrib\id3tag\win32\zlib.lib .\contrib\ogg\win32\ogg_static.lib .\contrib\vorbis\win32\vorbisfile_static.lib"
+				AdditionalDependencies=".\contrib\id3tag\win32\libid3tag.lib .\contrib\id3tag\win32\zlib.lib .\contrib\ogg\win32\ogg_static.lib .\contrib\vorbis\win32\vorbis_static.lib .\contrib\vorbis\win32\vorbisfile_static.lib"
 				OutputFile="$(OutDir)/gmi.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: trunk/pmplib/lib/gmi/gmi_mp3.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi_mp3.c	2006-12-28 04:54:57 UTC (rev 214)
+++ trunk/pmplib/lib/gmi/gmi_mp3.c	2006-12-28 05:09:07 UTC (rev 215)
@@ -486,8 +486,7 @@
 		info->duration = mp3header.duration;
 	}
 
-	id3_file_close(id3file);
-	fclose(fp);
+	id3_file_close(id3file);	/* This will call fclose(fp); */
 	info->codec = PMPCODEC_MPEGLAYER3;
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.