[Debian-astro-commits] [wcstools] 01/02: Another workaround for long CTYPEs

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository wcstools.

commit bc834d35b60108f154016002318a8794c5ddca37
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Feb 13 21:46:17 2016 +0100

    Another workaround for long CTYPEs
---
 debian/changelog                       | 6 ++++++
 debian/patches/fix_wcsinit_crash.patch | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2157ced..3510a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wcstools (3.9.2-5) UNRELEASED; urgency=low
+
+  * Another workaround for long CTYPEs.
+
+ -- Ole Streicher <olebole at debian.org>  Sat, 13 Feb 2016 21:44:58 +0100
+
 wcstools (3.9.2-4) unstable; urgency=low
 
   * Fix crash and undefined behaviour with imstar
diff --git a/debian/patches/fix_wcsinit_crash.patch b/debian/patches/fix_wcsinit_crash.patch
index f8de3da..6007bfa 100644
--- a/debian/patches/fix_wcsinit_crash.patch
+++ b/debian/patches/fix_wcsinit_crash.patch
@@ -4,12 +4,13 @@ Description: Increase c*type and ptype field string lengths
 Bug: https://bugs.launchpad.net/ubuntu/+source/saods9/+bug/1458333
 --- a/libwcs/wcsinit.c
 +++ b/libwcs/wcsinit.c
-@@ -399,11 +399,11 @@
+@@ -399,14 +399,16 @@
  	}
  
      /* World coordinate system reference coordinate information */
 -    if (hgetsc (hstring, "CTYPE1", &mchar, 16, ctype1)) {
 +    if (hgetsc (hstring, "CTYPE1", &mchar, 9, ctype1)) {
++        ctype1[8] = '\0';
  
  	/* Read second coordinate type */
  	strcpy (ctype2, ctype1);
@@ -18,3 +19,7 @@ Bug: https://bugs.launchpad.net/ubuntu/+source/saods9/+bug/1458333
  	    twod = 0;
  	else
  	    twod = 1;
++        ctype2[8] = '\0';
+ 	strcpy (wcs->ctype[0], ctype1);
+ 	strcpy (wcs->ctype[1], ctype2);
+ 	if (strsrch (ctype2, "LAT") || strsrch (ctype2, "DEC"))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/wcstools.git