[xiph-commits] r14891 - trunk/cdparanoia

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2008-05-15 20:55:43 -0700 (Thu, 15 May 2008)
New Revision: 14891

Modified:
   trunk/cdparanoia/buffering_write.c
   trunk/cdparanoia/main.c
   trunk/cdparanoia/version.h
Log:
Kill off one last buffering write potential segfault, correct version



Modified: trunk/cdparanoia/buffering_write.c
===================================================================
--- trunk/cdparanoia/buffering_write.c	2008-05-16 03:08:53 UTC (rev 14890)
+++ trunk/cdparanoia/buffering_write.c	2008-05-16 03:55:43 UTC (rev 14891)
@@ -49,7 +49,8 @@
 		bw_pos = 0;
 	}
 	/* save data */
-	memcpy(&bw_outbuf[bw_pos], buffer, num);
+	if(buffer && num)
+	  memcpy(&bw_outbuf[bw_pos], buffer, num);
 	bw_pos += num;
 
 	return(0);

Modified: trunk/cdparanoia/main.c
===================================================================
--- trunk/cdparanoia/main.c	2008-05-16 03:08:53 UTC (rev 14890)
+++ trunk/cdparanoia/main.c	2008-05-16 03:55:43 UTC (rev 14891)
@@ -807,7 +807,7 @@
     int i;
     for (i = 0; i < argc; i++) 
       fprintf(logfile,"%s ",argv[i]);
-    fprintf(logfile,"\n",argv[i]);
+    fprintf(logfile,"\n");
     
     fprintf(logfile,VERSION);
     fprintf(logfile,"\n");

Modified: trunk/cdparanoia/version.h
===================================================================
--- trunk/cdparanoia/version.h	2008-05-16 03:08:53 UTC (rev 14890)
+++ trunk/cdparanoia/version.h	2008-05-16 03:55:43 UTC (rev 14891)
@@ -1,10 +1,10 @@
 /******************************************************************
  * CopyPolicy: GNU Public License 3 applies
  * 
- * cdda_paranoia generation III release 10.0
+ * cdda_paranoia generation III release 10pre2
  * Copyright (C) 2008 Monty monty at xiph.org
  *
  ******************************************************************/
 
 
-#define VERSION "cdparanoia III release 10.0 (May 12, 2008)\n"
+#define VERSION "cdparanoia III release 10pre2 (May 15, 2008)\n"