changeset 241:a1e15310703e trunk

[svn] Crash avoidance for zeroed cue sheets. By TiCPU, submitted in #audacious.
author chainsaw
date Mon, 13 Nov 2006 05:27:06 -0800
parents 59d793da5395
children e5d78e44971f
files ChangeLog src/cue/cuesheet.c
diffstat 2 files changed, 29 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Nov 13 04:51:30 2006 -0800
+++ b/ChangeLog	Mon Nov 13 05:27:06 2006 -0800
@@ -1,3 +1,26 @@
+2006-11-13 12:51:30 +0000  Giacomo Lozito <james@develia.org>
+  revision [498]
+  - import amidi-plug 0.7 (among new features, a transposer to play midi files in different keys)
+  trunk/src/amidi-plug/Makefile                 |    4 
+  trunk/src/amidi-plug/amidi-plug.c             |   18 +--
+  trunk/src/amidi-plug/amidi-plug.h             |   14 +-
+  trunk/src/amidi-plug/i_backend.c              |    1 
+  trunk/src/amidi-plug/i_common.h               |    2 
+  trunk/src/amidi-plug/i_configure-alsa.c       |    1 
+  trunk/src/amidi-plug/i_configure-ap.c         |  129 +++++++++++++++++++-------
+  trunk/src/amidi-plug/i_configure-fluidsynth.c |    8 -
+  trunk/src/amidi-plug/i_configure-timidity.c   |   90 ++++++++++++++++++
+  trunk/src/amidi-plug/i_configure-timidity.h   |   30 ++++++
+  trunk/src/amidi-plug/i_configure.c            |   12 ++
+  trunk/src/amidi-plug/i_configure.h            |    2 
+  trunk/src/amidi-plug/i_midi.c                 |   46 +++++++--
+  trunk/src/amidi-plug/i_midi.h                 |    2 
+  trunk/src/amidi-plug/i_utils.h                |    1 
+  trunk/src/amidi-plug/i_vfslayer.c             |   22 ++++
+  trunk/src/amidi-plug/i_vfslayer.h             |   38 +++++++
+  17 files changed, 355 insertions(+), 65 deletions(-)
+
+
 2006-11-13 12:35:19 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [496]
   FD leak fix by TiCPU, submitted in #audacious.
--- a/src/cue/cuesheet.c	Mon Nov 13 04:51:30 2006 -0800
+++ b/src/cue/cuesheet.c	Mon Nov 13 05:27:06 2006 -0800
@@ -175,6 +175,9 @@
 
 	cache_cue_file(path2);
 
+	if (cue_file == NULL)
+		return NULL;
+
 	dec = input_check_file(cue_file, FALSE);
 
 	if (dec == NULL)
@@ -273,6 +276,9 @@
 
 	cache_cue_file(path2);
 
+        if (cue_file == NULL)
+                return NULL;
+
 	real_ip = input_check_file(cue_file, FALSE);
 
 	if (real_ip != NULL)