X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=a228b2432f9b56d3bc51535c13d74094314e7da9;hp=bbe84734deffd189d7fb8d05ac3e58877b356f8f;hb=c20e3e67fc2be1d5f8778b9c482271e023bbdcb8;hpb=88bf6848d1c58ad0e0d9b62d7da2a81cea5bf0ff

diff --git a/mood.c b/mood.c
index bbe84734..a228b243 100644
--- a/mood.c
+++ b/mood.c
@@ -163,6 +163,8 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m,
 	PARA_INFO_LOG("opening mood %s\n", mood_name);
 	ret = mp_init(mood_def.data, mood_def.size, &(*m)->parser_context, errmsg);
 	osl_close_disk_object(&mood_def);
+	if (ret < 0)
+		destroy_mood(*m);
 	return ret;
 }
 
@@ -605,8 +607,7 @@ static void compute_correction_factors(int64_t sse)
  *
  * If there is already an open mood, it will be closed first.
  *
- * \return Positive on success, negative on errors. Loading the dummy mood
- * always succeeds.
+ * \return Positive on success, negative on errors.
  *
  * \sa struct \ref afs_info::last_played, \ref mp_eval_row().
  */
@@ -626,10 +627,14 @@ int change_current_mood(const char *mood_name, char **errmsg)
 	if (mood_name) {
 		struct mood *m;
 		struct osl_row *row;
-		struct osl_object obj = {
-			.data = (char *)mood_name,
-			.size = strlen(mood_name) + 1
-		};
+		struct osl_object obj;
+
+		if (!*mood_name) {
+			*errmsg = make_message("empty mood name");
+			return -ERRNO_TO_PARA_ERROR(EINVAL);
+		}
+		obj.data = (char *)mood_name;
+		obj.size = strlen(mood_name) + 1;
 		ret = osl(osl_get_row(moods_table, BLOBCOL_NAME, &obj, &row));
 		if (ret < 0) {
 			if (errmsg)
@@ -652,7 +657,7 @@ int change_current_mood(const char *mood_name, char **errmsg)
 	if (ret < 0) {
 		if (errmsg)
 			*errmsg = make_message("audio file loop failed");
-		return ret;
+		goto out;
 	}
 	clock_get_realtime(&rnow);
 	compute_correction_factors(rnow.tv_sec);
@@ -669,6 +674,8 @@ int change_current_mood(const char *mood_name, char **errmsg)
 	ret = statistics.num;
 out:
 	free(aa.array);
+	if (ret < 0)
+		close_current_mood();
 	return ret;
 }