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

Was accessing outside of check2list causing wild looping. Turn all

Browse Source 
sprintf's to snprintf's and check the return.

Turn check1list and check2list looping into a fixed constant number of
iterations rather than rely on a sentinal.
This commit is contained in:
rocky
2008-06-25 07:46:20 +00:00
parent 3685c0d78e
commit 9c32ef00a0
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/driver/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.24 2008/03/27 17:40:50 rocky Exp $ # $Id: Makefile.am,v 1.25 2008/06/25 07:46:20 rocky Exp $
# #
# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
# Rocky Bernstein <rocky@gnu.org> # Rocky Bernstein <rocky@gnu.org>
@@ -101,7 +101,7 @@ lib_LTLIBRARIES = libcdio.la
libcdio_la_LIBADD = @LIBICONV@ libcdio_la_LIBADD = @LIBICONV@
libcdio_la_SOURCES = $(libcdio_sources) libcdio_la_SOURCES = $(libcdio_sources)
libcdio_la_ldflags = -version-info $(libcdio_la_CURRENT):$(libcdio_la_REVISION):$(libcdio_la_AGE) libcdio_la_ldflags = -version-info $(libcdio_la_CURRENT):$(libcdio_la_REVISION):$(libcdio_la_AGE) @LT_NO_UNDEFINED@
INCLUDES = $(LIBCDIO_CFLAGS) INCLUDES = $(LIBCDIO_CFLAGS)

26
lib/driver/gnu_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: gnu_linux.c,v 1.32 2008/06/13 19:33:13 flameeyes Exp $ $Id: gnu_linux.c,v 1.33 2008/06/25 07:46:21 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: gnu_linux.c,v 1.32 2008/06/13 19:33:13 flameeyes Exp $"; static const char _rcsid[] = "$Id: gnu_linux.c,v 1.33 2008/06/25 07:46:21 rocky Exp $";
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
@@ -1327,8 +1327,9 @@ set_arg_linux (void *p_user_data, const char key[], const char value[])
/* checklist: /dev/cdrom, /dev/dvd /dev/hd?, /dev/scd? /dev/sr? */ /* checklist: /dev/cdrom, /dev/dvd /dev/hd?, /dev/scd? /dev/sr? */
static const char checklist1[][40] = { static const char checklist1[][40] = {
{"cdrom"}, {"dvd"}, {""} {"cdrom"}, {"dvd"}
}; };
static const int checklist1_size = sizeof(checklist1) / sizeof(checklist1[0]);
static const struct static const struct
{ {
@@ -1341,8 +1342,9 @@ checklist2[] =
{ "/dev/hd%c", 'a', 'z' }, { "/dev/hd%c", 'a', 'z' },
{ "/dev/scd%d", 0, 27 }, { "/dev/scd%d", 0, 27 },
{ "/dev/sr%d", 0, 27 }, { "/dev/sr%d", 0, 27 },
{ /* End of array */ }
}; };
static const int checklist2_size = sizeof(checklist2) / sizeof(checklist2[0]);
/* Set CD-ROM drive speed */ /* Set CD-ROM drive speed */
static driver_return_code_t static driver_return_code_t
@@ -1373,8 +1375,9 @@ cdio_get_devices_linux (void)
/* Scan the system for CD-ROM drives. /* Scan the system for CD-ROM drives.
*/ */
for ( i=0; strlen(checklist1[i]) > 0; ++i ) { for ( i=0; i < checklist1_size; ++i ) {
sprintf(drive, "/dev/%s", checklist1[i]); if (snprintf(drive, sizeof(drive), "/dev/%s", checklist1[i]) < 0)
continue;
if ( is_cdrom_linux(drive, NULL) > 0 ) { if ( is_cdrom_linux(drive, NULL) > 0 ) {
cdio_add_device_list(&drives, drive, &num_drives); cdio_add_device_list(&drives, drive, &num_drives);
} }
@@ -1395,10 +1398,11 @@ cdio_get_devices_linux (void)
/* Scan the system for CD-ROM drives. /* Scan the system for CD-ROM drives.
Not always 100% reliable, so use the USE_MNTENT code above first. Not always 100% reliable, so use the USE_MNTENT code above first.
*/ */
for ( i=0; checklist2[i].format; ++i ) { for ( i=0; i < checklist2_size; ++i ) {
unsigned int j; unsigned int j;
for ( j=checklist2[i].num_min; j<=checklist2[i].num_max; ++j ) { for ( j=checklist2[i].num_min; j<=checklist2[i].num_max; ++j ) {
sprintf(drive, checklist2[i].format, j); if (snprintf(drive, sizeof(drive), checklist2[i].format, j) < 0)
continue;
if ( (is_cdrom_linux(drive, NULL)) > 0 ) { if ( (is_cdrom_linux(drive, NULL)) > 0 ) {
cdio_add_device_list(&drives, drive, &num_drives); cdio_add_device_list(&drives, drive, &num_drives);
} }
@@ -1426,7 +1430,8 @@ cdio_get_default_device_linux(void)
/* Scan the system for CD-ROM drives. /* Scan the system for CD-ROM drives.
*/ */
for ( i=0; strlen(checklist1[i]) > 0; ++i ) { for ( i=0; strlen(checklist1[i]) > 0; ++i ) {
sprintf(drive, "/dev/%s", checklist1[i]); if (snprintf(drive, sizeof(drive), "/dev/%s", checklist1[i]) < 0)
continue;
if ( is_cdrom_linux(drive, NULL) > 0 ) { if ( is_cdrom_linux(drive, NULL) > 0 ) {
return strdup(drive); return strdup(drive);
} }
@@ -1446,7 +1451,8 @@ cdio_get_default_device_linux(void)
for ( i=0; checklist2[i].format; ++i ) { for ( i=0; checklist2[i].format; ++i ) {
unsigned int j; unsigned int j;
for ( j=checklist2[i].num_min; j<=checklist2[i].num_max; ++j ) { for ( j=checklist2[i].num_min; j<=checklist2[i].num_max; ++j ) {
sprintf(drive, checklist2[i].format, j); if (snprintf(drive, sizeof(drive), checklist2[i].format, j) < 0)
continue;
if ( is_cdrom_linux(drive, NULL) > 0 ) { if ( is_cdrom_linux(drive, NULL) > 0 ) {
return(strdup(drive)); return(strdup(drive));
} }