[eso-midas] 01/01: Add more bugfixes: @@veriall with MIDAS-format should work now.
Ole Streicher
olebole at moszumanska.debian.org
Fri Apr 3 11:38:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository eso-midas.
commit 86f8463112712fcbcd5aec4770baba45e5781046
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Apr 3 13:38:00 2015 +0200
Add more bugfixes: @@veriall with MIDAS-format should work now.
---
debian/patches/fix_fitswdb.patch | 46 +++++++++++++++
debian/patches/fix_ftoc2.patch | 41 ++++++++++++++
debian/patches/fix_mdb_put.patch | 29 ++++++++++
debian/patches/fix_mid_rdldb.patch | 37 ++++++++++++
debian/patches/fix_rarthm_for.patch | 43 ++++++++++++++
debian/patches/fix_scfclo.patch | 109 ++++++++++++++++++++++++++++++++++++
debian/patches/fix_selechar_c.patch | 51 +++++++++++++++++
debian/patches/fix_statis_for.patch | 42 ++++++++++++++
debian/patches/series | 8 +++
9 files changed, 406 insertions(+)
diff --git a/debian/patches/fix_fitswdb.patch b/debian/patches/fix_fitswdb.patch
new file mode 100644
index 0000000..b0459a1
--- /dev/null
+++ b/debian/patches/fix_fitswdb.patch
@@ -0,0 +1,46 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Another off-by-one
+ Fixes:
+ .
+ ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff9e7713b1 at pc 0x7f4135c48c7c bp 0x7fff9e770e20 sp 0x7fff9e770e18
+WRITE of size 1 at 0x7fff9e7713b1 thread T0
+ #0 0x7f4135c48c7b in fitswdb prim/dio/libsrc/fitswdb.c:243
+ #1 0x7f4135c4a61c in fitswhd prim/dio/libsrc/fitswhd.c:450
+ #2 0x7f4135caab6e in SCFSAV libsrc/st/scfa.c:157
+ #3 0x7f4135caff75 in SCFCLO libsrc/st/scfb.c:483
+ #4 0x7f4135cba83e in SCSEPI libsrc/st/scs.c:353
+ #5 0x7f4135cc6cd8 in stsepi_ libsrc/ftoc/sts.c:67
+ #6 0x409fb7 in statis prim/display/src/statis.f:1034
+ #7 0x40549c in main prim/display/src/statis.f:1056
+ #8 0x7f4134de2b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+ #9 0x405a92 (prim/exec/statis.exe+0x405a92)
+
+Address 0x7fff9e7713b1 is located in stack of thread T0 at offset 1265 in frame
+ #0 0x7f4135c45c7f in fitswdb prim/dio/libsrc/fitswdb.c:88
+
+ This frame has 21 object(s):
+ [32, 36) 'nv'
+ [...]
+ [1056, 1137) 'com'
+ [1184, 1265) 'cval' <== Memory access at offset 1265 overflows this variable
+ [1312, 1393) 'line'
+ [1440, 1521) 'help'
+
+--- a/prim/dio/libsrc/fitswdb.c
++++ b/prim/dio/libsrc/fitswdb.c
+@@ -240,12 +240,12 @@
+ if (dtk->ctl==NCTL || dtk->ctl==SCTL) {
+ nc = (MXLB<nbp) ? MXLB : nbp;
+ SCDRDC(mfd,md->name,1,ns,nc,&nv,cval,unit,&null);
+- cval[nv] = '\0';
+- for (nn=0; nn<nv; nn++)
++ cval[nv-1] = '\0';
++ for (nn=0; nn<nv-1; nn++)
+ if (cval[nn]<' ' || '~'<cval[nn])
+ cval[nn] = ' ';
+ if(dtk->ctl==SCTL) {
+- ival = nv-1;
++ ival = nv-2;
+ while (ival && cval[ival]==' ') ival--;
+ cval[++ival] = '\0';
+ }
diff --git a/debian/patches/fix_ftoc2.patch b/debian/patches/fix_ftoc2.patch
new file mode 100644
index 0000000..5aa5c1a
--- /dev/null
+++ b/debian/patches/fix_ftoc2.patch
@@ -0,0 +1,41 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Fix another off-by-one access in ftoc
+ Again, we need to take care that we do not overwrite a trailing '\0' at the
+ end of an F77 string. This fixes this crash:
+ .
+ ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ffffc79ef90 at pc 0x7f3776f6a568 bp 0x7ffffc79d480 sp 0x7ffffc79d458
+ READ of size 87 at 0x7ffffc79ef90 thread T0
+ .
+ #0 0x7f3776f6a567 in strlen (/usr/lib/x86_64-linux-gnu/libasan.so.1+0x31567)
+ #1 0x7f37769b798e in sti1_ libsrc/ftoc/sti.c:109
+ #2 0x7f37769f1fc4 in stiget_ libsrc/ftoc/ysti.f:13
+ #3 0x40b543 in smooth prim/display/src/smooth.f:599
+ #4 0x40558c in main prim/display/src/smooth.f:1056
+ #5 0x7f3775ad7b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+ #6 0x405ba2 (prim/exec/smooth.exe+0x405ba2)
+
+Address 0x7ffffc79ef90 is located in stack of thread T0 at offset 5616 in frame
+ #0 0x40669f in smooth prim/display/src/smooth.f:1
+
+ This frame has 81 object(s):
+ [32, 36) 'idum'
+ [...]
+ [5344, 5404) 'framec'
+ [5440, 5500) 'table'
+ [5536, 5616) 'cbuf' <== Memory access at offset 5616 overflows this variable
+
+--- a/libsrc/ftoc-new/sti.fc
++++ b/libsrc/ftoc-new/sti.fc
+@@ -101,10 +101,10 @@
+ *pntr = -diff;
+
+ n = (int) strlen(ptr2);
+-if ((n > 0) && (n < m1)) *(ptr2+n) = ' ';
++if ((n > 0) && (n < m1-1)) *(ptr2+n) = ' ';
+
+ n = (int) strlen(ptr3);
+-if ((n > 0) && (n < m2)) *(ptr3+n) = ' ';
++if ((n > 0) && (n < m2-1)) *(ptr3+n) = ' ';
+
+ return 0;
+ }
diff --git a/debian/patches/fix_mdb_put.patch b/debian/patches/fix_mdb_put.patch
new file mode 100644
index 0000000..eceb4cb
--- /dev/null
+++ b/debian/patches/fix_mdb_put.patch
@@ -0,0 +1,29 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Fix another probably off-by-one error in prim/dio/libsrc/fitsmdb.c
+ This shall fix the following crash:
+ .
+ ERROR: AddressSanitizer: global-buffer-overflow on address 0x7f5ae9867e28 at pc 0x7f5ae979569c bp 0x7fff8c3c744
+ READ of size 1 at 0x7f5ae9867e28 thread T0
+ #0 0x7f5ae979569b in mdb_put prim/dio/libsrc/fitsmdb.c:173
+ #1 0x7f5ae978f489 in fitsckw prim/dio/libsrc/fitsckw.c:872
+ #2 0x7f5ae97a3ee4 in fitsrhd prim/dio/libsrc/fitsrhd.c:258
+ #3 0x401ee4 in main prim/dio/src/infile.c:263
+ #4 0x7f5ae90bab44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+ #5 0x4024e2 (prim/exec/infile.exe+0x4024e2)
+
+0x7f5ae9867e28 is located 0 bytes to the right of global variable '*.LC46' from 'fitsckw.c' (0x7f5ae9867e20) of size 8
+ '*.LC46' is ascii string 'COMMENT'
+0x7f5ae9867e28 is located 56 bytes to the left of global variable '*.LC47' from 'fitsckw.c' (0x7f5ae9867e60) of size 3
+ '*.LC47' is ascii string 'O_'
+
+--- a/prim/dio/libsrc/fitsmdb.c
++++ b/prim/dio/libsrc/fitsmdb.c
+@@ -170,7 +170,7 @@
+
+ ps = myptr->desc;
+ pc = kwd->desc;
+-for (i=0; i<MXMDN; i++) *ps++ = *pc++;
++strncpy(ps, pc, MXMDN);
+
+ myptr->type = kwd->type;
+ myptr->idx = kwd->idx;
diff --git a/debian/patches/fix_mid_rdldb.patch b/debian/patches/fix_mid_rdldb.patch
new file mode 100644
index 0000000..810ae00
--- /dev/null
+++ b/debian/patches/fix_mid_rdldb.patch
@@ -0,0 +1,37 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: More off-by-one copies...
+ Fixes
+ .
+ ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff04e7fcc8 at pc 0x7fb863cdddb5 bp 0x7fff04e7e980 sp 0x7fff04e7e978
+ WRITE of size 4 at 0x7fff04e7fcc8 thread T0
+ #0 0x7fb863cdddb4 in MID_RDLDB libsrc/st/midldb.c:590
+ #1 0x7fb863cc257a in MID_RDSCRI libsrc/st/middsca.c:506
+ #2 0x7fb863d01aa3 in SCDRDD libsrc/st/scd.c:280
+ #3 0x7fb863d281ce in std4_ libsrc/ftoc/std.c:140
+ #4 0x7fb863d6474c in stdrdd_ libsrc/ftoc/ystd.f:54
+ #5 0x406608 in necidn stdred/echelle/src/neciden.f:113
+ #6 0x401c8c in main stdred/echelle/src/neciden.f:173
+ #7 0x7fb862e4ab44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+ #8 0x401d52 (stdred/exec/neciden.exe+0x401d52)
+ .
+ Address 0x7fff04e7fcc8 is located in stack of thread T0 at offset 2920 in frame
+ #0 0x405dcf in necidn stdred/echelle/src/neciden.f:1
+ .
+ This frame has 43 object(s):
+ [32, 36) 'error'
+ [...]
+ [2464, 2480) 'avrms'
+ [2528, 2920) 'ainit' <== Memory access at offset 2920 overflows this variable
+ [2976, 3036) 'table'
+
+--- a/stdred/echelle/src/neciden.for
++++ b/stdred/echelle/src/neciden.for
+@@ -108,7 +108,7 @@
+ COMMON /POLY/ A,A1,IA,ABSORD
+ C******************************************************************************
+ C
+- DOUBLE PRECISION AINIT(DEGMAX*DEGMAX)
++ DOUBLE PRECISION AINIT(DEGMAX*DEGMAX+1)
+ DOUBLE PRECISION AVRMS(2)
+ INTEGER LOOP1,LOOP2,IPOS,MODEG
+
diff --git a/debian/patches/fix_rarthm_for.patch b/debian/patches/fix_rarthm_for.patch
new file mode 100644
index 0000000..9d4892a
--- /dev/null
+++ b/debian/patches/fix_rarthm_for.patch
@@ -0,0 +1,43 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Wild-quess workaround for access violations in prim/general/libsrc/calc.for
+ This is to hide the following problem:
+ .
+ ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fffe7377ec4 at pc 0x40fb5c bp 0x7fffe7377350 sp 0x7fffe7377348
+READ of size 4 at 0x7fffe7377ec4 thread T0
+ #0 0x40fb5b in opffw_ prim/general/libsrc/calc.f:129
+ #1 0x40900b in rarthm prim/general/src/rarthm.f:402
+ #2 0x4038ec in main prim/general/src/rarthm.f:456
+ #3 0x7fed23b91b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+ #4 0x403c42 (prim/exec/rarthm.exe+0x403c42)
+
+Address 0x7fffe7377ec4 is located in stack of thread T0 at offset 1316 in frame
+ #0 0x40512f in rarthm prim/general/src/rarthm.f:1
+
+ This frame has 57 object(s):
+ [32, 36) 'uni'
+ [...]
+ [1184, 1188) 'rownoa'
+ [1248, 1252) 'rownob'
+ [1312, 1316) 'rowsiz' <== Memory access at offset 1316 overflows this variable
+ [1376, 1380) 'stat'
+ [1440, 1448) 'consta'
+ [1504, 1512) 'npixa'
+ [1568, 1576) 'npixb'
+ [1632, 1640) 'npixc'
+
+--- a/prim/general/src/rarthm.for
++++ b/prim/general/src/rarthm.for
+@@ -483,11 +483,11 @@
+ IF (OPERAT(1:1).NE.'Q') THEN
+ CALL OPFFW(OPERAT,MADRID(APNTR),MADRID(BPNTR),
+ + MADRID(PNTRW),APIX,BPIX,CPIX,
+- + ROWSIZ,ROWSIZ,ROWSIZ)
++ + NPIXA,NPIXB,NPIXC)
+ ELSE
+ CALL FN2FFW(OPERA(1:5),MADRID(APNTR),MADRID(BPNTR),
+ + MADRID(PNTRW),APIX,BPIX,CPIX,
+- + ROWSIZ,ROWSIZ,ROWSIZ)
++ + NPIXA,NPIXB,NPIXC)
+ ENDIF
+ C
+ C put resulting row back into relevant ATOM
diff --git a/debian/patches/fix_scfclo.patch b/debian/patches/fix_scfclo.patch
new file mode 100644
index 0000000..6d4c236
--- /dev/null
+++ b/debian/patches/fix_scfclo.patch
@@ -0,0 +1,109 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Dont try to remove file name if the file name has zero length.
+ This fixes
+ .
+ ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff33427aac at pc 0x7f20d8d70449 bp 0x7fff33427800 sp 0x7fff334277f8
+WRITE of size 1 at 0x7fff33427aac thread T0
+ #0 0x7f20d8d70448 in SCFCLO libsrc/st/scfb.c:461
+ #1 0x7f20d8dab088 in TCTCLO libsrc/tbl/tct.c:414
+ #2 0x7f20d8d2638c in MID_fitsin libsrc/st/midfctb.c:573
+ #3 0x7f20d8d21784 in MID_ACCFITS libsrc/st/midfct.c:193
+ #4 0x7f20d8d6f816 in SCFOPN libsrc/st/scfb.c:133
+ #5 0x7f20d8d8266f in stf1_ libsrc/ftoc/stf.c:79
+ #6 0x7f20d8dbdcb9 in stfopn_ libsrc/ftoc/ystf.f:6
+ #7 0x407d7a in statis prim/display/src/statis.f:202
+ #8 0x40549c in main prim/display/src/statis.f:1056
+ #9 0x7f20d7ea3b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+ #10 0x405a92 (prim/exec/statis.exe+0x405a92)
+ .
+ Address 0x7fff33427aac is located in stack of thread T0 at offset 604 in frame
+ #0 0x7f20d8d6fabf in SCFCLO libsrc/st/scfb.c:325
+ .
+ This frame has 10 object(s):
+ [32, 36) 'mm'
+ [96, 100) 'e_c'
+ [160, 164) 'e_d'
+ [224, 228) 'e_l'
+ [288, 292) 'n0'
+ [352, 356) 'n1'
+ [416, 424) 'ldbp'
+ [480, 568) 'cbuf'
+ [608, 768) 'origname' <== Memory access at offset 604 underflows this variable
+ [800, 1000) 'temp'
+
+--- a/libsrc/st/scfa.c
++++ b/libsrc/st/scfa.c
+@@ -438,9 +438,14 @@
+ {
+ if (fctpntr->FILTYP > 0) /* for FITS files */
+ {
+- (void) strcpy(origname,fctpntr->NAME+4);
+- i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
+- origname[i] = '\0';
++ if (fctpntr->O_NAMLEN == 0)
++ (void) strcpy(origname,fctpntr->NAME);
++ else /* internal FITS file */
++ {
++ (void) strcpy(origname,fctpntr->NAME+4);
++ i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
++ origname[i] = '\0';
++ }
+ ptr = origname;
+ }
+ else
+--- a/libsrc/st/scfb.c
++++ b/libsrc/st/scfb.c
+@@ -292,9 +292,14 @@
+ char *datpntr, origname[FCT_NAME_LEN];
+
+ datpntr = fctpntr->BDADDR[0];
+- (void) strcpy(origname,fctpntr->NAME+4);
+- mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
+- origname[mm] = '\0';
++ if (fctpntr->O_NAMLEN == 0)
++ (void) strcpy(origname,fctpntr->NAME);
++ else /* internal FITS file */
++ {
++ (void) strcpy(origname,fctpntr->NAME+4);
++ mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
++ origname[mm] = '\0';
++ }
+ status = MID_fitsin(2,origname,-1,"",datpntr,imno,&i);
+ status = TCTFIX(*imno); /* write table control descriptors */
+ fctpntr->ACCESS = 'I'; /* reset */
+@@ -456,9 +461,14 @@
+
+ if (fctpntr->FILTYP > 0)
+ {
+- (void) strcpy(origname,fctpntr->NAME+4);
+- i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
+- origname[i] = '\0';
++ if (fctpntr->O_NAMLEN == 0)
++ (void) strcpy(origname,fctpntr->NAME);
++ else /* internal FITS file */
++ {
++ (void) strcpy(origname,fctpntr->NAME+4);
++ i = fctpntr->O_NAMLEN - 4; /* we removed leading "FITZ" */
++ origname[i] = '\0';
++ }
+ nampntr = origname;
+ }
+ else
+@@ -850,9 +860,14 @@
+ char origname[FCT_NAME_LEN];
+
+ dum[0] = '\0';
+- (void) strcpy(origname,fctpntr->NAME+4);
+- mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
+- origname[mm] = '\0';
++ if (fctpntr->O_NAMLEN == 0)
++ (void) strcpy(origname,fctpntr->NAME);
++ else /* internal FITS file */
++ {
++ (void) strcpy(origname,fctpntr->NAME+4);
++ mm = fctpntr->O_NAMLEN - 4; /* we just removed leading "FITZ" */
++ origname[mm] = '\0';
++ }
+ mm = imno; /* get data as real */
+ status = MID_fitsin(2,origname,-1,dum,mypntr,&mm,&i);
+ /*
diff --git a/debian/patches/fix_selechar_c.patch b/debian/patches/fix_selechar_c.patch
new file mode 100644
index 0000000..63ff953
--- /dev/null
+++ b/debian/patches/fix_selechar_c.patch
@@ -0,0 +1,51 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Fix off-by-one initialization in prim/table/libsrc/selechar.c
+ I am, however, not sure whether it is in charfun() in selechar.c or SCFMAP()
+ in scfb.c.
+ .
+ It fixes the following crash:
+ .
+ ERROR: AddressSanitizer: heap-buffer-overflow on address 0x61a00001f76c at pc 0x42ac5b bp 0x7fffb7a62330 sp 0x7fffb7a62328
+ WRITE of size 1 at 0x61a00001f76c thread T0
+ #0 0x42ac5a in charfun prim/table/libsrc/selechar.c:279
+ #1 0x4154f5 in level5 prim/table/libsrc/tbcomsel.c:797
+ #2 0x41572a in level4 prim/table/libsrc/tbcomsel.c:720
+ #3 0x415c57 in level3 prim/table/libsrc/tbcomsel.c:765
+ #4 0x415d1d in level2 prim/table/libsrc/tbcomsel.c:677
+ #5 0x41610e in level1 prim/table/libsrc/tbcomsel.c:636
+ #6 0x4165b0 in level0 prim/table/libsrc/tbcomsel.c:595
+ #7 0x41415d in level00 prim/table/libsrc/tbcomsel.c:555
+ #8 0x4179ff in tbl_comp prim/table/libsrc/tbcomsel.c:204
+ #9 0x4053fd in tk_cexec prim/edit/libsrc/tkeys.c:204
+ #10 0x404979 in main prim/table/src/tdatatbl.c:107
+ #11 0x7f1e97ae3b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+ #12 0x404d62 (prim/exec/tdatatbl.exe+0x404d62)
+ .
+ 0x61a00001f76c is located 0 bytes to the right of 1260-byte region [0x61a00001f280,0x61a00001f76c)
+allocated by thread T0 here:
+ #0 0x7f1e9858373f in malloc (/usr/lib/x86_64-linux-gnu/libasan.so.1+0x5473f)
+ #1 0x7f1e98241cf2 in SCFMAP libsrc/st/scfb.c:816
+ #2 0x42a0a3 in charfun prim/table/libsrc/selechar.c:250
+ #3 0x4154f5 in level5 prim/table/libsrc/tbcomsel.c:797
+ #4 0x41572a in level4 prim/table/libsrc/tbcomsel.c:720
+ #5 0x415c57 in level3 prim/table/libsrc/tbcomsel.c:765
+ #6 0x415d1d in level2 prim/table/libsrc/tbcomsel.c:677
+ #7 0x41610e in level1 prim/table/libsrc/tbcomsel.c:636
+ #8 0x4165b0 in level0 prim/table/libsrc/tbcomsel.c:595
+ #9 0x41415d in level00 prim/table/libsrc/tbcomsel.c:555
+ #10 0x4179ff in tbl_comp prim/table/libsrc/tbcomsel.c:204
+ #11 0x4053fd in tk_cexec prim/edit/libsrc/tkeys.c:204
+ #12 0x404979 in main prim/table/src/tdatatbl.c:107
+ #13 0x7f1e97ae3b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+
+--- a/prim/table/libsrc/selechar.c
++++ b/prim/table/libsrc/selechar.c
+@@ -247,7 +247,7 @@
+ nconst[ibuf[6]] = nchar;
+ items = nchar * ibuf[2];
+ SCFCRE(name,D_I1_FORMAT,F_X_MODE,F_IMA_TYPE,items,&imnoc[ibuf[6]]);
+- SCFMAP(imnoc[ibuf[6]],F_X_MODE,1,items,&act,&cdata[ibuf[6]]);
++ SCFMAP(imnoc[ibuf[6]],F_X_MODE,1,items+1,&act,&cdata[ibuf[6]]);
+ }
+ if (nochar == 0) {
+ for (i=0, k=0; i<items; i+=nchar,k++) {
diff --git a/debian/patches/fix_statis_for.patch b/debian/patches/fix_statis_for.patch
new file mode 100644
index 0000000..2a97fc2
--- /dev/null
+++ b/debian/patches/fix_statis_for.patch
@@ -0,0 +1,42 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Fix string length in statis.for
+ The string length of 'tcol2ima.bdf ' is wrongly given as 20, while it is 12.
+ This produces the crash shown below.
+ .
+ As a drive-by, also the call of STK9 in ystk.for has one parameter too much.
+ .
+ ERROR: AddressSanitizer: global-buffer-overflow on address 0x00000047956f at pc 0x7f1243851841 bp 0x7fff7a50f48
+ READ of size 1 at 0x00000047956f thread T0
+ #0 0x7f1243851840 in SCKWRC libsrc/st/sckb.c:130
+ #1 0x7f124385caee in stk9_ libsrc/ftoc/stk.c:262
+ #2 0x7f1243896935 in stkwrc_ libsrc/ftoc/ystk.f:108
+ #3 0x40c7ac in statis prim/display/src/statis.f:195
+ #4 0x40549c in main prim/display/src/statis.f:1056
+ #5 0x7f124297bb44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44)
+ #6 0x405a92 (prim/exec/statis.exe+0x405a92)
+ .
+ 0x00000047956f is located 49 bytes to the left of global variable '*.LC48' from 'statis.f' (0x4795a0) of size 5
+ 0x00000047956f is located 0 bytes to the right of global variable '*.LC47' from 'statis.f' (0x479560) of size 15
+
+--- a/libsrc/ftoc-new/ystk.for
++++ b/libsrc/ftoc-new/ystk.for
+@@ -224,7 +224,7 @@
+ CALL STSTR(1,KEY) !STRIPPED_STRING
+ CALL STLOC(1,0,VALUES) !untouched CHAR_LOC
+ C
+- CALL STK9(NOELM,FELEM,MAXVALS,ACTVALS,STATUS)
++ CALL STK9(NOELM,FELEM,MAXVALS,STATUS)
+
+ C
+ RETURN
+--- a/prim/display/src/statis.for
++++ b/prim/display/src/statis.for
+@@ -216,7 +216,7 @@
+ + CALL STETER(31,'bad table column no....')
+ ENDIF
+ C !store tmp name in OUT_B
+- CALL STKWRC('OUT_B',1,'tcol2ima.bdf ',1,20,UNI,STAT)
++ CALL STKWRC('OUT_B',1,'tcol2ima.bdf ',1,15,UNI,STAT)
+ CALL TCOLIM(ORFILE,OUTPUT(1:16),ICOLNM(1),STAT)
+ IF (STAT.NE.0) CALL STETER(32,
+ + 'problems creating temp. image from table column...')
diff --git a/debian/patches/series b/debian/patches/series
index eac6d98..bdcd24b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,11 @@ fix_modgcur_c.patch
fix_thelp_c.patch
qsort.patch
fix_dio.patch
+fix_ftoc2.patch
+fix_rarthm_for.patch
+fix_mdb_put.patch
+fix_fitswdb.patch
+fix_scfclo.patch
+fix_mid_rdldb.patch
+fix_statis_for.patch
+fix_selechar_c.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git
More information about the debian-science-commits
mailing list