Hi folks,
It seems there is no file existence check on -x argument in dvdcli.c. This causes
Segmentation fault when a non-existing file is given as argument:
# dvdauthor-0.6.14.tar.gz compiled on Linux 2.6.28-15-generic
# #49-Ubuntu SMP Tue Aug 18 18:40:08 UTC 2009 i686 GNU/Linux, gcc
# version 4.3.3 (Ubuntu 4.3.3-5ubuntu4
~/download/dvdauthor/dvdauthor-0.6.14$ ./src/dvdauthor -x nosuchfile.xml
DVDAuthor::dvdauthor, version 0.6.14.
Build options: gnugetopt iconv freetype
Send bugs to
Segmentation fault
~/download/dvdauthor/dvdauthor-0.6.14$
# Apply attached patch
~/download/dvdauthor/dvdauthor-0.6.14$ ./src/dvdauthor -x nosuchfile.xml
DVDAuthor::dvdauthor, version 0.6.14.
Build options: gnugetopt iconv freetype
Send bugs to
ERR: File not found 'nosuchfile.xml'
~/download/dvdauthor/dvdauthor-0.6.14$
I'm not fluent in C so I take no offence if the another approach for checking file existence is used instead of the one used here.
Best regards,
Andreas
--
_________________________________________________________________
Show them the way! Add maps and directions to your party invites.
http://www.microsoft.com/windows/windowslive/products/events.aspx
diff --git a/src/dvdcli.c b/src/dvdcli.c
index 4ec2d4c..d379a89 100644
--- a/src/dvdcli.c
+++ b/src/dvdcli.c
@@ -24,6 +24,7 @@
#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
+#include <sys/stat.h>
#include "conffile.h"
#include "dvdauthor.h"
@@ -34,6 +35,7 @@
#define RGB2YCrCb(R,G,B) ((((int)RGB2Y(R,G,B))<<16)|(((int)RGB2Cr(R,G,B))<<8)|(((int)RGB2Cb(R,G,B))))
static int readdvdauthorxml(const char *xmlfile,char *fb);
+static int file_exists (char * fileName);
static int hadchapter=0,pauselen=0,writeoutput=1;
static char *chapters=0;
@@ -372,6 +374,7 @@ int main(int argc,char **argv)
usage();
break;
+ // must check file existence
case 'x':
if( usedtocflag ) {
fprintf(stderr,"ERR: Cannot specify XML config file after using command line options\n");
@@ -1151,5 +1154,22 @@ static struct elemattr attrs[]={
static int readdvdauthorxml(const char *xmlfile,char *fb)
{
fbase=fb;
+ if (file_exists(xmlfile) == 0)
+ {
+ fprintf(stderr,"ERR: File not found '%s'\n",xmlfile);
+ return 1;
+ }
return readxml(xmlfile,elems,attrs);
}
+
+static int file_exists (char * fileName)
+{
+ struct stat buf;
+ int i = stat ( fileName, &buf );
+ /* File found */
+ if ( i == 0 )
+ {
+ return 1;
+ }
+ return 0;
+}
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.
http://p.sf.net/sfu/bobj-july_______________________________________________
Dvdauthor-users mailing list
Dvdauthor-users@...
https://lists.sourceforge.net/lists/listinfo/dvdauthor-users
Some parts of this message have been removed.
Learn more about Nabble's 