rpms/csound/OLPC-2 csound-5.07-log-segfault-fix.patch, NONE, 1.1 csound.spec, 1.12, 1.13

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/csound/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28337

Modified Files:
	csound.spec 
Added Files:
	csound-5.07-log-segfault-fix.patch 
Log Message:
* Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.2.cvs20070830
- Fix segfault when no logfile is specified



csound-5.07-log-segfault-fix.patch:

--- NEW FILE csound-5.07-log-segfault-fix.patch ---
--- csound5/frontends/csound/csound_main.c.segfix	2007-08-30 18:28:48.000000000 -0400
+++ csound5/frontends/csound/csound_main.c	2007-08-30 18:28:54.000000000 -0400
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
       else if (i < (argc - 1) && strcmp(argv[i], "-O") == 0)
         fname = argv[i + 1];
     }
-    if (!strcmp(fname, "NULL") || !strcmp(fname, "null")) nomessages = 1;
+    if (!fname || !strcmp(fname, "NULL") || !strcmp(fname, "null")) nomessages = 1;
   
      else if (fname != NULL) {
       if ((logFile = fopen(fname, "w")) == NULL) {


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/OLPC-2/csound.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- csound.spec	30 Aug 2007 13:12:45 -0000	1.12
+++ csound.spec	30 Aug 2007 22:57:58 -0000	1.13
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.07.0
-Release:       0.1.cvs20070830%{?dist}
+Release:       0.2.cvs20070830%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -42,6 +42,7 @@
 Patch3: csound-5.03.0-disable-atsa.patch
 Patch4: csound-5.03.0-default-opcodedir.patch
 Patch5: csound-5.03.0-rtalsa-fix.patch
+Patch6: csound-5.07-log-segfault-fix.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -186,6 +187,7 @@
 %patch3 -p1 -b .disable-atsa
 %patch4 -p1 -b .default-opcodedir
 %patch5 -p1 -b .rtalsa-fix
+%patch6 -p1 -b .logfile-segfault-fix
 
 tar xf %{SOURCE1}
 
@@ -413,6 +415,9 @@
 %doc tutorial/*.py
 
 %changelog
+* Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.2.cvs20070830
+- Fix segfault when no logfile is specified
+
 * Thu Aug 30 2007 Dan Williams <dcbw at redhat.com> - 5.07.0-0.1.cvs20070830
 - Update to CVS snapshot of 5.07
     - Expose functions for fluid opcodes that work better on low-power machines