claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add OS/2 driver courtesy of KO Myung-Hun. Security: Add "%s" to cdparanoia's fprintfs

Browse Source
This commit is contained in:
R. Bernstein
2009-02-08 05:52:49 -05:00
parent 7c497a2c73
commit 58d87158cf
13 changed files with 1650 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cd-paranoia/cd-paranoia.c
View File

@@ -1,7 +1,7 @@
/*
$Id: cd-paranoia.c,v 1.37 2008/06/19 15:44:30 flameeyes Exp $
Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
(C) 1998 Monty <xiphmont@mit.edu>
This program is free software: you can redistribute it and/or modify
@@ -528,10 +528,10 @@ callback(long int inpos, paranoia_cb_mode_t function)
buffer[aheadposition+19]='>';
}
fprintf(stderr,buffer);
fprintf(stderr, "%s", buffer);
if (logfile != NULL && function==-1) {
fprintf(logfile,buffer+1);
fprintf(logfile, "%s", buffer+1);
fprintf(logfile,"\n\n");
fflush(logfile);
}

2
src/cd-paranoia/report.c
View File

@@ -36,7 +36,7 @@ void
report(const char *s)
{
if (!quiet) {
fprintf(stderr,s);
fprintf(stderr, "%s", s);
fputc('\n',stderr);
}
}

6
src/cdda-player.c
View File

@@ -1,7 +1,7 @@
/*
$Id: cdda-player.c,v 1.50 2008/06/19 15:44:14 flameeyes Exp $
Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
Adapted from Gerd Knorr's player.c program <kraxel@bytesex.org>
Copyright (C) 1997, 1998
@@ -110,7 +110,9 @@ static bool b_verbose = false;
static bool debug = false;
static bool b_interactive = true;
static bool b_prefer_cdtext = true;
#ifdef CDDB_ADDED
static bool b_cddb = false; /* CDDB database present */
#endif
static bool b_db = false; /* we have a database at all */
static bool b_record = false; /* we have a record for
static the inserted CD */
@@ -143,7 +145,9 @@ static char year[5];
static bool b_cdtext_title; /* true if from CD-Text, false if from CDDB */
static bool b_cdtext_artist; /* true if from CD-Text, false if from CDDB */
static bool b_cdtext_genre; /* true if from CD-Text, false if from CDDB */
#ifdef CDTEXT_CATEGORY_ADDED
static bool b_cdtext_category; /* true if from CD-Text, false if from CDDB */
#endif
static bool b_cdtext_year; /* true if from CD-Text, false if from CDDB */
static cdio_audio_volume_t audio_volume;

4
src/util.c
View File

@@ -1,7 +1,7 @@
/*
$Id: util.c,v 1.54 2008/04/14 17:30:27 karl Exp $
Copyright (C) 2003, 2004, 2005, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -160,7 +160,7 @@ open_input(const char *psz_source, source_image_t source_image,
char *
fillout_device_name(const char *device_name)
{
#if defined(HAVE_WIN32_CDROM)
#if defined(HAVE_WIN32_CDROM) || defined(HAVE_OS2_CDROM)
return strdup(device_name);
#else
unsigned int prefix_len = strlen(DEV_PREFIX);