[SCM] Handle World Coordinate Systems in Astronomy branch, debian, updated. 1524935890e54da872c2332daa0c03e6b89be2f2

Ole Streicher debian at liska.ath.cx
Sun Apr 15 16:39:11 UTC 2012


The following commit has been merged in the debian branch:
commit 1524935890e54da872c2332daa0c03e6b89be2f2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Apr 15 18:38:26 2012 +0200

    Replace not literal format string by "%s", string to compile with hardening flags

diff --git a/debian/patches/fix_format_security.patch b/debian/patches/fix_format_security.patch
new file mode 100644
index 0000000..8ac28e4
--- /dev/null
+++ b/debian/patches/fix_format_security.patch
@@ -0,0 +1,25 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Replace not literal format string by "%s", string to compile
+ with hardening flags
+--- starlink-ast-7.0.2+dfsg.orig/xmlchan.c
++++ starlink-ast-7.0.2+dfsg/xmlchan.c
+@@ -8861,7 +8861,7 @@ static void Report( AstXmlChan *this, As
+       name = astXmlGetName( elem );
+       sprintf( buff, "astRead(%s): Warning whilst reading %s %s element: %s",
+                astGetClass( this ), ANA(name), name, msg );
+-      astAddWarning( this, 1, buff, "astRead", status );
++      astAddWarning( this, 1, "%s", "astRead", status, buff );
+ 
+    } else {
+       text = (char *) astXmlGetTag( elem, 1 );
+--- starlink-ast-7.0.2+dfsg.orig/fitschan.c
++++ starlink-ast-7.0.2+dfsg/fitschan.c
+@@ -31443,7 +31443,7 @@ static void Warn( AstFitsChan *this, con
+    if( FullForm( astGetWarnings( this ), condition, 0, status ) >= 0 ){
+ 
+ /* If found, store the warning in the parent Channel structure. */
+-      astAddWarning( this, 1, text, method, status );
++       astAddWarning( this, 1, "%s", method, status, text );
+ 
+ /* For historical reasons, warnings are also stored in the FitsChan as a
+    set of FITS cards... First save the current card index, and rewind the
diff --git a/debian/patches/series b/debian/patches/series
index 544464e..8538953 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_std_automake.patch
 use_external_pal.patch
+fix_format_security.patch

-- 
Handle World Coordinate Systems in Astronomy



More information about the debian-science-commits mailing list