[SCM] libmpc/master: Fix use of cue_parse_file

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Sep 11 17:15:19 UTC 2016


The following commit has been merged in the master branch:
commit c5d58b20d6b9d05f7699605d2a545b1e2c6e4236
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Sep 11 19:11:47 2016 +0200

    Fix use of cue_parse_file

diff --git a/debian/patches/03_mpcchap.patch b/debian/patches/03_mpcchap.patch
index 1a740b5..917f1a0 100644
--- a/debian/patches/03_mpcchap.patch
+++ b/debian/patches/03_mpcchap.patch
@@ -42,7 +42,7 @@
  
  // tags.c
  void    Init_Tags        ( void );
-@@ -161,14 +161,14 @@
+@@ -161,18 +161,26 @@
  mpc_status add_chaps_cue(char * mpc_file, char * chap_file, mpc_demux * demux, mpc_streaminfo * si)
  {
  	Cd *cd = 0;
@@ -55,7 +55,19 @@
      mpc_status ret = MPC_STATUS_OK;
  
 -	if (0 == (cd = cf_parse(chap_file, &format))) {
-+	if (0 == (cd = cue_parse_file(chap_file))) {
++	in_file = fopen(chap_file, "r");
++	if (NULL == in_file) {
  		fprintf(stderr, "%s: input file error\n", chap_file);
  		return !MPC_STATUS_OK;
  	}
+ 
++	if (0 == (cd = cue_parse_file(in_file))) {
++		fclose(in_file);
++		fprintf(stderr, "%s: input file error\n", chap_file);
++		return !MPC_STATUS_OK;
++	}
++	fclose(in_file);
++
+ 	chap_pos = (demux->chap_pos >> 3) + si->header_position;
+ 	end_pos = mpc_demux_pos(demux) >> 3;
+ 	chap_size = end_pos - chap_pos;

-- 
libmpc packaging



More information about the pkg-multimedia-commits mailing list