[med-svn] r16946 - in trunk/packages/dialign/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-05-15 12:11:07 +0000 (Thu, 15 May 2014)
New Revision: 16946

Added:
   trunk/packages/dialign/trunk/debian/patches/fix_excess_argument.patch
Modified:
   trunk/packages/dialign/trunk/debian/changelog
   trunk/packages/dialign/trunk/debian/patches/series
Log:
Fix Excess argument in call to function erreur


Modified: trunk/packages/dialign/trunk/debian/changelog
===================================================================
--- trunk/packages/dialign/trunk/debian/changelog	2014-05-15 11:35:55 UTC (rev 16945)
+++ trunk/packages/dialign/trunk/debian/changelog	2014-05-15 12:11:07 UTC (rev 16946)
@@ -1,7 +1,10 @@
-dialign (2.2.1-7) UNRELEASED; urgency=medium
+dialign (2.2.1-7) unstable; urgency=medium
 
   * moved debian/upstream to debian/upstream/metadata
   * cme fix dpkg-control
+  * debian/patches/fix_excess_argument.patch: Fix Excess argument in call
+    to function erreur
+    Closes: #748212
 
  -- Andreas Tille <tille at debian.org>  Thu, 15 May 2014 13:34:33 +0200
 

Added: trunk/packages/dialign/trunk/debian/patches/fix_excess_argument.patch
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/fix_excess_argument.patch	                        (rev 0)
+++ trunk/packages/dialign/trunk/debian/patches/fix_excess_argument.patch	2014-05-15 12:11:07 UTC (rev 16946)
@@ -0,0 +1,32 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 15 May 2014 13:34:33 +0200
+Bug-Debian: http://bugs.debian.org/748212
+Description: Fix Excess argument in call to function erreur
+
+--- a/src/input.c
++++ b/src/input.c
+@@ -337,7 +337,7 @@ void tp400_read( int w_type , double **p
+   /* reads probabilities from file */
+    /* w_type = 0 (protein), 1 (dna w/o transl.), 2 (dna with transl.) */  
+ 
+-  char line[MLINE], file_name[MLINE], suffix[10], str[MLINE] ;
++  char line[MLINE], file_name[MLINE], suffix[10], str[MLINE], *buf ;
+   int sum, len, max_sim, i ;
+   double pr;
+ 
+@@ -370,9 +370,12 @@ void tp400_read( int w_type , double **p
+  }
+ 
+ 
+-  if ( fgets( line , MLINE , fp ) == NULL ) 
+-    erreur("\n\n problem with file %s  \n\n", file_name );
+-  else
++  if ( fgets( line , MLINE , fp ) == NULL ) {
++    buf = (char *)malloc( strlen(file_name) + 64 );
++    sprintf(buf, "\n\n problem with file %s  \n\n", file_name);
++    erreur( buf );
++    free( buf );
++  } else
+     if( w_type % 2 )  
+       av_sim_score_nuc = atof( line );
+     else

Modified: trunk/packages/dialign/trunk/debian/patches/series
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/series	2014-05-15 11:35:55 UTC (rev 16945)
+++ trunk/packages/dialign/trunk/debian/patches/series	2014-05-15 12:11:07 UTC (rev 16946)
@@ -1,3 +1,4 @@
 20_no_DIALIGN2_DIR.patch
 30_local_doc.patch
 hardening.patch
+fix_excess_argument.patch