Skip to content

Commit 6e813a2

Browse files
committed
QCTDNS is not correctly initialised when no activity. Validate record contents.
1 parent 2089728 commit 6e813a2

File tree

10 files changed

+14
-6
lines changed

10 files changed

+14
-6
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ Oct 2017
7171
* Found that some 115 subtypes do not have a QWHS structure correctly
7272
created; cannot rely on it being there
7373

74+
Jan 2018
75+
* QCTDNS structure is not initialised when there hae been no activity
76+
7477

7578
Pull requests
7679
=============

bin/aix/convH

0 Bytes
Binary file not shown.

bin/aix/mqsmfcsv

128 Bytes
Binary file not shown.

bin/linux/convH

-48 Bytes
Binary file not shown.

bin/linux/mqsmfcsv

-44 Bytes
Binary file not shown.

bin/win/mqsmfcsv.exe

0 Bytes
Binary file not shown.

src/M

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else
1313
targdir="../bin/linux"
1414
fi
1515

16-
export PLATFLAGS=$flags CC=$cc VERS=903
16+
export PLATFLAGS=$flags CC=$cc VERS=904
1717
make -e -f Makefile.unix $*
1818

1919
rm -f $targdir/convH $targdir/mqsmfcsv

src/Makefile.gcc.win

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
CC=i686-w64-mingw32-gcc
33
CFLAGS= -I. -m32
44
PLATFLAGS=
5-
VERS=903
5+
VERS=904
66
SRC = mqsmf.c \
77
smfDDL.c \
88
smfDate.c \

src/Makefile.win

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J
2-
VERS=903
2+
VERS=904
33
SRC = mqsmf.c \
44
smfDDL.c \
55
smfDate.c \
@@ -39,10 +39,10 @@ mqsmfcsv.exe: $(SRC) $(HDR) Makefile.win
3939
del /q *.obj
4040
copy $@ ..\bin\win
4141

42-
mqsmfstruc.h: csqdsmfc-$(VERS).h convH dummy
42+
mqsmfstruc.h: csqdsmfc-$(VERS).h convH.exe dummy
4343
convH < csqdsmfc-$(VERS).h > $@
4444

45-
convH: convH.c
45+
convH.exe: convH.c
4646
$(CC) /Fe$@ convH.c
4747
copy $@ ..\bin\win
4848

src/mqsmf.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,12 @@ int main( int argc, char *argv[] )
664664
case 2: printQCTDSP((qct_dsp *)p);break;
665665
case 3: printQCTADP((qct_adp *)p);break;
666666
case 4: printQCTSSL((qct_ssl *)p);break;
667-
case 5: printQCTDNS((qct_dns *)p);break;
667+
/* If nothing has been done with DNS in this interval, the
668+
record seems to be present but contain garbage.
669+
*/
670+
case 5: if (triplet[i].l == sizeof(qct_dns))
671+
printQCTDNS((qct_dns *)p);
672+
break;
668673
default: break;
669674
}
670675
}

0 commit comments

Comments
 (0)